From 848968834abc17093a6a0abfb377285e6889394b Mon Sep 17 00:00:00 2001 From: AnturK Date: Fri, 6 Oct 2017 14:10:08 +0200 Subject: [PATCH 1/2] Fixes outdated away code. --- .../awaymissions/mission_code/stationCollision.dm | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/code/modules/awaymissions/mission_code/stationCollision.dm b/code/modules/awaymissions/mission_code/stationCollision.dm index e3af2a99d7..4e95a3f030 100644 --- a/code/modules/awaymissions/mission_code/stationCollision.dm +++ b/code/modules/awaymissions/mission_code/stationCollision.dm @@ -136,20 +136,20 @@ 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() +<<<<<<< HEAD /obj/singularity/narsie/sc_Narsie/consume(atom/A) if(is_type_in_list(A, uneatable)) return 0 @@ -172,4 +172,7 @@ GLOBAL_VAR_INIT(sc_safecode5, "[rand(0,9)]") return /obj/singularity/narsie/sc_Narsie/ex_act() +======= +/obj/singularity/narsie/mini/ex_act() +>>>>>>> ae7720b... Fixes outdated away code. (#31314) return \ No newline at end of file From 493352f680e14483263fdb5984dd9b8f4f70f690 Mon Sep 17 00:00:00 2001 From: LetterJay Date: Fri, 6 Oct 2017 22:23:31 -0500 Subject: [PATCH 2/2] Update stationCollision.dm --- .../mission_code/stationCollision.dm | 27 +------------------ 1 file changed, 1 insertion(+), 26 deletions(-) diff --git a/code/modules/awaymissions/mission_code/stationCollision.dm b/code/modules/awaymissions/mission_code/stationCollision.dm index 4e95a3f030..6e6ee2dc4a 100644 --- a/code/modules/awaymissions/mission_code/stationCollision.dm +++ b/code/modules/awaymissions/mission_code/stationCollision.dm @@ -149,30 +149,5 @@ GLOBAL_VAR_INIT(sc_safecode5, "[rand(0,9)]") if(prob(25)) mezzer() -<<<<<<< HEAD -/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) - return - -/obj/singularity/narsie/sc_Narsie/ex_act() -======= /obj/singularity/narsie/mini/ex_act() ->>>>>>> ae7720b... Fixes outdated away code. (#31314) - return \ No newline at end of file + return