[BOUNTY] Ports Petheads from Beestation (#3629)

* Ports Petheads from Bee * Into it's proper place * Untick
Monkestation · Oct 5, 2024 · 048b3fd · 048b3fd
1 parent 3902a43
commit 048b3fd
Show file tree

Hide file tree

Showing 46 changed files with 199 additions and 5 deletions.
diff --git a/monkestation/code/game/objects/items/choice_beacon.dm b/monkestation/code/game/objects/items/choice_beacon.dm
@@ -37,7 +37,8 @@
 			/mob/living/basic/pet/dog/pug,
 			/mob/living/basic/pet/dog/bullterrier,
 			/mob/living/basic/lizard,
-			/mob/living/basic/ant
+			/mob/living/basic/ant,
+			/mob/living/simple_animal/pet/hamster
 		)
 
 		for(var/mob/living/basic_mob as anything in selectable_pets)

diff --git a/monkestation/code/modules/blueshift/mobs/misc_pets.dm b/monkestation/code/modules/blueshift/mobs/misc_pets.dm
@@ -29,6 +29,7 @@
 	unsuitable_atmos_damage = 0
 	minimum_survivable_temperature = 0
 	maximum_survivable_temperature = 30000
+	worn_slot_flags = null
 
 /mob/living/basic/lizard/tegu
 	name = "tegu"

