diff --git a/code/game/machinery/doors/airlock.dm b/code/game/machinery/doors/airlock.dm index 89b54d18c8c..ac589278c09 100644 --- a/code/game/machinery/doors/airlock.dm +++ b/code/game/machinery/doors/airlock.dm @@ -97,6 +97,7 @@ icon = 'icons/obj/doors/vault.dmi' opacity = 1 assembly_type = /obj/structure/door_assembly/door_assembly_highsecurity //Until somebody makes better sprites. + explosion_block = 2 /obj/machinery/door/airlock/freezer name = "Freezer Airlock" diff --git a/code/game/machinery/hologram.dm b/code/game/machinery/hologram.dm index bb6948eda6b..aabf34c4ed0 100644 --- a/code/game/machinery/hologram.dm +++ b/code/game/machinery/hologram.dm @@ -183,13 +183,13 @@ For the other part of the code, check silicon say.dm. Particularly robot talk.*/ /obj/machinery/hologram/ex_act(severity) switch(severity) if(1.0) - del(src) + qdel(src) if(2.0) if (prob(50)) - del(src) + qdel(src) if(3.0) if (prob(5)) - del(src) + qdel(src) return /obj/machinery/hologram/blob_act() diff --git a/code/game/mecha/mecha_control_console.dm b/code/game/mecha/mecha_control_console.dm index f88992671ca..3608b06c25d 100644 --- a/code/game/mecha/mecha_control_console.dm +++ b/code/game/mecha/mecha_control_console.dm @@ -91,11 +91,11 @@ return answer emp_act() - del src + qdel(src) return ex_act() - del src + qdel(src) return proc/in_mecha() diff --git a/code/game/objects/effects/aliens.dm b/code/game/objects/effects/aliens.dm index cac20a32362..f59ba1f004f 100644 --- a/code/game/objects/effects/aliens.dm +++ b/code/game/objects/effects/aliens.dm @@ -209,8 +209,8 @@ new /obj/structure/alien/weeds(T, linked_node) -/obj/structure/alien/weeds/ex_act(severity, target) - del(src) +/obj/structure/alien/weeds/ex_act(severity) + qdel(src) /obj/structure/alien/weeds/attackby(obj/item/I, mob/user, params) diff --git a/code/game/objects/effects/effect_system.dm b/code/game/objects/effects/effect_system.dm index 72c3c4db24f..5387879e668 100644 --- a/code/game/objects/effects/effect_system.dm +++ b/code/game/objects/effects/effect_system.dm @@ -1102,11 +1102,11 @@ steam.start() -- spawns the effect qdel(src) blob_act() - del(src) + qdel(src) bullet_act() if(metal==1 || prob(50)) - del(src) + qdel(src) attack_hand(var/mob/user) if ((HULK in user.mutations) || (prob(75 - metal*25))) @@ -1115,7 +1115,7 @@ steam.start() -- spawns the effect if ((O.client && !( O.blinded ))) O << "\red [user] smashes through the foamed metal." - del(src) + qdel(src) else user << "\blue You hit the metal foam but bounce off it." return @@ -1129,8 +1129,8 @@ steam.start() -- spawns the effect for(var/mob/O in viewers(src)) if (O.client) O << "\red [G.assailant] smashes [G.affecting] through the foamed metal wall." - del(I) - del(src) + qdel(I) + qdel(src) return if(prob(I.force*20 - metal*25)) @@ -1138,7 +1138,7 @@ steam.start() -- spawns the effect for(var/mob/O in oviewers(user)) if ((O.client && !( O.blinded ))) O << "\red [user] smashes through the foamed metal." - del(src) + qdel(src) else user << "\blue You hit the metal foam to no effect." diff --git a/code/game/objects/effects/sm_crystals.dm b/code/game/objects/effects/sm_crystals.dm index d725b23d0bc..910f724d079 100644 --- a/code/game/objects/effects/sm_crystals.dm +++ b/code/game/objects/effects/sm_crystals.dm @@ -156,15 +156,15 @@ /obj/effect/supermatter_crystal/ex_act(severity) switch(severity) if(1.0) - del(src) + qdel(src) return if(2.0) if (prob(50)) - del(src) + qdel(src) return if(3.0) if (prob(5)) - del(src) + qdel(src) return else return @@ -176,4 +176,4 @@ /obj/effect/supermatter_crystal/proc/CheckEndurance() if(endurance <= 0) - del(src) \ No newline at end of file + qdel(src) \ No newline at end of file diff --git a/code/game/objects/items/devices/aicard.dm b/code/game/objects/items/devices/aicard.dm index 70791bddab2..b2107561a60 100644 --- a/code/game/objects/items/devices/aicard.dm +++ b/code/game/objects/items/devices/aicard.dm @@ -134,6 +134,6 @@ if(1.0) del(src) if(2.0) - if(prob(50)) del(src) + if(prob(50)) qdel(src) if(3.0) - if(prob(25)) del(src) + if(prob(25)) qdel(src) diff --git a/code/game/objects/items/devices/paicard.dm b/code/game/objects/items/devices/paicard.dm index 2c2c5d9ea07..7dab5448a88 100644 --- a/code/game/objects/items/devices/paicard.dm +++ b/code/game/objects/items/devices/paicard.dm @@ -317,4 +317,4 @@ if(pai) pai.ex_act(severity) else - del(src) + qdel(src) diff --git a/code/game/objects/items/weapons/gift_wrappaper.dm b/code/game/objects/items/weapons/gift_wrappaper.dm index c87d3f9ef3f..c972821fcb0 100644 --- a/code/game/objects/items/weapons/gift_wrappaper.dm +++ b/code/game/objects/items/weapons/gift_wrappaper.dm @@ -35,7 +35,7 @@ return /obj/item/weapon/a_gift/ex_act() - del(src) + qdel(src) return /obj/effect/spresent/relaymove(mob/user as mob) diff --git a/code/game/objects/structures/crates_lockers/crates.dm b/code/game/objects/structures/crates_lockers/crates.dm index 8a7202b1925..115f4a0b5d2 100644 --- a/code/game/objects/structures/crates_lockers/crates.dm +++ b/code/game/objects/structures/crates_lockers/crates.dm @@ -181,13 +181,13 @@ switch(severity) if(1.0) for(var/obj/O in src.contents) - del(O) + qdel(O) qdel(src) return if(2.0) for(var/obj/O in src.contents) if(prob(50)) - del(O) + qdel(O) qdel(src) return if(3.0) diff --git a/code/game/objects/structures/displaycase.dm b/code/game/objects/structures/displaycase.dm index f89ed09d6bb..e9e157b1210 100644 --- a/code/game/objects/structures/displaycase.dm +++ b/code/game/objects/structures/displaycase.dm @@ -101,7 +101,7 @@ getFromPool(/obj/item/weapon/shard, loc) if (occupant) dump() - del(src) + qdel(src) if (2) if (prob(50)) src.health -= 15 diff --git a/code/game/turfs/simulated/walls_mineral.dm b/code/game/turfs/simulated/walls_mineral.dm index 6e5aa0c33a8..20d476238cb 100644 --- a/code/game/turfs/simulated/walls_mineral.dm +++ b/code/game/turfs/simulated/walls_mineral.dm @@ -53,7 +53,6 @@ icon_state = "uranium0" walltype = "uranium" mineral = "uranium" - explosion_block = 0 /turf/simulated/wall/mineral/uranium/proc/radiate() if(!active) diff --git a/code/game/vehicles/spacepods/spacepod.dm b/code/game/vehicles/spacepods/spacepod.dm index 39b47929c43..41655e04588 100644 --- a/code/game/vehicles/spacepods/spacepod.dm +++ b/code/game/vehicles/spacepods/spacepod.dm @@ -179,8 +179,8 @@ H2.forceMove(get_turf(src)) H2.ex_act(severity + 1) H2 << "You are forcefully thrown from \the [src]!" - del(ion_trail) - del(src) + qdel(ion_trail) + qdel(src) if(2) deal_damage(100) if(3) diff --git a/code/modules/assembly/holder.dm b/code/modules/assembly/holder.dm index 127f3c5d9ca..19fe8d84219 100644 --- a/code/modules/assembly/holder.dm +++ b/code/modules/assembly/holder.dm @@ -192,15 +192,15 @@ ex_act(severity) switch(severity) if(1.0) - del(src) + qdel(src) return if(2.0) if (prob(50)) - del(src) + qdel(src) return if(3.0) if (prob(25)) - del(src) + qdel(src) return return diff --git a/code/modules/computer3/computer.dm b/code/modules/computer3/computer.dm index 157fc1e6d2e..42790c5bf00 100644 --- a/code/modules/computer3/computer.dm +++ b/code/modules/computer3/computer.dm @@ -217,11 +217,11 @@ ex_act(severity) switch(severity) if(1.0) - del(src) + qdel(src) return if(2.0) if (prob(25)) - del(src) + qdel(src) return if (prob(50)) for(var/x in verbs) diff --git a/code/modules/events/tgevents/dust.dm b/code/modules/events/tgevents/dust.dm index cefa4f250c8..e3eb455e018 100644 --- a/code/modules/events/tgevents/dust.dm +++ b/code/modules/events/tgevents/dust.dm @@ -99,5 +99,5 @@ ex_act(severity) - del(src) + qdel(src) return diff --git a/code/modules/mining/equipment_locker.dm b/code/modules/mining/equipment_locker.dm index 702a87ab336..52998277e5a 100644 --- a/code/modules/mining/equipment_locker.dm +++ b/code/modules/mining/equipment_locker.dm @@ -264,7 +264,7 @@ s.set_up(5, 1, src) s.start() if(prob(50 / severity) && severity < 3) - del(src) + qdel(src) /**********************Mining Equipment Locker Items**************************/ diff --git a/code/modules/mining/manufacturing.dm b/code/modules/mining/manufacturing.dm index 52274b0ea32..e676efd3d38 100644 --- a/code/modules/mining/manufacturing.dm +++ b/code/modules/mining/manufacturing.dm @@ -43,7 +43,7 @@ ex_act(severity) switch(severity) - if(1.0) del(src) + if(1.0) qdel(src) if(2.0) if (prob(60)) stat |= BROKEN if(3.0) diff --git a/code/modules/mob/living/simple_animal/tribbles.dm b/code/modules/mob/living/simple_animal/tribbles.dm index 2b6fab41b8e..3e6043f7e71 100644 --- a/code/modules/mob/living/simple_animal/tribbles.dm +++ b/code/modules/mob/living/simple_animal/tribbles.dm @@ -140,7 +140,7 @@ var/global/totaltribbles = 0 //global variable so it updates for all tribbles, if (1) new /obj/item/weapon/shard( src.loc ) Break() - del(src) + qdel(src) if (2) if (prob(50)) src.health -= 15 diff --git a/code/modules/paperwork/photocopier.dm b/code/modules/paperwork/photocopier.dm index d2d68db05db..bc20b6fe13c 100644 --- a/code/modules/paperwork/photocopier.dm +++ b/code/modules/paperwork/photocopier.dm @@ -132,10 +132,10 @@ /obj/machinery/photocopier/ex_act(severity) switch(severity) if(1.0) - del(src) + qdel(src) if(2.0) if(prob(50)) - del(src) + qdel(src) else if(toner > 0) new /obj/effect/decal/cleanable/blood/oil(get_turf(src)) @@ -149,7 +149,7 @@ /obj/machinery/photocopier/blob_act() if(prob(50)) - del(src) + qdel(src) else if(toner > 0) new /obj/effect/decal/cleanable/blood/oil(get_turf(src)) diff --git a/code/modules/research/xenoarchaeology/machinery/coolant.dm b/code/modules/research/xenoarchaeology/machinery/coolant.dm index 30b43495dba..79da41e5f2a 100644 --- a/code/modules/research/xenoarchaeology/machinery/coolant.dm +++ b/code/modules/research/xenoarchaeology/machinery/coolant.dm @@ -56,4 +56,4 @@ datum/chemical_reaction/coolant sleep(10) if(src) - del(src) + qdel(src) diff --git a/config/example/game_options.txt b/config/example/game_options.txt index efa36e7f72e..3f282e5a6ce 100644 --- a/config/example/game_options.txt +++ b/config/example/game_options.txt @@ -66,9 +66,9 @@ REACTIONARY_EXPLOSIONS ## Can be any number between 4 and 128, some examples are provided below. ## Default (3,7,14) -BOMBCAP 14 -## One 'step' up (4,8,16) (recommended if you enable REACTIONARY_EXPLOSIONS above) -#BOMBCAP 16 +#BOMBCAP 14 +## One 'step' up (5,10,20) (recommended if you enable REACTIONARY_EXPLOSIONS above) +BOMBCAP 20 ## LagHell (7,14,28) #BOMBCAP 28