[MIRROR] Dunking handle_atom_del() in the trash bin. [MDB IGNORE] (#23183)

* Dunking handle_atom_del() in the trash bin.

* Update _box_magazine.dm

* Modular paths

---------

Co-authored-by: Ghom <42542238+Ghommie@users.noreply.github.com>
Co-authored-by: Giz <13398309+vinylspiders@users.noreply.github.com>
This commit is contained in:
SkyratBot
2023-08-18 18:17:04 +02:00
committed by GitHub
parent da34f6839a
commit d21e06104f
70 changed files with 356 additions and 468 deletions
@@ -220,9 +220,9 @@
if(EXPLODE_LIGHT)
SSexplosions.low_mov_atom += beaker
/obj/machinery/chem_dispenser/handle_atom_del(atom/A)
..()
if(A == beaker)
/obj/machinery/chem_dispenser/Exited(atom/movable/gone, direction)
. = ..()
if(gone == beaker)
beaker = null
cut_overlays()
@@ -49,9 +49,9 @@
QDEL_NULL(beaker)
return ..()
/obj/machinery/chem_heater/handle_atom_del(atom/A)
/obj/machinery/chem_heater/Exited(atom/movable/gone, direction)
. = ..()
if(A == beaker)
if(gone == beaker)
beaker = null
update_appearance()
@@ -115,9 +115,9 @@ GLOBAL_LIST_INIT(chem_master_containers, list(
replace_beaker()
return ..()
/obj/machinery/chem_master/handle_atom_del(atom/deleted_atom)
..()
if(deleted_atom == beaker)
/obj/machinery/chem_master/Exited(atom/movable/gone, direction)
. = ..()
if(gone == beaker)
beaker = null
update_appearance(UPDATE_ICON)
@@ -43,9 +43,9 @@
QDEL_NULL(soundloop)
return ..()
/obj/structure/chem_separator/handle_atom_del(atom/deleted_atom)
..()
if(deleted_atom == beaker)
/obj/structure/chem_separator/Exited(atom/movable/gone, direction)
. = ..()
if(gone == beaker)
beaker = null
update_appearance(UPDATE_ICON)
@@ -73,11 +73,11 @@
/obj/machinery/computer/pandemic/attack_ai_secondary(mob/user, list/modifiers)
return attack_hand_secondary(user, modifiers)
/obj/machinery/computer/pandemic/handle_atom_del(atom/A)
if(A == beaker)
/obj/machinery/computer/pandemic/Exited(atom/movable/gone, direction)
. = ..()
if(gone == beaker)
beaker = null
update_appearance()
return ..()
/obj/machinery/computer/pandemic/attackby(obj/item/held_item, mob/user, params)
//Advanced science! Percision instruments (eg droppers and syringes) are precise enough to modify the loaded sample!
@@ -112,13 +112,13 @@
/obj/machinery/reagentgrinder/attack_ai_secondary(mob/user, list/modifiers)
return attack_hand_secondary(user, modifiers)
/obj/machinery/reagentgrinder/handle_atom_del(atom/A)
/obj/machinery/reagentgrinder/Exited(atom/movable/gone, direction)
. = ..()
if(A == beaker)
if(gone == beaker)
beaker = null
update_appearance()
if(holdingitems[A])
holdingitems -= A
if(holdingitems[gone])
holdingitems -= gone
/obj/machinery/reagentgrinder/proc/drop_all_items()
for(var/i in holdingitems)