diff --git a/code/game/machinery/PDApainter.dm b/code/game/machinery/PDApainter.dm index 82209221ce..69b39bd382 100644 --- a/code/game/machinery/PDApainter.dm +++ b/code/game/machinery/PDApainter.dm @@ -58,9 +58,9 @@ storedpda.forceMove(loc) storedpda = null -/obj/machinery/pdapainter/contents_explosion(severity, target) +/obj/machinery/pdapainter/contents_explosion(severity, target, origin) if(storedpda) - storedpda.ex_act(severity, target) + storedpda.ex_act(severity, target, origin) /obj/machinery/pdapainter/handle_atom_del(atom/A) if(A == storedpda) diff --git a/code/game/machinery/_machinery.dm b/code/game/machinery/_machinery.dm index e05991dd8a..d2785a1a76 100644 --- a/code/game/machinery/_machinery.dm +++ b/code/game/machinery/_machinery.dm @@ -405,9 +405,9 @@ Class Procs: update_appearance() return TRUE -/obj/machinery/contents_explosion(severity, target) +/obj/machinery/contents_explosion(severity, target, origin) if(occupant) - occupant.ex_act(severity, target) + occupant.ex_act(severity, target, origin) /obj/machinery/handle_atom_del(atom/A) if(A == occupant) diff --git a/code/game/machinery/aug_manipulator.dm b/code/game/machinery/aug_manipulator.dm index e496973d75..19bac616e9 100644 --- a/code/game/machinery/aug_manipulator.dm +++ b/code/game/machinery/aug_manipulator.dm @@ -55,9 +55,9 @@ storedpart.forceMove(loc) storedpart = null -/obj/machinery/aug_manipulator/contents_explosion(severity, target) +/obj/machinery/aug_manipulator/contents_explosion(severity, target, origin) if(storedpart) - storedpart.ex_act(severity, target) + storedpart.ex_act(severity, target, origin) /obj/machinery/aug_manipulator/handle_atom_del(atom/A) if(A == storedpart) diff --git a/code/game/machinery/cryopod.dm b/code/game/machinery/cryopod.dm index f2f8c20776..b68e99bdba 100644 --- a/code/game/machinery/cryopod.dm +++ b/code/game/machinery/cryopod.dm @@ -158,12 +158,9 @@ name = "Circuit board (Cryogenic Oversight Console)" build_path = "/obj/machinery/computer/cryopod" -/obj/machinery/computer/cryopod/contents_explosion() +/obj/machinery/computer/cryopod/contents_explosion(severity, target, origin) return -/obj/machinery/computer/cryopod/contents_explosion() - return //don't blow everyone's shit up. - /// The box /obj/item/storage/box/blue/cryostorage_items w_class = WEIGHT_CLASS_HUGE diff --git a/code/game/mecha/mecha_defense.dm b/code/game/mecha/mecha_defense.dm index 9cc1f7d98d..1db4cc30b9 100644 --- a/code/game/mecha/mecha_defense.dm +++ b/code/game/mecha/mecha_defense.dm @@ -118,16 +118,16 @@ log_append_to_last("Armor saved, changing severity to [severity].") . = ..() -/obj/mecha/contents_explosion(severity, target) +/obj/mecha/contents_explosion(severity, target, origin) severity++ for(var/X in equipment) var/obj/item/mecha_parts/mecha_equipment/ME = X - ME.ex_act(severity,target) + ME.ex_act(severity, target, origin) for(var/Y in trackers) var/obj/item/mecha_parts/mecha_tracking/MT = Y - MT.ex_act(severity, target) + MT.ex_act(severity, target, origin) if(occupant) - occupant.ex_act(severity,target) + occupant.ex_act(severity, target, origin) /obj/mecha/handle_atom_del(atom/A) if(A == occupant) diff --git a/code/game/mecha/working/ripley.dm b/code/game/mecha/working/ripley.dm index 5f54f0c93d..3c2f75bd6c 100644 --- a/code/game/mecha/working/ripley.dm +++ b/code/game/mecha/working/ripley.dm @@ -144,7 +144,7 @@ return -/obj/mecha/working/ripley/contents_explosion(severity, target) +/obj/mecha/working/ripley/contents_explosion(severity, target, origin) for(var/X in cargo) var/obj/O = X if(prob(30/severity)) diff --git a/code/game/objects/items/storage/_storage.dm b/code/game/objects/items/storage/_storage.dm index 2fc1b6484d..04362481b2 100644 --- a/code/game/objects/items/storage/_storage.dm +++ b/code/game/objects/items/storage/_storage.dm @@ -18,10 +18,10 @@ /obj/item/storage/AllowDrop() return TRUE -/obj/item/storage/contents_explosion(severity, target) +/obj/item/storage/contents_explosion(severity, target, origin) var/in_storage = istype(loc, /obj/item/storage)? (max(0, severity - 1)) : (severity) for(var/atom/A in contents) - A.ex_act(in_storage, target) + A.ex_act(in_storage, target, origin) CHECK_TICK //Cyberboss says: "USE THIS TO FILL IT, NOT INITIALIZE OR NEW" diff --git a/code/game/objects/structures/crates_lockers/closets.dm b/code/game/objects/structures/crates_lockers/closets.dm index fe1fb03426..7f98284ea4 100644 --- a/code/game/objects/structures/crates_lockers/closets.dm +++ b/code/game/objects/structures/crates_lockers/closets.dm @@ -554,9 +554,9 @@ if(!QDELETED(lockerelectronics)) lockerelectronics.accesses = req_access -/obj/structure/closet/contents_explosion(severity, target) +/obj/structure/closet/contents_explosion(severity, target, origin) for(var/atom/A in contents) - A.ex_act(severity, target) + A.ex_act(severity, target, origin) CHECK_TICK /obj/structure/closet/singularity_act() diff --git a/code/game/objects/structures/extinguisher.dm b/code/game/objects/structures/extinguisher.dm index 467dd47c50..7542ec6768 100644 --- a/code/game/objects/structures/extinguisher.dm +++ b/code/game/objects/structures/extinguisher.dm @@ -32,9 +32,9 @@ stored_extinguisher = null return ..() -/obj/structure/extinguisher_cabinet/contents_explosion(severity, target) +/obj/structure/extinguisher_cabinet/contents_explosion(severity, target, origin) if(stored_extinguisher) - stored_extinguisher.ex_act(severity, target) + stored_extinguisher.ex_act(severity, target, origin) /obj/structure/extinguisher_cabinet/handle_atom_del(atom/A) if(A == stored_extinguisher) diff --git a/code/game/objects/structures/guncase.dm b/code/game/objects/structures/guncase.dm index e7ff9d4abf..78f0da2db2 100644 --- a/code/game/objects/structures/guncase.dm +++ b/code/game/objects/structures/guncase.dm @@ -91,9 +91,9 @@ /obj/structure/guncase/handle_atom_del(atom/A) update_icon() -/obj/structure/guncase/contents_explosion(severity, target) +/obj/structure/guncase/contents_explosion(severity, target, origin) for(var/atom/A in contents) - A.ex_act(severity++, target) + A.ex_act(severity++, target, origin) CHECK_TICK /obj/structure/guncase/shotgun diff --git a/code/game/objects/structures/transit_tubes/transit_tube_pod.dm b/code/game/objects/structures/transit_tubes/transit_tube_pod.dm index 3d6cbd8fbd..9f3a829633 100644 --- a/code/game/objects/structures/transit_tubes/transit_tube_pod.dm +++ b/code/game/objects/structures/transit_tubes/transit_tube_pod.dm @@ -55,9 +55,9 @@ if(!QDELETED(src)) empty_pod() -/obj/structure/transit_tube_pod/contents_explosion(severity, target) +/obj/structure/transit_tube_pod/contents_explosion(severity, target, origin) for(var/atom/movable/AM in contents) - AM.ex_act(severity, target) + AM.ex_act(severity, target, origin) /obj/structure/transit_tube_pod/singularity_pull(S, current_size) ..() diff --git a/code/modules/atmospherics/machinery/components/unary_devices/cryo.dm b/code/modules/atmospherics/machinery/components/unary_devices/cryo.dm index efafc1c9a8..6c9ce28bc7 100644 --- a/code/modules/atmospherics/machinery/components/unary_devices/cryo.dm +++ b/code/modules/atmospherics/machinery/components/unary_devices/cryo.dm @@ -72,10 +72,10 @@ QDEL_NULL(beaker) return ..() -/obj/machinery/atmospherics/components/unary/cryo_cell/contents_explosion(severity, target) +/obj/machinery/atmospherics/components/unary/cryo_cell/contents_explosion(severity, target, origin) ..() if(beaker) - beaker.ex_act(severity, target) + beaker.ex_act(severity, target, origin) /obj/machinery/atmospherics/components/unary/cryo_cell/handle_atom_del(atom/A) ..() diff --git a/code/modules/cargo/supplypod.dm b/code/modules/cargo/supplypod.dm index 59f36cc2a5..749e1ad247 100644 --- a/code/modules/cargo/supplypod.dm +++ b/code/modules/cargo/supplypod.dm @@ -190,7 +190,7 @@ /obj/structure/closet/supplypod/ex_act(severity, target, origin) //Explosions dont do SHIT TO US! This is because supplypods create explosions when they land. return -/obj/structure/closet/supplypod/contents_explosion() //Supplypods also protect their contents from the harmful effects of fucking exploding. +/obj/structure/closet/supplypod/contents_explosion(severity, target, origin) //Supplypods also protect their contents from the harmful effects of fucking exploding. return /obj/structure/closet/supplypod/toggle(mob/living/user) diff --git a/code/modules/hydroponics/biogenerator.dm b/code/modules/hydroponics/biogenerator.dm index b61d9451ef..8651ea82ab 100644 --- a/code/modules/hydroponics/biogenerator.dm +++ b/code/modules/hydroponics/biogenerator.dm @@ -27,10 +27,10 @@ QDEL_NULL(beaker) return ..() -/obj/machinery/biogenerator/contents_explosion(severity, target) +/obj/machinery/biogenerator/contents_explosion(severity, target, origin) ..() if(beaker) - beaker.ex_act(severity, target) + beaker.ex_act(severity, target, origin) /obj/machinery/biogenerator/handle_atom_del(atom/A) ..() diff --git a/code/modules/mob/living/silicon/silicon.dm b/code/modules/mob/living/silicon/silicon.dm index 77d1be2bcd..b0ec2959d7 100644 --- a/code/modules/mob/living/silicon/silicon.dm +++ b/code/modules/mob/living/silicon/silicon.dm @@ -78,7 +78,7 @@ GLOB.silicon_mobs -= src return ..() -/mob/living/silicon/contents_explosion(severity, target) +/mob/living/silicon/contents_explosion(severity, target, origin) return /mob/living/silicon/proc/cancelAlarm() diff --git a/code/modules/power/supermatter/supermatter.dm b/code/modules/power/supermatter/supermatter.dm index b802cc7b88..a1fbf5d7ad 100644 --- a/code/modules/power/supermatter/supermatter.dm +++ b/code/modules/power/supermatter/supermatter.dm @@ -894,7 +894,7 @@ GLOBAL_DATUM(main_supermatter_engine, /obj/machinery/power/supermatter_crystal) CALCULATE_ADJACENT_TURFS(T) //Do not blow up our internal radio -/obj/machinery/power/supermatter_crystal/contents_explosion(severity, target) +/obj/machinery/power/supermatter_crystal/contents_explosion(severity, target, origin) return /obj/machinery/power/supermatter_crystal/engine diff --git a/code/modules/reagents/chemistry/machinery/chem_dispenser.dm b/code/modules/reagents/chemistry/machinery/chem_dispenser.dm index 5c3b328862..6aec48182a 100644 --- a/code/modules/reagents/chemistry/machinery/chem_dispenser.dm +++ b/code/modules/reagents/chemistry/machinery/chem_dispenser.dm @@ -169,10 +169,10 @@ if(severity < 3) ..() -/obj/machinery/chem_dispenser/contents_explosion(severity, target) +/obj/machinery/chem_dispenser/contents_explosion(severity, target, origin) ..() if(beaker) - beaker.ex_act(severity, target) + beaker.ex_act(severity, target, origin) /obj/machinery/chem_dispenser/Exited(atom/movable/A, atom/newloc) . = ..() diff --git a/code/modules/reagents/chemistry/machinery/chem_master.dm b/code/modules/reagents/chemistry/machinery/chem_master.dm index 7e9f418bad..c49b2cc14c 100644 --- a/code/modules/reagents/chemistry/machinery/chem_master.dm +++ b/code/modules/reagents/chemistry/machinery/chem_master.dm @@ -50,12 +50,12 @@ if(severity < 3) ..() -/obj/machinery/chem_master/contents_explosion(severity, target) +/obj/machinery/chem_master/contents_explosion(severity, target, origin) ..() if(beaker) - beaker.ex_act(severity, target) + beaker.ex_act(severity, target, origin) if(bottle) - bottle.ex_act(severity, target) + bottle.ex_act(severity, target, origin) /obj/machinery/chem_master/Exited(atom/movable/A, atom/newloc) . = ..() diff --git a/code/modules/reagents/chemistry/machinery/reagentgrinder.dm b/code/modules/reagents/chemistry/machinery/reagentgrinder.dm index a53c57a3e7..65cc97f586 100644 --- a/code/modules/reagents/chemistry/machinery/reagentgrinder.dm +++ b/code/modules/reagents/chemistry/machinery/reagentgrinder.dm @@ -43,9 +43,9 @@ drop_all_items() return ..() -/obj/machinery/reagentgrinder/contents_explosion(severity, target) +/obj/machinery/reagentgrinder/contents_explosion(severity, target, origin) if(beaker) - beaker.ex_act(severity, target) + beaker.ex_act(severity, target, origin) /obj/machinery/reagentgrinder/RefreshParts() speed = 1 diff --git a/code/modules/recycling/disposal/pipe.dm b/code/modules/recycling/disposal/pipe.dm index 45d3d9da25..f6c27f4a79 100644 --- a/code/modules/recycling/disposal/pipe.dm +++ b/code/modules/recycling/disposal/pipe.dm @@ -132,10 +132,10 @@ // pipe affected by explosion -/obj/structure/disposalpipe/contents_explosion(severity, target) +/obj/structure/disposalpipe/contents_explosion(severity, target, origin) var/obj/structure/disposalholder/H = locate() in src if(H) - H.contents_explosion(severity, target) + H.contents_explosion(severity, target, origin) /obj/structure/disposalpipe/run_obj_armor(damage_amount, damage_type, damage_flag = 0, attack_dir) diff --git a/code/modules/recycling/sortingmachinery.dm b/code/modules/recycling/sortingmachinery.dm index b47f0de032..008e093b74 100644 --- a/code/modules/recycling/sortingmachinery.dm +++ b/code/modules/recycling/sortingmachinery.dm @@ -18,9 +18,9 @@ AM.forceMove(T) return ..() -/obj/structure/bigDelivery/contents_explosion(severity, target) +/obj/structure/bigDelivery/contents_explosion(severity, target, origin) for(var/atom/movable/AM in contents) - AM.ex_act() + AM.ex_act(severity, target, origin) /obj/structure/bigDelivery/attackby(obj/item/W, mob/user, params) if(istype(W, /obj/item/destTagger)) @@ -82,9 +82,9 @@ var/giftwrapped = 0 var/sortTag = 0 -/obj/item/smallDelivery/contents_explosion(severity, target) +/obj/item/smallDelivery/contents_explosion(severity, target, origin) for(var/atom/movable/AM in contents) - AM.ex_act() + AM.ex_act(severity, target, origin) /obj/item/smallDelivery/attack_self(mob/user) user.temporarilyRemoveItemFromInventory(src, TRUE)