mirror of
https://github.com/Bubberstation/Bubberstation.git
synced 2026-07-19 12:05:59 +01:00
stop the pills (#18703)
* RedPills Processing Now you have to use START_PROCESSING(SSname, thing) (and STOP_PROCESSING) * Fixes a minor bug.
This commit is contained in:
committed by
AnturK
parent
c480ad71ee
commit
0d6bbbb412
@@ -23,7 +23,7 @@ var/const/INJECT = 5 //injection
|
||||
maximum_volume = maximum
|
||||
|
||||
if(!(flags & REAGENT_NOREACT))
|
||||
SSobj.processing |= src
|
||||
START_PROCESSING(SSobj, src)
|
||||
|
||||
//I dislike having these here but map-objects are initialised before world/New() is called. >_>
|
||||
if(!chemical_reagents_list)
|
||||
@@ -60,7 +60,7 @@ var/const/INJECT = 5 //injection
|
||||
|
||||
/datum/reagents/Destroy()
|
||||
. = ..()
|
||||
SSobj.processing -= src
|
||||
STOP_PROCESSING(SSobj, src)
|
||||
for(var/reagent in reagent_list)
|
||||
var/datum/reagent/R = reagent
|
||||
qdel(R)
|
||||
@@ -293,7 +293,7 @@ var/const/INJECT = 5 //injection
|
||||
|
||||
/datum/reagents/process()
|
||||
if(flags & REAGENT_NOREACT)
|
||||
SSobj.processing -= src
|
||||
STOP_PROCESSING(SSobj, src)
|
||||
return
|
||||
|
||||
for(var/reagent in reagent_list)
|
||||
@@ -305,9 +305,9 @@ var/const/INJECT = 5 //injection
|
||||
// Order is important, process() can remove from processing if
|
||||
// the flag is present
|
||||
flags &= ~(REAGENT_NOREACT)
|
||||
SSobj.processing |= src
|
||||
START_PROCESSING(SSobj, src)
|
||||
else
|
||||
SSobj.processing -= src
|
||||
STOP_PROCESSING(SSobj, src)
|
||||
flags |= REAGENT_NOREACT
|
||||
|
||||
/datum/reagents/proc/conditional_update_move(atom/A, Running = 0)
|
||||
|
||||
@@ -38,11 +38,11 @@ Borg Hypospray
|
||||
modes[R] = iteration
|
||||
iteration++
|
||||
|
||||
SSobj.processing |= src
|
||||
START_PROCESSING(SSobj, src)
|
||||
|
||||
|
||||
/obj/item/weapon/reagent_containers/borghypo/Destroy()
|
||||
SSobj.processing.Remove(src)
|
||||
STOP_PROCESSING(SSobj, src)
|
||||
return ..()
|
||||
|
||||
|
||||
|
||||
Reference in New Issue
Block a user