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.

Sign up for GitHub

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

Jump to bottom

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
+57 −1
Open

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

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
680bc87
yes
cowbot92 Jun 27, 2024
d828249
byee
cowbot92 Jun 27, 2024
c5ba388
updates cap frfr
cowbot92 Jun 27, 2024
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
View file
Open in desktop
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
40 changes: 40 additions & 0 deletions code/modules/mob/living/simple_animal/friendly/triceratops.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,40 @@
/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"
var/icon_hiding = "yeeslow_scared"
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/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

Binary file modified icons/mob/pets.dmi
View file
Open in desktop
Binary file not shown.
1 change: 1 addition & 0 deletions yogstation.dme
View file
Open in desktop
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