diff --git a/monkestation/code/modules/mob/living/basic/pets/cat.dm b/monkestation/code/modules/mob/living/basic/pets/cat.dm
@@ -0,0 +1,4 @@
+/mob/living/simple_animal/pet/cat
+	//. = ..()
+	worn_slot_flags = ITEM_SLOT_HEAD
+	head_icon = 'monkestation/icons/mob/pets_held.dmi'
diff --git a/monkestation/code/modules/mob/living/basic/pets/crab.dm b/monkestation/code/modules/mob/living/basic/pets/crab.dm
@@ -0,0 +1,28 @@
+/mob/living/basic/crab
+	can_be_held = TRUE
+	worn_slot_flags = ITEM_SLOT_HEAD
+	head_icon = 'monkestation/icons/mob/pets_held.dmi'
+	held_lh = 'monkestation/icons/mob/pets_held_lh.dmi'
+	held_rh = 'monkestation/icons/mob/pets_held_rh.dmi'
+	held_state = "crab"
+
+/mob/living/basic/crab/evil
+	held_state = "evilcrab"
+
+// Unsprited crabs will not be worn, new sprites are welcome!
+
+/mob/living/basic/crab/kreb
+	worn_slot_flags = null
+
+/mob/living/basic/crab/evil/kreb
+	worn_slot_flags = null
+
+/mob/living/basic/crab/plant
+	worn_slot_flags = null
+
+/mob/living/basic/crab/spycrab
+	worn_slot_flags = null
+
+/mob/living/basic/crab/shuffle
+	worn_slot_flags = null
+
diff --git a/monkestation/code/modules/mob/living/basic/pets/dog_subtypes.dm b/monkestation/code/modules/mob/living/basic/pets/dog_subtypes.dm
@@ -0,0 +1,29 @@
+/mob/living/basic/pet/dog/pug
+	worn_slot_flags = ITEM_SLOT_HEAD
+	head_icon = 'monkestation/icons/mob/pets_held.dmi'
+
+/mob/living/basic/pet/dog/bullterrier
+	worn_slot_flags = ITEM_SLOT_HEAD
+	head_icon = 'monkestation/icons/mob/pets_held_large.dmi'
+
+/mob/living/basic/pet/dog/corgi
+	worn_slot_flags = ITEM_SLOT_HEAD
+	head_icon = 'monkestation/icons/mob/pets_held.dmi'
+
+/mob/living/basic/pet/dog/corgi/puppy
+	worn_slot_flags = ITEM_SLOT_HEAD
+	head_icon = 'monkestation/icons/mob/pets_held.dmi'
+
+/mob/living/basic/pet/dog/corgi/puppy/void
+	worn_slot_flags = ITEM_SLOT_HEAD
+	head_icon = 'monkestation/icons/mob/pets_held.dmi'
+
+/mob/living/basic/pet/dog/corgi/lisa
+	worn_slot_flags = ITEM_SLOT_HEAD
+	head_icon = 'monkestation/icons/mob/pets_held.dmi'
+
+/mob/living/basic/pet/dog/corgi/narsie
+	worn_slot_flags = null
+
+/mob/living/basic/pet/dog/corgi/exoticcorgi
+	worn_slot_flags = null
diff --git a/monkestation/code/modules/mob/living/basic/pets/fox.dm b/monkestation/code/modules/mob/living/basic/pets/fox.dm
@@ -0,0 +1,3 @@
+/mob/living/basic/pet/fox
+	worn_slot_flags = ITEM_SLOT_HEAD
+	head_icon = 'monkestation/icons/mob/pets_held.dmi'
diff --git a/monkestation/code/modules/mob/living/basic/pets/hamster.dm b/monkestation/code/modules/mob/living/basic/pets/hamster.dm
@@ -0,0 +1,40 @@
+/mob/living/simple_animal/pet/hamster
+	mob_biotypes = list(MOB_ORGANIC, MOB_BEAST)
+	response_help_continuous  = "pets"
+	response_help_simple = "pet"
+	response_disarm_continuous = "bops"
+	response_disarm_simple = "bop"
+	response_harm_continuous = "bites"
+	response_harm_simple = "bite"
+	speak = list("Squeak", "SQUEAK!")
+	speak_emote = list("squeak", "hisses", "squeals")
+	emote_hear = list("squeaks.", "hisses.", "squeals.")
+	emote_see = list("skitters", "examines it's claws", "rolls around")
+	see_in_dark = 5
+	speak_chance = 1
+	turns_per_move = 3
+	footstep_type = FOOTSTEP_MOB_CLAW
+	density = FALSE
+	pass_flags = PASSMOB
+	mob_size = MOB_SIZE_SMALL
+	name = "\improper hamster"
+	real_name = "hamster"
+	desc = "It's a hamster."
+	icon = 'monkestation/icons/mob/pets.dmi'
+	icon_state = "hamster"
+	icon_living = "hamster"
+	held_state = "hamster"
+	icon_dead = "hamster_dead"
+	butcher_results = list(/obj/item/food/meat/slab = 1)
+	childtype = list(/mob/living/simple_animal/pet/hamster = 1)
+	animal_species = /mob/living/simple_animal/pet/hamster
+	gold_core_spawnable = FRIENDLY_SPAWN
+	can_be_held = TRUE
+	worn_slot_flags = ITEM_SLOT_HEAD
+	head_icon = 'monkestation/icons/mob/pets_held.dmi'
+	held_lh = 'monkestation/icons/mob/pets_held_lh.dmi'
+	held_rh = 'monkestation/icons/mob/pets_held_rh.dmi'
+
+/mob/living/simple_animal/pet/hamster/Initialize(mapload)
+	. = ..()
+	ADD_TRAIT(src, TRAIT_VENTCRAWLER_ALWAYS, INNATE_TRAIT)
diff --git a/monkestation/code/modules/mob/living/basic/pets/lizard.dm b/monkestation/code/modules/mob/living/basic/pets/lizard.dm
@@ -0,0 +1,18 @@
+/mob/living/basic/lizard
+	can_be_held = TRUE
+	held_w_class = WEIGHT_CLASS_TINY
+	worn_slot_flags = ITEM_SLOT_HEAD
+	head_icon = 'monkestation/icons/mob/pets_held.dmi'
+	held_lh = 'monkestation/icons/mob/pets_held_lh.dmi'
+	held_rh = 'monkestation/icons/mob/pets_held_rh.dmi'
+
+// Unsprited crabs will not be worn, new sprites are welcome!
+
+/mob/living/basic/lizard/snake
+	worn_slot_flags = null
+
+/mob/living/basic/lizard/space
+	worn_slot_flags = null
+
+/mob/living/basic/lizard/tegu
+	worn_slot_flags = null
diff --git a/monkestation/code/modules/mob/living/basic/pets/mouse.dm b/monkestation/code/modules/mob/living/basic/pets/mouse.dm
@@ -0,0 +1,8 @@
+/mob/living/basic/mouse
+	worn_slot_flags = ITEM_SLOT_HEAD
+	head_icon = 'monkestation/icons/mob/pets_held.dmi'
+
+// Unsprited crabs will not be worn, new sprites are welcome!
+
+/mob/living/basic/mouse/plague
+	worn_slot_flags = null
diff --git a/...iving/simple_animal/pets/honk_platinum.dm → ...s/mob/living/basic/pets/parrot/_parrot.dm b/...iving/simple_animal/pets/honk_platinum.dm → ...s/mob/living/basic/pets/parrot/_parrot.dm
@@ -1,3 +1,10 @@
+/mob/living/basic/parrot
+	can_be_held = TRUE
+	worn_slot_flags = ITEM_SLOT_HEAD
+	held_state = "parrot"
+	head_icon = 'monkestation/icons/mob/pets_held.dmi'
+	held_lh = 'monkestation/icons/mob/pets_held_lh.dmi'
+	held_rh = 'monkestation/icons/mob/pets_held_rh.dmi'
 
 /mob/living/basic/parrot/honk_platinum
 	name = "Honk Platinum"
