shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #3180 from Citadel-Station-13/upstream-merge-31314

Browse Source 
[MIRROR] Fixes outdated away code.
This commit is contained in:
LetterJay
2017-10-07 01:04:19 -04:00
committed by GitHub
parent 2aaabda3a6 493352f680
commit df53b21666
1 changed files with 4 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/awaymissions/mission_code/stationCollision.dm
+4 -26
View File
@@ -136,40 +136,18 @@ GLOBAL_VAR_INIT(sc_safecode5, "[rand(0,9)]")
/*
* Modified Nar-Sie
*/
/obj/singularity/narsie/sc_Narsie
/obj/singularity/narsie/mini
desc = "Your body becomes weak and your feel your mind slipping away as you try to comprehend what you know can't be possible."
move_self = 0 //Contianed narsie does not move!
grav_pull = 0 //Contained narsie does not pull stuff in!
var/uneatable = list(/turf/open/space, /obj/effect/overlay, /mob/living/simple_animal/hostile/construct)
//Override this to prevent no adminlog runtimes and admin warnings about a singularity without containment
/obj/singularity/narsie/sc_Narsie/admin_investigate_setup()
/obj/singularity/narsie/mini/admin_investigate_setup()
return
/obj/singularity/narsie/sc_Narsie/process()
/obj/singularity/narsie/mini/process()
eat()
if(prob(25))
mezzer()
/obj/singularity/narsie/sc_Narsie/consume(atom/A)
if(is_type_in_list(A, uneatable))
return 0
if(isliving(A))
var/mob/living/L = A
L.gib()
else if(istype(A, /obj/))
var/obj/O = A
O.ex_act(EXPLODE_DEVASTATE)
if(O) qdel(O)
else if(isturf(A))
var/turf/T = A
if(T.intact)
for(var/obj/O in T.contents)
if(O.level != 1)
continue
if(O.invisibility == INVISIBILITY_MAXIMUM)
src.consume(O)
T.ChangeTurf(/turf/open/space)
/obj/singularity/narsie/mini/ex_act()
return
/obj/singularity/narsie/sc_Narsie/ex_act()
return