From f20c247c554497d93c590fb4904514ade84dd6b3 Mon Sep 17 00:00:00 2001 From: VerySoft Date: Mon, 5 Jul 2021 23:18:06 -0400 Subject: [PATCH 1/2] Makes ghosts able to play as some mobs sometimes Like, when chicks grow up, they can play as the chicken they can also play as mobs that are released from cargo crates --- .../game/objects/structures/crates_lockers/largecrate.dm | 9 ++++++++- .../simple_mob/subtypes/animal/farm animals/chicken.dm | 5 ++++- 2 files changed, 12 insertions(+), 2 deletions(-) diff --git a/code/game/objects/structures/crates_lockers/largecrate.dm b/code/game/objects/structures/crates_lockers/largecrate.dm index c9909656f4f..7c8f95ea430 100644 --- a/code/game/objects/structures/crates_lockers/largecrate.dm +++ b/code/game/objects/structures/crates_lockers/largecrate.dm @@ -31,7 +31,14 @@ for(var/atom/movable/AM in contents) if(AM.simulated) AM.forceMove(T) - + //VOREStation Add Start + if(isanimal(AM)) + var/mob/living/simple_mob/AMBLINAL = AM + if(!AMBLINAL.mind) + AMBLINAL.ghostjoin = 1 + AMBLINAL.ghostjoin_icon() + active_ghost_pods |= AMBLINAL + //VOREStation Add End user.visible_message("[user] pries \the [src] open.", \ "You pry open \the [src].", \ "You hear splitting wood.") diff --git a/code/modules/mob/living/simple_mob/subtypes/animal/farm animals/chicken.dm b/code/modules/mob/living/simple_mob/subtypes/animal/farm animals/chicken.dm index 76d7bb9353a..0078501aff1 100644 --- a/code/modules/mob/living/simple_mob/subtypes/animal/farm animals/chicken.dm +++ b/code/modules/mob/living/simple_mob/subtypes/animal/farm animals/chicken.dm @@ -141,7 +141,10 @@ GLOBAL_VAR_INIT(chicken_count, 0) // How mant chickens DO we have? if(!stat) amount_grown += rand(1,2) if(amount_grown >= 100) - new /mob/living/simple_mob/animal/passive/chicken(src.loc) + var/mob/living/simple_mob/animal/passive/chicken/C = new (src.loc) + C.ghostjoin = 1 + C.ghostjoin_icon() + active_ghost_pods |= C qdel(src) // Say Lists From 4eebe7f6c3439e4043770a4482ee2ba75bcc552b Mon Sep 17 00:00:00 2001 From: VerySoft Date: Mon, 5 Jul 2021 23:21:23 -0400 Subject: [PATCH 2/2] VOREStation Edit tag --- .../living/simple_mob/subtypes/animal/farm animals/chicken.dm | 2 ++ 1 file changed, 2 insertions(+) diff --git a/code/modules/mob/living/simple_mob/subtypes/animal/farm animals/chicken.dm b/code/modules/mob/living/simple_mob/subtypes/animal/farm animals/chicken.dm index 0078501aff1..d415ef30efb 100644 --- a/code/modules/mob/living/simple_mob/subtypes/animal/farm animals/chicken.dm +++ b/code/modules/mob/living/simple_mob/subtypes/animal/farm animals/chicken.dm @@ -141,10 +141,12 @@ GLOBAL_VAR_INIT(chicken_count, 0) // How mant chickens DO we have? if(!stat) amount_grown += rand(1,2) if(amount_grown >= 100) + //VOREStation Edit Begin var/mob/living/simple_mob/animal/passive/chicken/C = new (src.loc) C.ghostjoin = 1 C.ghostjoin_icon() active_ghost_pods |= C + //VOREStation Edit End qdel(src) // Say Lists