@@ -7,7 +14,4 @@
 	icon_living = "honk_fly"
 	icon_sit = "honk_sit"
 	icon_dead = "honk_dead"
-	head_icon = 'monkestation/icons/mob/pets_held.dmi'
-	held_lh = 'monkestation/icons/mob/pets_held_lh.dmi'//icons for holding mobs
-	held_rh = 'monkestation/icons/mob/pets_held_rh.dmi'
 	held_state = "honk_fly"
diff --git a/monkestation/code/modules/mob/living/basic/pets/snake.dm b/monkestation/code/modules/mob/living/basic/pets/snake.dm
@@ -0,0 +1,7 @@
+/mob/living/basic/snake
+	can_be_held = TRUE
+	worn_slot_flags = ITEM_SLOT_HEAD
+	held_state = "snake"
+	head_icon = 'monkestation/icons/mob/pets_held.dmi'
+	held_lh = 'monkestation/icons/mob/pets_held_lh.dmi'
+	held_rh = 'monkestation/icons/mob/pets_held_rh.dmi'
diff --git a/monkestation/code/modules/ranching/chickens/_chick.dm b/monkestation/code/modules/ranching/chickens/_chick.dm
@@ -29,6 +29,12 @@
 	pass_flags = PASSTABLE | PASSGRILLE | PASSMOB
 	mob_size = MOB_SIZE_TINY
 	gold_core_spawnable = FRIENDLY_SPAWN
+	can_be_held = TRUE
+	worn_slot_flags = ITEM_SLOT_HEAD
+	held_state = "chick"
+	head_icon = 'monkestation/icons/mob/pets_held.dmi'
+	held_lh = 'monkestation/icons/mob/pets_held_lh.dmi'
+	held_rh = 'monkestation/icons/mob/pets_held_rh.dmi'
 
 	ai_controller = /datum/ai_controller/basic_controller/chick
 

diff --git a/monkestation/code/modules/ranching/chickens/_chicken.dm b/monkestation/code/modules/ranching/chickens/_chicken.dm
@@ -14,6 +14,9 @@
 	icon_living = "chicken_white"
 	icon_dead = "dead_state"
 	held_state = "chicken_white"
+	head_icon = 'monkestation/icons/mob/pets_held.dmi'
+	held_lh = 'monkestation/icons/mob/pets_held_lh.dmi'
+	held_rh = 'monkestation/icons/mob/pets_held_rh.dmi'
 
 	speak_emote = list("clucks","croons")
 
@@ -40,6 +43,7 @@
 
 /mob/living/basic/chicken/Initialize(mapload)
 	. = ..()
+	head_icon = 'monkestation/icons/mob/pets_held_large.dmi'
 	pixel_x = rand(-6, 6)
 	pixel_y = rand(0, 10)
 	health = maxHealth

diff --git a/monkestation/code/modules/ranching/chickens/misc/gary.dm b/monkestation/code/modules/ranching/chickens/misc/gary.dm
@@ -1,5 +1,6 @@
 ///gary is gonna have nothing to do with other crows because of how much unique code it has
 /mob/living/basic/chicken/gary
+	worn_slot_flags = null
 	breed_name_male = "Gary"
 	breed_name_female = "Gary"
 	desc = "Gary the Crow. An inquisitive, yet cruel barterer."

diff --git a/monkestation/code/modules/ranching/chickens/misc_chickens.dm b/monkestation/code/modules/ranching/chickens/misc_chickens.dm
@@ -5,6 +5,7 @@
 	icon_state = "turkey_plain"
 	icon_living = "turkey_plain"
 	icon_dead = "turkey_plain_dead"
+	worn_slot_flags = null
 	speak_emote = list("clucks","gobbles")
 	density = FALSE
 	health = 15

diff --git a/monkestation/code/modules/ranching/chickens/tier1/clown.dm b/monkestation/code/modules/ranching/chickens/tier1/clown.dm
@@ -1,5 +1,6 @@
 /mob/living/basic/chicken/clown
 	icon_suffix = "clown"
