shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

contents_explosion

Browse Source 
at least this one had less overrides.
This commit is contained in:
DeltaFire
2021-11-14 21:41:42 +01:00
parent 6aa906395c
commit 6224da71a3
21 changed files with 42 additions and 45 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/game/machinery/PDApainter.dm
+2 -2
View File
@@ -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)
code/game/machinery/_machinery.dm
+2 -2
View File
@@ -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)
code/game/machinery/aug_manipulator.dm
+2 -2
View File
@@ -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)
code/game/machinery/cryopod.dm
+1 -4
View File
@@ -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
code/game/mecha/mecha_defense.dm
+4 -4
View File
@@ -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)
code/game/mecha/working/ripley.dm
+1 -1
View File
@@ -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))
code/game/objects/items/storage/_storage.dm
+2 -2
View File
@@ -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"
code/game/objects/structures/crates_lockers/closets.dm
+2 -2
View File
@@ -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()
code/game/objects/structures/extinguisher.dm
+2 -2
View File
@@ -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)
code/game/objects/structures/guncase.dm
+2 -2
View File
@@ -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
code/game/objects/structures/transit_tubes/transit_tube_pod.dm
+2 -2
View File
@@ -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)
..()
code/modules/atmospherics/machinery/components/unary_devices/cryo.dm
+2 -2
View File
@@ -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)
..()
code/modules/cargo/supplypod.dm
+1 -1
View File
@@ -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)
code/modules/hydroponics/biogenerator.dm
+2 -2
View File
@@ -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)
..()
code/modules/mob/living/silicon/silicon.dm
+1 -1
View File
@@ -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()
code/modules/power/supermatter/supermatter.dm
+1 -1
View File
@@ -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
code/modules/reagents/chemistry/machinery/chem_dispenser.dm
+2 -2
View File
@@ -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)
. = ..()
code/modules/reagents/chemistry/machinery/chem_master.dm
+3 -3
View File
@@ -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)
. = ..()
code/modules/reagents/chemistry/machinery/reagentgrinder.dm
+2 -2
View File
@@ -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
code/modules/recycling/disposal/pipe.dm
+2 -2
View File
@@ -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)
code/modules/recycling/sortingmachinery.dm
+4 -4
View File
@@ -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)