cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-13 19:52:40 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #10931 from Very-Soft/ghostlyanimals

Browse Source 
Makes ghosts able to play as some mobs sometimes
This commit is contained in:
Aronai Sieyes
2021-07-07 14:37:39 -04:00
committed by Chompstation Bot
parent 7e10238662
commit 1deccaed87
2 changed files with 14 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
code/game/objects/structures/crates_lockers/largecrate.dm
View File

@@ -31,7 +31,14 @@
for(var/atom/movable/AM in contents) for(var/atom/movable/AM in contents)
if(AM.simulated) if(AM.simulated)
AM.forceMove(T) 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("<span class='notice'>[user] pries \the [src] open.</span>", \ user.visible_message("<span class='notice'>[user] pries \the [src] open.</span>", \
"<span class='notice'>You pry open \the [src].</span>", \ "<span class='notice'>You pry open \the [src].</span>", \
"<span class='notice'>You hear splitting wood.</span>") "<span class='notice'>You hear splitting wood.</span>")

7
code/modules/mob/living/simple_mob/subtypes/animal/farm animals/chicken.dm
View File

@@ -141,7 +141,12 @@ GLOBAL_VAR_INIT(chicken_count, 0) // How mant chickens DO we have?
if(!stat) if(!stat)
amount_grown += rand(1,2) amount_grown += rand(1,2)
if(amount_grown >= 100) if(amount_grown >= 100)
new /mob/living/simple_mob/animal/passive/chicken(src.loc) //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) qdel(src)
// Say Lists // Say Lists