This commit is contained in:
Fox McCloud
2019-04-24 00:49:23 -04:00
parent 0034e851a1
commit 89883a7b28
5 changed files with 12 additions and 7 deletions
+4
View File
@@ -156,6 +156,10 @@
START_PROCESSING(SSobj, src)
//return
/obj/effect/rend/Destroy()
STOP_PROCESSING(SSobj, src)
return ..()
/obj/effect/rend/process()
for(var/mob/M in loc)
return
+2 -4
View File
@@ -126,10 +126,6 @@ Class Procs:
. = ..()
GLOB.machines += src
addAtProcessing()
power_change()
/obj/machinery/proc/addAtProcessing()
if(use_power)
myArea = get_area(src)
if(!speed_process)
@@ -137,6 +133,8 @@ Class Procs:
else
START_PROCESSING(SSfastprocess, src)
power_change()
// gotta go fast
/obj/machinery/makeSpeedProcess()
if(speed_process)
+2 -2
View File
@@ -166,10 +166,10 @@
name = "Automatic X-Ray 5000"
desc = "A large metalic machine with an entrance and an exit. A sign on the side reads, 'backpack go in, backpack come out', 'human go in, irradiated human come out'."
/obj/machinery/transformer/xray/New()
/obj/machinery/transformer/xray/Initialize(mapload)
. = ..()
// On us
new /obj/machinery/conveyor/auto(loc, EAST)
addAtProcessing()
/obj/machinery/transformer/xray/conveyor/New()
..()
-1
View File
@@ -28,7 +28,6 @@
var/obj/item/clothing/mask/cigarette/cig = W
if(cig.lit == 1)
src.visible_message("[user] crushes [cig] in [src], putting it out.")
STOP_PROCESSING(SSobj, cig)
var/obj/item/butt = new cig.type_butt(src)
cig.transfer_fingerprints_to(butt)
qdel(cig)
@@ -645,6 +645,10 @@
START_PROCESSING(SSobj, src)
cooldown = world.time
/obj/item/storage/belt/bluespace/owlman/Destroy()
STOP_PROCESSING(SSobj, src)
return ..()
/obj/item/storage/belt/bluespace/owlman/process()
if(cooldown < world.time - 600)
smokecount = 0