+	worn_slot_flags = null
 
 	breed_name_female = "Henk"
 	breed_name_male = "Henkster"
@@ -14,6 +15,7 @@
 	targeted_ability = /datum/action/cooldown/mob_cooldown/chicken/honk
 
 	book_desc = "Tries very hard to be funny and occasionally honks."
+
 /obj/item/food/egg/clown
 	name = "Clown Egg?"
 	food_reagents = list(/datum/reagent/water = 50)

diff --git a/monkestation/code/modules/ranching/chickens/tier1/glass.dm b/monkestation/code/modules/ranching/chickens/tier1/glass.dm
@@ -1,12 +1,14 @@
 /mob/living/basic/chicken/glass
 	icon_suffix = "glass"
+	worn_slot_flags = null
 
 	breed_name = "Glass"
 	egg_type = /obj/item/food/egg/glass
 	mutation_list = list(/datum/mutation/ranching/chicken/wiznerd, /datum/mutation/ranching/chicken/stone)
 	liked_foods = list(/obj/item/food/grown/rice = 2)
 
 	book_desc = "Fragile as glass, but produces the chemical injected into its egg overtime."
+
 /obj/item/food/egg/glass
 	name = "Glass Egg"
 	food_reagents = list()

diff --git a/monkestation/code/modules/ranching/chickens/tier1/ixworth.dm b/monkestation/code/modules/ranching/chickens/tier1/ixworth.dm
@@ -1,12 +1,14 @@
 /mob/living/basic/chicken/ixworth
 	icon_suffix = "ixworth"
+	worn_slot_flags = null
 
 	breed_name = "Ixworth"
 	egg_type = /obj/item/food/egg/ixworth
 	mutation_list = list()
 	liked_foods = list(/obj/item/food/grown/tomato = 2)
 
 	book_desc = "A very stylish breed."
+
 /obj/item/food/egg/ixworth
 	name = "Ixworth Egg"
 	icon_state = "ixworth"

diff --git a/monkestation/code/modules/ranching/chickens/tier1/onagadori.dm b/monkestation/code/modules/ranching/chickens/tier1/onagadori.dm
@@ -1,6 +1,7 @@
 
 /mob/living/basic/chicken/onagadori
 	icon_suffix = "onagadori"
+	worn_slot_flags = null
 
 	breed_name = "Onagadori"
 	egg_type = /obj/item/food/egg/onagadori
@@ -9,6 +10,7 @@
 
 	book_desc = "Japanese long-tailed chickens, with no unique features aside from its plumage."
 
+
 /obj/item/food/egg/onagadori
 	name = "Onagadori Egg"
 	icon_state = "onagadori"

diff --git a/monkestation/code/modules/ranching/chickens/tier1/silkie.dm b/monkestation/code/modules/ranching/chickens/tier1/silkie.dm
@@ -1,5 +1,6 @@
 /mob/living/basic/chicken/silkie
 	icon_suffix = "silkie"
+	worn_slot_flags = null
 
 	breed_name = "Selkie"
 	egg_type = /obj/item/food/egg/silkie

diff --git a/monkestation/code/modules/ranching/chickens/tier1/silkie_black.dm b/monkestation/code/modules/ranching/chickens/tier1/silkie_black.dm
@@ -1,5 +1,6 @@
 /mob/living/basic/chicken/silkie_black
 	icon_suffix = "silkie_black"
+	worn_slot_flags = null
 
 	breed_name = "Black Selkie"
 	egg_type = /obj/item/food/egg/silkie_black

diff --git a/monkestation/code/modules/ranching/chickens/tier1/silkie_white.dm b/monkestation/code/modules/ranching/chickens/tier1/silkie_white.dm
@@ -1,5 +1,6 @@
 /mob/living/basic/chicken/silkie_white
 	icon_suffix = "silkie_white"
+	worn_slot_flags = null
 
 	breed_name = "White Silkie"
 	egg_type = /obj/item/food/egg/silkie_white

diff --git a/monkestation/code/modules/ranching/chickens/tier1/void.dm b/monkestation/code/modules/ranching/chickens/tier1/void.dm
@@ -1,5 +1,6 @@
 /mob/living/basic/chicken/void
 	icon_suffix = "void"
+	worn_slot_flags = null
 
 	breed_name = "Void"
 	egg_type = /obj/item/food/egg/void

diff --git a/monkestation/code/modules/ranching/chickens/tier2/cluwne.dm b/monkestation/code/modules/ranching/chickens/tier2/cluwne.dm
@@ -1,5 +1,6 @@
 /mob/living/basic/chicken/clown_sad
 	icon_suffix = "sad_clown"
