the-figment-that-was-is-now-gone

This commit is contained in:
Fox McCloud
2019-10-01 19:08:15 -04:00
parent a469d0fcf2
commit d29be05f74
93 changed files with 367 additions and 824 deletions
@@ -56,7 +56,7 @@
/obj/machinery/chem_dispenser/mutagensaltpeter
name = "botanical chemical dispenser"
desc = "Creates and dispenses chemicals useful for botany."
can_deconstruct = FALSE
flags = NODECONSTRUCT
dispensable_reagents = list(
"mutagen",
@@ -134,12 +134,16 @@
SSnanoui.update_uis(src) // update all UIs attached to src
/obj/machinery/chem_dispenser/ex_act(severity)
switch(severity)
if(1)
qdel(src)
if(2)
if(prob(50))
qdel(src)
if(severity < 3)
if(beaker)
beaker.ex_act(severity)
..()
/obj/machinery/chem_dispenser/handle_atom_del(atom/A)
..()
if(A == beaker)
beaker = null
overlays.Cut()
/obj/machinery/chem_dispenser/ui_interact(mob/user, ui_key = "main", datum/nanoui/ui = null, force_open = 1)
// update the ui if it exists, returns null if no ui is passed/found
@@ -42,12 +42,21 @@
reagents.maximum_volume += B.reagents.maximum_volume
/obj/machinery/chem_master/ex_act(severity)
switch(severity)
if(1)
qdel(src)
if(2)
if(prob(50))
qdel(src)
if(severity < 3)
if(beaker)
beaker.ex_act(severity)
if(loaded_pill_bottle)
loaded_pill_bottle.ex_act(severity)
..()
/obj/machinery/chem_master/handle_atom_del(atom/A)
..()
if(A == beaker)
beaker = null
reagents.clear_reagents()
update_icon()
else if(A == loaded_pill_bottle)
loaded_pill_bottle = null
/obj/machinery/chem_master/update_icon()
overlays.Cut()
@@ -122,6 +122,11 @@
beaker.ex_act(severity)
..()
/obj/machinery/reagentgrinder/handle_atom_del(atom/A)
if(A == beaker)
beaker = null
update_icon()
/obj/machinery/reagentgrinder/update_icon()
if(beaker)
icon_state = "juicer1"
+2 -1
View File
@@ -45,7 +45,8 @@ obj/item/reagent_containers/proc/add_initial_reagents()
if(reagents)
for(var/datum/reagent/R in reagents.reagent_list)
R.on_ex_act()
..()
if(!QDELETED(src))
..()
/obj/item/reagent_containers/attack_self(mob/user)
if(has_lid)