cyberpresidentvanellope/Bubberstation
1
0
Fork 0
mirror of https://github.com/Bubberstation/Bubberstation.git synced 2026-07-20 20:45:28 +01:00
Code Issues Packages Projects Releases Wiki Activity

stop the pills (#18703)

Browse Source 
* RedPills Processing

Now you have to use START_PROCESSING(SSname, thing) (and STOP_PROCESSING)

* Fixes a minor bug.
This commit is contained in:
Kyle Spier-Swenson
2016-06-20 03:07:44 -07:00
committed by AnturK
parent c480ad71ee
commit 0d6bbbb412
90 changed files with 424 additions and 416 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/assembly/health.dm
+4 -4
View File
@@ -22,10 +22,10 @@
/obj/item/device/assembly/health/toggle_secure()
secured = !secured
if(secured && scanning)
SSobj.processing |= src
START_PROCESSING(SSobj, src)
else
scanning = 0
SSobj.processing.Remove(src)
STOP_PROCESSING(SSobj, src)
update_icon()
return secured
@@ -67,9 +67,9 @@
return 0
scanning = !scanning
if(scanning)
SSobj.processing |= src
START_PROCESSING(SSobj, src)
else
SSobj.processing.Remove(src)
STOP_PROCESSING(SSobj, src)
return
/obj/item/device/assembly/health/interact(mob/user as mob)//TODO: Change this to the wires thingy
code/modules/assembly/infrared.dm
+3 -3
View File
@@ -13,7 +13,7 @@
/obj/item/device/assembly/infra/New()
..()
SSobj.processing |= src
START_PROCESSING(SSobj, src)
/obj/item/device/assembly/infra/Destroy()
if(first)
@@ -33,12 +33,12 @@
/obj/item/device/assembly/infra/toggle_secure()
secured = !secured
if(secured)
SSobj.processing |= src
START_PROCESSING(SSobj, src)
else
on = 0
if(first)
qdel(first)
SSobj.processing.Remove(src)
STOP_PROCESSING(SSobj, src)
update_icon()
return secured
code/modules/assembly/proximity.dm
+1 -1
View File
@@ -21,7 +21,7 @@
/obj/item/device/assembly/prox_sensor/New()
..()
SSobj.processing |= src
START_PROCESSING(SSobj, src)
oldloc = loc
/obj/item/device/assembly/prox_sensor/describe()
code/modules/assembly/timer.dm
+3 -3
View File
@@ -14,7 +14,7 @@
/obj/item/device/assembly/timer/New()
..()
SSobj.processing |= src
START_PROCESSING(SSobj, src)
/obj/item/device/assembly/timer/describe()
if(timing)
@@ -33,10 +33,10 @@
/obj/item/device/assembly/timer/toggle_secure()
secured = !secured
if(secured)
SSobj.processing |= src
START_PROCESSING(SSobj, src)
else
timing = 0
SSobj.processing.Remove(src)
STOP_PROCESSING(SSobj, src)
update_icon()
return secured