From 5af97c3edceac5a7a86e46b34cf441c4ca7efcf2 Mon Sep 17 00:00:00 2001 From: ninjanomnom Date: Wed, 11 Apr 2018 00:42:33 -0400 Subject: [PATCH 1/2] Removes some duplicated code --- code/game/turfs/simulated/floor/plating/asteroid.dm | 3 +++ 1 file changed, 3 insertions(+) diff --git a/code/game/turfs/simulated/floor/plating/asteroid.dm b/code/game/turfs/simulated/floor/plating/asteroid.dm index 09335314c0..d37d9ee1f2 100644 --- a/code/game/turfs/simulated/floor/plating/asteroid.dm +++ b/code/game/turfs/simulated/floor/plating/asteroid.dm @@ -49,6 +49,7 @@ O.attackby(W,user) return +<<<<<<< HEAD if(istype(W, /obj/item/stack/tile)) var/obj/item/stack/tile/Z = W if(!Z.use(1)) @@ -62,6 +63,8 @@ return +======= +>>>>>>> bc6eeed... Removes some duplicated code /turf/open/floor/plating/asteroid/singularity_act() if(is_planet_level(z)) return ..() From 8e293a20aab934f3b07283b92d84fea8f5b632ae Mon Sep 17 00:00:00 2001 From: LetterJay Date: Thu, 12 Apr 2018 07:04:33 -0500 Subject: [PATCH 2/2] Update asteroid.dm --- .../turfs/simulated/floor/plating/asteroid.dm | 18 +----------------- 1 file changed, 1 insertion(+), 17 deletions(-) diff --git a/code/game/turfs/simulated/floor/plating/asteroid.dm b/code/game/turfs/simulated/floor/plating/asteroid.dm index d37d9ee1f2..1c174524bb 100644 --- a/code/game/turfs/simulated/floor/plating/asteroid.dm +++ b/code/game/turfs/simulated/floor/plating/asteroid.dm @@ -48,23 +48,7 @@ for(var/obj/item/stack/ore/O in contents) O.attackby(W,user) return - -<<<<<<< HEAD - if(istype(W, /obj/item/stack/tile)) - var/obj/item/stack/tile/Z = W - if(!Z.use(1)) - return - var/turf/open/floor/T = ChangeTurf(Z.turf_type) - if(istype(Z, /obj/item/stack/tile/light)) //TODO: get rid of this ugly check somehow - var/obj/item/stack/tile/light/L = Z - var/turf/open/floor/light/F = T - F.state = L.state - playsound(src, 'sound/weapons/genhit.ogg', 50, 1) - return - - -======= ->>>>>>> bc6eeed... Removes some duplicated code + /turf/open/floor/plating/asteroid/singularity_act() if(is_planet_level(z)) return ..()