Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Replaces Frank the turtle from the Jungleland Mining base with Bismuth the Triceratops (also adds a new pet, Bismuth the triceratops) #22238

Open
wants to merge 3 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion _maps/RandomRuins/JungleRuins/miningbase.dmm
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{
dir = 1
},
/mob/living/simple_animal/turtle,
/mob/living/simple_animal/triceratops,
/turf/open/floor/plasteel,
/area/mine/living_quarters)
"av" = (
Expand Down
4 changes: 4 additions & 0 deletions code/controllers/configuration/entries/game_options.dm
Original file line number Diff line number Diff line change
Expand Up @@ -441,6 +441,10 @@
default = 64
min_val = 0

/datum/config_entry/number/bismuthcap
config_entry_value = 6
min_val = 0

/datum/config_entry/flag/dynamic_config_enabled

/datum/config_entry/number/engine_type
Expand Down
1 change: 1 addition & 0 deletions code/controllers/subsystem/mobs.dm
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@ SUBSYSTEM_DEF(mobs)
var/static/list/cubemonkeys = list()
var/static/list/slimes = list()
var/static/list/cheeserats = list()
var/static/list/bismuth = list()

/datum/controller/subsystem/mobs/stat_entry(msg)
msg = "P:[length(GLOB.mob_living_list)]"
Expand Down
47 changes: 47 additions & 0 deletions code/modules/mob/living/simple_animal/friendly/triceratops.dm
Original file line number Diff line number Diff line change
@@ -0,0 +1,47 @@
/mob/living/simple_animal/triceratops
name = "Bismuth"
desc = "Acient, Reliable, Good at Pathfinding."
icon = 'icons/mob/pets.dmi'
icon_state = "bismuth"
icon_living = "bismuth"
icon_dead = "bis_dead"
speak_emote = list("grumbles")
emote_hear = list("grunts.","grumbles.")
emote_see = list("wags their tail.", "sniffs at the ground.")
speak_chance = 1
turns_per_move = 5
butcher_results = list(/obj/item/dice/d20 = 1)
response_help = "pets"
response_disarm = "gently pushes aside"
response_harm = "rams"
mob_biotypes = MOB_ORGANIC|MOB_BEAST
gold_core_spawnable = FRIENDLY_SPAWN
melee_damage_lower = 18
melee_damage_upper = 18
health = 350
maxHealth = 350
speed = 5
glide_size = 2
can_be_held = FALSE
footstep_type = FOOTSTEP_MOB_SHOE

/mob/living/simple_animal/triceratops/Initialize(mapload)
var/cap = CONFIG_GET(number/bismuthcap)
if (LAZYLEN(SSmobs.bismuth) > cap)
if(prob(30))
new /mob/living/simple_animal/triceratops(loc)
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Uh, huh, why?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

its a reference

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

bonus bismuth (up to 6)

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

what

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

what

It is a reference to the game Pathfinder: Wrath of the righteous where you are given a tool which allows you to summon 6 dinosaurs, all named bismuth who scale with you. The reason there is 6 max is because you can only have 6 party members

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

shouldn't it be 5 max, since how are you gonna use an item without anyone in the party

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

shouldn't it be 5 max, since how are you gonna use an item without anyone in the party

no trust me

SSmobs.bismuth += src
. = ..()

/mob/living/simple_animal/triceratops/handle_automated_movement()
if(!isturf(src.loc) || !(mobility_flags & MOBILITY_MOVE) || buckled)
return //If it can't move, dont let it move.

//-----WANDERING - Time to mosey around
else
walk(src, 0)

if(prob(10))
step(src, pick(GLOB.cardinals))
return

3 changes: 3 additions & 0 deletions config/game_options.txt
Original file line number Diff line number Diff line change
Expand Up @@ -695,6 +695,9 @@ ROUNDSTART_TRAITS
## Cap on how many regal rat minions there can be
#RATCAP 64

## Cap on how many bismuths there can be
#BISMUTHCAP 6

## Enable the capitalist agenda on your server.
ECONOMY

Expand Down
Binary file modified icons/mob/pets.dmi
Binary file not shown.
1 change: 1 addition & 0 deletions yogstation.dme
Original file line number Diff line number Diff line change
Expand Up @@ -3098,6 +3098,7 @@
#include "code\modules\mob\living\simple_animal\friendly\snail.dm"
#include "code\modules\mob\living\simple_animal\friendly\snake.dm"
#include "code\modules\mob\living\simple_animal\friendly\spiderbot.dm"
#include "code\modules\mob\living\simple_animal\friendly\triceratops.dm"
#include "code\modules\mob\living\simple_animal\friendly\turtle.dm"
#include "code\modules\mob\living\simple_animal\friendly\drone\_drone.dm"
#include "code\modules\mob\living\simple_animal\friendly\drone\drones_as_items.dm"
Expand Down
Loading