+	worn_slot_flags = null
 
 	breed_name_male = "huOnkHoNkHoeNK"
 	breed_name_female = "huOnkHoNkHoeNK"

diff --git a/monkestation/code/modules/ranching/chickens/tier2/cotton_candy.dm b/monkestation/code/modules/ranching/chickens/tier2/cotton_candy.dm
@@ -1,5 +1,6 @@
 /mob/living/basic/chicken/cotton_candy
 	icon_suffix = "cotton_candy"
+	worn_slot_flags = null
 
 	breed_name = "Cotton Candy"
 	egg_type = /obj/item/food/egg/cotton_candy

diff --git a/monkestation/code/modules/ranching/chickens/tier2/dream.dm b/monkestation/code/modules/ranching/chickens/tier2/dream.dm
@@ -1,5 +1,6 @@
 /mob/living/basic/chicken/dream
 	icon_suffix = "dreaming"
+	worn_slot_flags = null
 
 	breed_name = "Dream"
 	egg_type = /obj/item/food/egg/dream

diff --git a/monkestation/code/modules/ranching/chickens/tier2/golden.dm b/monkestation/code/modules/ranching/chickens/tier2/golden.dm
@@ -1,5 +1,6 @@
 /mob/living/basic/chicken/golden
 	icon_suffix = "gold"
+	worn_slot_flags = null
 
 	breed_name = "Golden"
 	egg_type = /obj/item/food/egg/golden

diff --git a/monkestation/code/modules/ranching/chickens/tier2/mime.dm b/monkestation/code/modules/ranching/chickens/tier2/mime.dm
@@ -1,5 +1,6 @@
 /mob/living/basic/chicken/mime
 	icon_suffix = "mime"
+	worn_slot_flags = null
 
 	breed_name = "Mime"
 	egg_type = /obj/item/food/egg/mime

diff --git a/monkestation/code/modules/ranching/chickens/tier2/pigeon.dm b/monkestation/code/modules/ranching/chickens/tier2/pigeon.dm
@@ -1,5 +1,6 @@
 /mob/living/basic/chicken/pigeon
 	icon_suffix = "pigeon"
+	worn_slot_flags = null
 
 	breed_name_male = "Pigeon"
 	breed_name_female = "Pigeon"

diff --git a/monkestation/code/modules/ranching/chickens/tier2/raptor.dm b/monkestation/code/modules/ranching/chickens/tier2/raptor.dm
@@ -1,5 +1,6 @@
 /mob/living/basic/chicken/raptor
 	icon_suffix = "raptor"
+	worn_slot_flags = null
 
 	breed_name = "Raptor"
 	breed_name_male = "Tiercel"

diff --git a/monkestation/code/modules/ranching/chickens/tier2/snowy.dm b/monkestation/code/modules/ranching/chickens/tier2/snowy.dm
@@ -1,5 +1,6 @@
 /mob/living/basic/chicken/snowy
 	icon_suffix = "snowy"
+	worn_slot_flags = null
 
 	breed_name = "Snow"
 	egg_type = /obj/item/food/egg/snowy

diff --git a/monkestation/code/modules/ranching/chickens/tier2/spicy.dm b/monkestation/code/modules/ranching/chickens/tier2/spicy.dm
@@ -1,5 +1,6 @@
 /mob/living/basic/chicken/spicy
 	icon_suffix = "spicy"
+	worn_slot_flags = null
 
 	breed_name = "Spicy"
 	egg_type = /obj/item/food/egg/spicy

diff --git a/monkestation/code/modules/ranching/chickens/tier2/stone.dm b/monkestation/code/modules/ranching/chickens/tier2/stone.dm
@@ -1,6 +1,7 @@
 #define MINIMUM_BREAK_FORCE 10
 /mob/living/basic/chicken/stone
 	icon_suffix = "stone"
+	worn_slot_flags = null
 
 	breed_name = "Stone"
 	egg_type = /obj/item/food/egg/stone

diff --git a/monkestation/code/modules/ranching/chickens/tier2/sword.dm b/monkestation/code/modules/ranching/chickens/tier2/sword.dm
@@ -1,5 +1,6 @@
 /mob/living/basic/chicken/sword
 	icon_suffix = "sword"
+	worn_slot_flags = null
 
 	maxHealth = 300
 	melee_damage_lower = 2 //weak damage but strong health