Into it's proper place

Monkestation · Sep 30, 2024 · b0a59de · b0a59de
1 parent 9d5d2ea
commit b0a59de
Show file tree

Hide file tree

Showing 31 changed files with 44 additions and 100 deletions.
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/farm_animals.dm b/monkestation/code/modules/mob/living/basic/pets/farm_animals.dm
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

diff --git a/monkestation/code/modules/ranching/chickens/tier2/wiznerd.dm b/monkestation/code/modules/ranching/chickens/tier2/wiznerd.dm
@@ -1,5 +1,6 @@
 /mob/living/basic/chicken/wiznerd //No matter what you say Zanden this is staying as wiznerd
 	icon_suffix = "wiznerd"
+	worn_slot_flags = null
 
 	maxHealth = 150
 	melee_damage_upper = 7

diff --git a/monkestation/code/modules/ranching/chickens/tier3/cockatrice.dm b/monkestation/code/modules/ranching/chickens/tier3/cockatrice.dm
@@ -1,5 +1,6 @@
 /mob/living/basic/chicken/cockatrice
 	icon_suffix = "cockatrice"
+	worn_slot_flags = null
 
 	breed_name_male = "Cockatrice"
 	breed_name_female = "Cockatrice"
@@ -25,6 +26,7 @@
 	egg_type = /obj/item/food/egg/cockatrice
 
 	book_desc = "Part lizard, part chicken, part bat. The Males of this species are capable of spitting a venom that will petrify you temporarily, and are very hostile."
+
 /obj/item/food/egg/cockatrice
 	name = "Petrifying Egg"
 	icon_state = "cockatrice"

diff --git a/monkestation/code/modules/ranching/chickens/tier3/dreamsicle.dm b/monkestation/code/modules/ranching/chickens/tier3/dreamsicle.dm
@@ -1,12 +1,14 @@
 /mob/living/basic/chicken/dreamsicle
 	icon_suffix = "dreamsicle"
+	worn_slot_flags = null
 
 	breed_name = "Dreamsicle"
 	egg_type = /obj/item/food/egg/dreamsicle
 	mutation_list = list()
 	liked_foods = list(/obj/item/food/popsicle/creamsicle_orange = 9)
 
 	book_desc = "Unlike its parent the dreamsicle is able to survive in normal environments, it has also tamed the hyper nature of its parents. This is the perfect hybrid and consuming the egg will make you bounce of the walls leaving a trail of ice behind you."
+
 /obj/item/food/egg/dreamsicle
 	name = "Dreamsicle Egg"
 	icon_state = "dreamsicle"

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

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

diff --git a/monkestation/code/modules/ranching/chickens/tier3/robot.dm b/monkestation/code/modules/ranching/chickens/tier3/robot.dm
@@ -1,5 +1,6 @@
 /mob/living/basic/chicken/robot
 	icon_suffix = "robot"
+	worn_slot_flags = null
 
 	breed_name = "Robotic"