mirror of
https://github.com/Bubberstation/Bubberstation.git
synced 2026-08-23 05:00:55 +01:00
You can pick up chicks now (and their moms) (#96873)
## About The Pull Request For some reason, you couldn't pick up chickens or chicks. Now you can! They can go in bags and even on your head! A side effect of this change is baby chicks won't grow up until you drop them on the ground, or else they would just disappear upon growing up. In-hand sprites by [mms142](https://github.com/mms142): <img width="258" height="130" alt="chick" src="https://github.com/user-attachments/assets/329192cd-be75-4140-b46e-de12c58ba928" /> <img width="258" height="130" alt="black" src="https://github.com/user-attachments/assets/64c29cc1-d8f5-4a3c-b678-32a307cc5003" /> <img width="258" height="130" alt="brown" src="https://github.com/user-attachments/assets/325c3ecf-f374-46db-be93-25ce5165ad13" /> <img width="258" height="130" alt="white" src="https://github.com/user-attachments/assets/d9c82fc3-4d1b-44be-8703-2e14ff4609f6" /> ## Why It's Good For The Game Chicks and chickens are small and cute and they deserve to be held sometimes. ## Changelog 🆑 add: Chickens can be picked up and held now! Sprites by mms142 /🆑
This commit is contained in:
@@ -27,6 +27,8 @@
|
||||
maxHealth = 3
|
||||
pass_flags = PASSTABLE | PASSGRILLE | PASSMOB
|
||||
mob_size = MOB_SIZE_TINY
|
||||
held_lh = 'icons/mob/inhands/pets_held_lh.dmi'
|
||||
held_rh = 'icons/mob/inhands/pets_held_rh.dmi'
|
||||
gold_core_spawnable = FRIENDLY_SPAWN
|
||||
ai_controller = /datum/ai_controller/basic_controller/chick
|
||||
|
||||
@@ -56,6 +58,7 @@
|
||||
AddElement(/datum/element/pet_bonus, "chirp")
|
||||
AddElement(/datum/element/swabable, CELL_LINE_TABLE_CHICKEN, CELL_VIRUS_TABLE_GENERIC_MOB, 1, 5)
|
||||
AddElement(/datum/element/footstep, FOOTSTEP_MOB_CLAW)
|
||||
AddElement(/datum/element/can_be_held)
|
||||
|
||||
if(!isnull(grow_as)) // we don't have a set time to grow up beyond whatever RNG dictates, and if we somehow get a client, all growth halts.
|
||||
AddComponent(\
|
||||
@@ -71,7 +74,7 @@
|
||||
|
||||
/// We don't grow into a chicken if we're not conscious.
|
||||
/mob/living/basic/chick/proc/ready_to_grow()
|
||||
return (stat == CONSCIOUS)
|
||||
return (stat == CONSCIOUS) && !istype(loc, /obj/item/mob_holder)
|
||||
|
||||
/// Variant of chick that just spawns in the holodeck so you can pet it. Doesn't grow up.
|
||||
/mob/living/basic/chick/permanent
|
||||
|
||||
@@ -31,6 +31,8 @@ GLOBAL_VAR_INIT(chicken_count, 0)
|
||||
maxHealth = 15
|
||||
pass_flags = PASSTABLE | PASSMOB
|
||||
mob_size = MOB_SIZE_SMALL
|
||||
held_lh = 'icons/mob/inhands/pets_held_lh.dmi'
|
||||
held_rh = 'icons/mob/inhands/pets_held_rh.dmi'
|
||||
gold_core_spawnable = FRIENDLY_SPAWN
|
||||
|
||||
ai_controller = /datum/ai_controller/basic_controller/chicken
|
||||
@@ -60,6 +62,8 @@ GLOBAL_VAR_INIT(chicken_count, 0)
|
||||
AddElement(/datum/element/footstep, FOOTSTEP_MOB_CLAW)
|
||||
AddElement(/datum/element/swabable, CELL_LINE_TABLE_CHICKEN, CELL_VIRUS_TABLE_GENERIC_MOB, 1, 5)
|
||||
AddElement(/datum/element/animal_variety, "chicken", pick("brown", "black", "white"), modify_pixels = TRUE)
|
||||
AddElement(/datum/element/can_be_held)
|
||||
|
||||
AddComponent(\
|
||||
/datum/component/egg_layer,\
|
||||
/obj/item/food/egg/organic,\
|
||||
|
||||
Reference in New Issue
Block a user