mirror of
https://github.com/Bubberstation/Bubberstation.git
synced 2026-08-30 00:29:02 +01:00
moved process() to datum. made /datum/reagents/ process instead of the containers.
This commit is contained in:
@@ -17,7 +17,7 @@ datum/reagents
|
||||
|
||||
datum/reagents/New(maximum=100)
|
||||
maximum_volume = maximum
|
||||
|
||||
SSobj.processing |= src
|
||||
//I dislike having these here but map-objects are initialised before world/New() is called. >_>
|
||||
if(!chemical_reagents_list)
|
||||
//Chemical Reagents - Initialises all /datum/reagent into a list indexed by reagent id
|
||||
@@ -53,6 +53,7 @@ datum/reagents/New(maximum=100)
|
||||
|
||||
datum/reagents/Destroy()
|
||||
..()
|
||||
SSobj.processing.Remove(src)
|
||||
for(var/datum/reagent/R in reagent_list)
|
||||
qdel(R)
|
||||
reagent_list.Cut()
|
||||
@@ -260,7 +261,7 @@ datum/reagents/proc/metabolize(var/mob/M)
|
||||
last_tick++
|
||||
update_total()
|
||||
|
||||
datum/reagents/proc/reagent_on_tick()
|
||||
datum/reagents/process()
|
||||
for(var/datum/reagent/R in reagent_list)
|
||||
R.on_tick()
|
||||
return
|
||||
|
||||
@@ -35,11 +35,6 @@
|
||||
reagents.add_reagent("blood", disease_amount, data)
|
||||
if(list_reagents)
|
||||
reagents.add_reagent_list(list_reagents)
|
||||
SSobj.processing |= src
|
||||
|
||||
/obj/item/weapon/reagent_containers/Destroy()
|
||||
SSobj.processing.Remove(src)
|
||||
..()
|
||||
|
||||
/obj/item/weapon/reagent_containers/attack_self(mob/user as mob)
|
||||
return
|
||||
@@ -83,12 +78,6 @@
|
||||
return 0
|
||||
return 1
|
||||
|
||||
|
||||
/obj/item/weapon/reagent_containers/process()
|
||||
if(reagents)
|
||||
reagents.reagent_on_tick()
|
||||
return
|
||||
|
||||
/obj/item/weapon/reagent_containers/ex_act()
|
||||
if(reagents)
|
||||
for(var/datum/reagent/R in reagents.reagent_list)
|
||||
|
||||
Reference in New Issue
Block a user