cyberpresidentvanellope/Bubberstation
1
0
Fork 0
mirror of https://github.com/Bubberstation/Bubberstation.git synced 2026-08-23 05:00:55 +01:00
Code Issues Packages Projects Releases Wiki Activity

[MIRROR] Explosions SS runtime fix + code cleanup (#461)

Browse Source 
* Explosions SS runtime fix + code cleanup (#52894)

* runtime fix

* turf references are immortal

* Explosions SS runtime fix + code cleanup

Co-authored-by: Rohesie <rohesie@gmail.com>
This commit is contained in:
SkyratBot
2020-08-21 21:30:43 +01:00
committed by GitHub
co-authored by Rohesie
parent 98f195e72c
commit d3f6e8d49f
28 changed files with 164 additions and 164 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/controllers/subsystem/explosions.dm
+57 -57
View File
@@ -16,10 +16,9 @@ SUBSYSTEM_DEF(explosions)
var/cost_throwturf = 0
var/cost_lowobj = 0
var/cost_medobj = 0
var/cost_highobj = 0
var/cost_low_mov_atom = 0
var/cost_med_mov_atom = 0
var/cost_high_mov_atom = 0
var/list/lowturf = list()
var/list/medturf = list()
@@ -28,9 +27,9 @@ SUBSYSTEM_DEF(explosions)
var/list/throwturf = list()
var/list/lowobj = list()
var/list/medobj = list()
var/list/highobj = list()
var/list/low_mov_atom = list()
var/list/med_mov_atom = list()
var/list/high_mov_atom = list()
var/list/explosions = list()
@@ -44,9 +43,9 @@ SUBSYSTEM_DEF(explosions)
msg += "HT:[round(cost_highturf,1)]|"
msg += "FT:[round(cost_flameturf,1)]||"
msg += "LO:[round(cost_lowobj,1)]|"
msg += "MO:[round(cost_medobj,1)]|"
msg += "HO:[round(cost_highobj,1)]|"
msg += "LO:[round(cost_low_mov_atom,1)]|"
msg += "MO:[round(cost_med_mov_atom,1)]|"
msg += "HO:[round(cost_high_mov_atom,1)]|"
msg += "TO:[round(cost_throwturf,1)]"
@@ -58,9 +57,9 @@ SUBSYSTEM_DEF(explosions)
msg += "HT:[highturf.len]|"
msg += "FT:[flameturf.len]||"
msg += "LO:[lowobj.len]|"
msg += "MO:[medobj.len]|"
msg += "HO:[highobj.len]|"
msg += "LO:[low_mov_atom.len]|"
msg += "MO:[med_mov_atom.len]|"
msg += "HO:[high_mov_atom.len]|"
msg += "TO:[throwturf.len]"
@@ -72,7 +71,7 @@ SUBSYSTEM_DEF(explosions)
#define SSEX_OBJ "obj"
/datum/controller/subsystem/explosions/proc/is_exploding()
return (lowturf.len || medturf.len || highturf.len || flameturf.len || throwturf.len || lowobj.len || medobj.len || highobj.len)
return (lowturf.len || medturf.len || highturf.len || flameturf.len || throwturf.len || low_mov_atom.len || med_mov_atom.len || high_mov_atom.len)
/datum/controller/subsystem/explosions/proc/wipe_turf(turf/T)
lowturf -= T
@@ -304,16 +303,17 @@ SUBSYSTEM_DEF(explosions)
var/atom/A = I
if (length(A.contents) && !(A.flags_1 & PREVENT_CONTENTS_EXPLOSION_1)) //The atom/contents_explosion() proc returns null if the contents ex_acting has been handled by the atom, and TRUE if it hasn't.
items += A.GetAllContents()
for(var/O in items)
var/atom/A = O
if(!QDELETED(A))
switch(dist)
if(EXPLODE_DEVASTATE)
SSexplosions.highobj += A
if(EXPLODE_HEAVY)
SSexplosions.medobj += A
if(EXPLODE_LIGHT)
SSexplosions.lowobj += A
for(var/thing in items)
var/atom/movable/movable_thing = thing
if(QDELETED(movable_thing))
continue
switch(dist)
if(EXPLODE_DEVASTATE)
SSexplosions.high_mov_atom += movable_thing
if(EXPLODE_HEAVY)
SSexplosions.med_mov_atom += movable_thing
if(EXPLODE_LIGHT)
SSexplosions.low_mov_atom += movable_thing
switch(dist)
if(EXPLODE_DEVASTATE)
SSexplosions.highturf += T
@@ -425,30 +425,27 @@ SUBSYSTEM_DEF(explosions)
var/list/low_turf = lowturf
lowturf = list()
for(var/thing in low_turf)
if(thing)
var/turf/T = thing
T.explosion_level = max(T.explosion_level, EXPLODE_LIGHT)
T.ex_act(EXPLODE_LIGHT)
var/turf/turf_thing = thing
turf_thing.explosion_level = max(turf_thing.explosion_level, EXPLODE_LIGHT)
turf_thing.ex_act(EXPLODE_LIGHT)
cost_lowturf = MC_AVERAGE(cost_lowturf, TICK_DELTA_TO_MS(TICK_USAGE_REAL - timer))
timer = TICK_USAGE_REAL
var/list/med_turf = medturf
medturf = list()
for(var/thing in med_turf)
if(thing)
var/turf/T = thing
T.explosion_level = max(T.explosion_level, EXPLODE_HEAVY)
T.ex_act(EXPLODE_HEAVY)
var/turf/turf_thing = thing
turf_thing.explosion_level = max(turf_thing.explosion_level, EXPLODE_HEAVY)
turf_thing.ex_act(EXPLODE_HEAVY)
cost_medturf = MC_AVERAGE(cost_medturf, TICK_DELTA_TO_MS(TICK_USAGE_REAL - timer))
timer = TICK_USAGE_REAL
var/list/high_turf = highturf
highturf = list()
for(var/thing in high_turf)
if(thing)
var/turf/T = thing
T.explosion_level = max(T.explosion_level, EXPLODE_DEVASTATE)
T.ex_act(EXPLODE_DEVASTATE)
var/turf/turf_thing = thing
turf_thing.explosion_level = max(turf_thing.explosion_level, EXPLODE_DEVASTATE)
turf_thing.ex_act(EXPLODE_DEVASTATE)
cost_highturf = MC_AVERAGE(cost_highturf, TICK_DELTA_TO_MS(TICK_USAGE_REAL - timer))
timer = TICK_USAGE_REAL
@@ -467,31 +464,34 @@ SUBSYSTEM_DEF(explosions)
currentpart = SSEXPLOSIONS_THROWS
timer = TICK_USAGE_REAL
var/list/high_obj = highobj
highobj = list()
for(var/thing in high_obj)
if(thing)
var/obj/O = thing
O.ex_act(EXPLODE_DEVASTATE)
cost_highobj = MC_AVERAGE(cost_highobj, TICK_DELTA_TO_MS(TICK_USAGE_REAL - timer))
var/list/local_high_mov_atom = high_mov_atom
high_mov_atom = list()
for(var/thing in local_high_mov_atom)
var/atom/movable/movable_thing = thing
if(QDELETED(movable_thing))
continue
movable_thing.ex_act(EXPLODE_DEVASTATE)
cost_high_mov_atom = MC_AVERAGE(cost_high_mov_atom, TICK_DELTA_TO_MS(TICK_USAGE_REAL - timer))
timer = TICK_USAGE_REAL
var/list/med_obj = medobj
medobj = list()
for(var/thing in med_obj)
if(thing)
var/obj/O = thing
O.ex_act(EXPLODE_HEAVY)
cost_medobj = MC_AVERAGE(cost_medobj, TICK_DELTA_TO_MS(TICK_USAGE_REAL - timer))
var/list/local_med_mov_atom = med_mov_atom
med_mov_atom = list()
for(var/thing in local_med_mov_atom)
var/atom/movable/movable_thing = thing
if(QDELETED(movable_thing))
continue
movable_thing.ex_act(EXPLODE_HEAVY)
cost_med_mov_atom = MC_AVERAGE(cost_med_mov_atom, TICK_DELTA_TO_MS(TICK_USAGE_REAL - timer))
timer = TICK_USAGE_REAL
var/list/low_obj = lowobj
lowobj = list()
for(var/thing in low_obj)
if(thing)
var/obj/O = thing
O.ex_act(EXPLODE_LIGHT)
cost_lowobj = MC_AVERAGE(cost_lowobj, TICK_DELTA_TO_MS(TICK_USAGE_REAL - timer))
var/list/local_low_mov_atom = low_mov_atom
low_mov_atom = list()
for(var/thing in local_low_mov_atom)
var/atom/movable/movable_thing = thing
if(QDELETED(movable_thing))
continue
movable_thing.ex_act(EXPLODE_LIGHT)
cost_low_mov_atom = MC_AVERAGE(cost_low_mov_atom, TICK_DELTA_TO_MS(TICK_USAGE_REAL - timer))
if (currentpart == SSEXPLOSIONS_THROWS)
code/game/gamemodes/meteor/meteors.dm
+13 -11
View File
@@ -140,17 +140,19 @@ GLOBAL_LIST_INIT(meteorsC, list(/obj/effect/meteor/dust)) //for space dust event
/obj/effect/meteor/proc/ram_turf(turf/T)
//first bust whatever is in the turf
for(var/atom/A in T)
if(A != src)
if(isliving(A))
A.visible_message("<span class='warning'>[src] slams into [A].</span>", "<span class='userdanger'>[src] slams into you!.</span>")
switch(hitpwr)
if(EXPLODE_DEVASTATE)
SSexplosions.highobj += A
if(EXPLODE_HEAVY)
SSexplosions.medobj += A
if(EXPLODE_LIGHT)
SSexplosions.lowobj += A
for(var/thing in T)
if(thing == src)
continue
if(isliving(thing))
var/mob/living/living_thing = thing
living_thing.visible_message("<span class='warning'>[src] slams into [living_thing].</span>", "<span class='userdanger'>[src] slams into you!.</span>")
switch(hitpwr)
if(EXPLODE_DEVASTATE)
SSexplosions.high_mov_atom += thing
if(EXPLODE_HEAVY)
SSexplosions.med_mov_atom += thing
if(EXPLODE_LIGHT)
SSexplosions.low_mov_atom += thing
//then, ram the turf if it still exists
if(T)
code/game/machinery/doors/airlock.dm
+1 -1
View File
@@ -1083,7 +1083,7 @@
var/obj/structure/window/killthis = (locate(/obj/structure/window) in get_turf(src))
if(killthis)
SSexplosions.medobj += killthis
SSexplosions.med_mov_atom += killthis
SEND_SIGNAL(src, COMSIG_AIRLOCK_CLOSE, forced)
operating = TRUE
update_icon(AIRLOCK_CLOSING, 1)
code/game/mecha/mecha_defense.dm
+6 -6
View File
@@ -128,20 +128,20 @@
var/obj/item/mecha_parts/mecha_equipment/ME = X
switch(severity)
if(EXPLODE_DEVASTATE)
SSexplosions.highobj += ME
SSexplosions.high_mov_atom += ME
if(EXPLODE_HEAVY)
SSexplosions.medobj += ME
SSexplosions.med_mov_atom += ME
if(EXPLODE_LIGHT)
SSexplosions.lowobj += ME
SSexplosions.low_mov_atom += ME
for(var/Y in trackers)
var/obj/item/mecha_parts/mecha_tracking/MT = Y
switch(severity)
if(EXPLODE_DEVASTATE)
SSexplosions.highobj += MT
SSexplosions.high_mov_atom += MT
if(EXPLODE_HEAVY)
SSexplosions.medobj += MT
SSexplosions.med_mov_atom += MT
if(EXPLODE_LIGHT)
SSexplosions.lowobj += MT
SSexplosions.low_mov_atom += MT
if(occupant)
occupant.ex_act(severity,target)
code/game/objects/effects/anomalies.dm
+4 -4
View File
@@ -332,7 +332,7 @@
if(target && !target.stat)
O.throw_at(target, 7, 5)
else
SSexplosions.medobj += O
SSexplosions.med_mov_atom += O
/obj/effect/anomaly/bhole/proc/grav(r, ex_act_force, pull_chance, turf_removal_chance)
for(var/t = -r, t < r, t++)
@@ -353,11 +353,11 @@
if(O.anchored)
switch(ex_act_force)
if(EXPLODE_DEVASTATE)
SSexplosions.highobj += O
SSexplosions.high_mov_atom += O
if(EXPLODE_HEAVY)
SSexplosions.medobj += O
SSexplosions.med_mov_atom += O
if(EXPLODE_LIGHT)
SSexplosions.lowobj += O
SSexplosions.low_mov_atom += O
else
step_towards(O,src)
for(var/mob/living/M in T.contents)
code/game/objects/items/storage/storage.dm
+4 -4
View File
@@ -19,14 +19,14 @@
return FALSE
/obj/item/storage/contents_explosion(severity, target)
for(var/atom/A in contents)
for(var/thing in contents)
switch(severity)
if(EXPLODE_DEVASTATE)
SSexplosions.highobj += A
SSexplosions.high_mov_atom += thing
if(EXPLODE_HEAVY)
SSexplosions.medobj += A
SSexplosions.med_mov_atom += thing
if(EXPLODE_LIGHT)
SSexplosions.lowobj += A
SSexplosions.low_mov_atom += thing
/obj/item/storage/canStrip(mob/who)
. = ..()
code/game/objects/obj_defense.dm
+1 -1
View File
@@ -159,7 +159,7 @@
return take_damage(M.force*3, mech_damtype, "melee", play_soundeffect, get_dir(src, M)) // multiplied by 3 so we can hit objs hard but not be overpowered against mobs.
/obj/singularity_act()
SSexplosions.highobj += src
SSexplosions.high_mov_atom += src
if(src && !QDELETED(src))
qdel(src)
return 2
code/game/objects/structures/crates_lockers/closets.dm
+4 -4
View File
@@ -496,14 +496,14 @@
req_access += pick(get_all_accesses())
/obj/structure/closet/contents_explosion(severity, target)
for(var/atom/A in contents)
for(var/thing in contents)
switch(severity)
if(EXPLODE_DEVASTATE)
SSexplosions.highobj += A
SSexplosions.high_mov_atom += thing
if(EXPLODE_HEAVY)
SSexplosions.medobj += A
SSexplosions.med_mov_atom += thing
if(EXPLODE_LIGHT)
SSexplosions.lowobj += A
SSexplosions.low_mov_atom += thing
/obj/structure/closet/singularity_act()
dump_contents()
code/game/objects/structures/extinguisher.dm
+3 -3
View File
@@ -35,11 +35,11 @@
if(stored_extinguisher)
switch(severity)
if(EXPLODE_DEVASTATE)
SSexplosions.highobj += stored_extinguisher
SSexplosions.high_mov_atom += stored_extinguisher
if(EXPLODE_HEAVY)
SSexplosions.medobj += stored_extinguisher
SSexplosions.med_mov_atom += stored_extinguisher
if(EXPLODE_LIGHT)
SSexplosions.lowobj += stored_extinguisher
SSexplosions.low_mov_atom += stored_extinguisher
/obj/structure/extinguisher_cabinet/handle_atom_del(atom/A)
if(A == stored_extinguisher)
code/game/objects/structures/guncase.dm
+4 -4
View File
@@ -116,14 +116,14 @@
update_icon()
/obj/structure/guncase/contents_explosion(severity, target)
for(var/atom/A in contents)
for(var/thing in contents)
switch(severity)
if(EXPLODE_DEVASTATE)
SSexplosions.highobj += A
SSexplosions.high_mov_atom += thing
if(EXPLODE_HEAVY)
SSexplosions.medobj += A
SSexplosions.med_mov_atom += thing
if(EXPLODE_LIGHT)
SSexplosions.lowobj += A
SSexplosions.low_mov_atom += thing
/obj/structure/guncase/shotgun
name = "shotgun locker"
code/game/objects/structures/transit_tubes/transit_tube_pod.dm
+4 -4
View File
@@ -58,14 +58,14 @@
empty_pod()
/obj/structure/transit_tube_pod/contents_explosion(severity, target)
for(var/atom/movable/AM in contents)
for(var/thing in contents)
switch(severity)
if(EXPLODE_DEVASTATE)
SSexplosions.highobj += AM
SSexplosions.high_mov_atom += thing
if(EXPLODE_HEAVY)
SSexplosions.medobj += AM
SSexplosions.med_mov_atom += thing
if(EXPLODE_LIGHT)
SSexplosions.lowobj += AM
SSexplosions.low_mov_atom += thing
/obj/structure/transit_tube_pod/singularity_pull(S, current_size)
..()
code/game/turfs/turf.dm
+15 -15
View File
@@ -446,22 +446,22 @@ GLOBAL_LIST_EMPTY(station_turfs)
/turf/proc/is_shielded()
/turf/contents_explosion(severity, target)
for(var/V in contents)
var/atom/A = V
if(!QDELETED(A))
if(ismovable(A))
var/atom/movable/AM = A
if(!AM.ex_check(explosion_id))
continue
switch(severity)
if(EXPLODE_DEVASTATE)
SSexplosions.highobj += A
if(EXPLODE_HEAVY)
SSexplosions.medobj += A
if(EXPLODE_LIGHT)
SSexplosions.lowobj += A
/turf/contents_explosion(severity, target)
for(var/thing in contents)
var/atom/movable/movable_thing = thing
if(QDELETED(movable_thing))
continue
if(!movable_thing.ex_check(explosion_id))
continue
switch(severity)
if(EXPLODE_DEVASTATE)
SSexplosions.high_mov_atom += movable_thing
if(EXPLODE_HEAVY)
SSexplosions.med_mov_atom += movable_thing
if(EXPLODE_LIGHT)
SSexplosions.low_mov_atom += movable_thing
/turf/narsie_act(force, ignore_mobs, probability = 20)
. = (prob(probability) || force)
code/modules/atmospherics/machinery/components/unary_devices/cryo.dm
+3 -3
View File
@@ -97,11 +97,11 @@
if(beaker)
switch(severity)
if(EXPLODE_DEVASTATE)
SSexplosions.highobj += beaker
SSexplosions.high_mov_atom += beaker
if(EXPLODE_HEAVY)
SSexplosions.medobj += beaker
SSexplosions.med_mov_atom += beaker
if(EXPLODE_LIGHT)
SSexplosions.lowobj += beaker
SSexplosions.low_mov_atom += beaker
/obj/machinery/atmospherics/components/unary/cryo_cell/handle_atom_del(atom/A)
..()
code/modules/events/immovable_rod.dm
+1 -1
View File
@@ -145,7 +145,7 @@ In my current plan for it, 'solid' will be defined as anything with density == 1
if(isturf(clong))
SSexplosions.medturf += clong
if(isobj(clong))
SSexplosions.medobj += clong
SSexplosions.med_mov_atom += clong
else if(isliving(clong))
penetrate(clong)
code/modules/events/processor_overload.dm
+1 -1
View File
@@ -34,6 +34,6 @@
explosion(get_turf(P), 0, 0, 2)
// Only a level 1 explosion actually damages the machine
// at all
SSexplosions.highobj += P
SSexplosions.high_mov_atom += P
else
P.emp_act(EMP_HEAVY)
code/modules/hydroponics/biogenerator.dm
+3 -3
View File
@@ -32,11 +32,11 @@
if(beaker)
switch(severity)
if(EXPLODE_DEVASTATE)
SSexplosions.highobj += beaker
SSexplosions.high_mov_atom += beaker
if(EXPLODE_HEAVY)
SSexplosions.medobj += beaker
SSexplosions.med_mov_atom += beaker
if(EXPLODE_LIGHT)
SSexplosions.lowobj += beaker
SSexplosions.low_mov_atom += beaker
/obj/machinery/biogenerator/handle_atom_del(atom/A)
..()
code/modules/mob/living/carbon/human/human_defense.dm
+8 -10
View File
@@ -406,16 +406,14 @@
switch (severity)
if (EXPLODE_DEVASTATE)
if(bomb_armor < EXPLODE_GIB_THRESHOLD) //gibs the mob if their bomb armor is lower than EXPLODE_GIB_THRESHOLD
for(var/I in contents)
var/atom/A = I
if(!QDELETED(A))
switch(severity)
if(EXPLODE_DEVASTATE)
SSexplosions.highobj += A
if(EXPLODE_HEAVY)
SSexplosions.medobj += A
if(EXPLODE_LIGHT)
SSexplosions.lowobj += A
for(var/thing in contents)
switch(severity)
if(EXPLODE_DEVASTATE)
SSexplosions.high_mov_atom += thing
if(EXPLODE_HEAVY)
SSexplosions.med_mov_atom += thing
if(EXPLODE_LIGHT)
SSexplosions.low_mov_atom += thing
gib()
return
else
code/modules/mob/living/simple_animal/hostile/megafauna/bubblegum.dm
+1 -1
View File
@@ -463,7 +463,7 @@ Difficulty: Hard
if(charging)
if(isturf(A) || isobj(A) && A.density)
if(isobj(A))
SSexplosions.medobj += A
SSexplosions.med_mov_atom += A
else
SSexplosions.medturf += A
DestroySurroundings()
code/modules/mob/living/simple_animal/hostile/megafauna/colossus.dm
+1 -1
View File
@@ -273,7 +273,7 @@ Difficulty: Very Hard
. = ..()
if(isturf(target) || isobj(target))
if(isobj(target))
SSexplosions.medobj += target
SSexplosions.med_mov_atom += target
else
SSexplosions.medturf += target
code/modules/modular_computers/computers/machinery/modular_computer.dm
+3 -3
View File
@@ -123,11 +123,11 @@
if(cpu)
switch(severity)
if(EXPLODE_DEVASTATE)
SSexplosions.highobj += cpu
SSexplosions.high_mov_atom += cpu
if(EXPLODE_HEAVY)
SSexplosions.medobj += cpu
SSexplosions.med_mov_atom += cpu
if(EXPLODE_LIGHT)
SSexplosions.lowobj += cpu
SSexplosions.low_mov_atom += cpu
..()
// EMPs are similar to explosions, but don't cause physical damage to the casing. Instead they screw up the components
code/modules/power/cell.dm
+1 -1
View File
@@ -178,7 +178,7 @@
/obj/item/stock_parts/cell/blob_act(obj/structure/blob/B)
SSexplosions.highobj += src
SSexplosions.high_mov_atom += src
/obj/item/stock_parts/cell/proc/get_electrocute_damage()
if(charge >= 1000)
code/modules/projectiles/projectile/beams.dm
+1 -1
View File
@@ -111,7 +111,7 @@
. = ..()
if (!QDELETED(target) && (isturf(target) || istype(target, /obj/structure/)))
if(isobj(target))
SSexplosions.medobj += target
SSexplosions.med_mov_atom += target
else
SSexplosions.medturf += target
code/modules/projectiles/projectile/special/meteor.dm
+1 -1
View File
@@ -12,7 +12,7 @@
forceMove(A.loc)
return
if(isobj(A))
SSexplosions.medobj += A
SSexplosions.med_mov_atom += A
else if(isturf(A))
SSexplosions.medturf += A
playsound(src.loc, 'sound/effects/meteorimpact.ogg', 40, TRUE)
code/modules/reagents/chemistry/machinery/chem_dispenser.dm
+3 -3
View File
@@ -157,11 +157,11 @@
if(beaker)
switch(severity)
if(EXPLODE_DEVASTATE)
SSexplosions.highobj += beaker
SSexplosions.high_mov_atom += beaker
if(EXPLODE_HEAVY)
SSexplosions.medobj += beaker
SSexplosions.med_mov_atom += beaker
if(EXPLODE_LIGHT)
SSexplosions.lowobj += beaker
SSexplosions.low_mov_atom += beaker
/obj/machinery/chem_dispenser/handle_atom_del(atom/A)
..()
code/modules/reagents/chemistry/machinery/chem_master.dm
+6 -6
View File
@@ -53,19 +53,19 @@
if(beaker)
switch(severity)
if(EXPLODE_DEVASTATE)
SSexplosions.highobj += beaker
SSexplosions.high_mov_atom += beaker
if(EXPLODE_HEAVY)
SSexplosions.medobj += beaker
SSexplosions.med_mov_atom += beaker
if(EXPLODE_LIGHT)
SSexplosions.lowobj += beaker
SSexplosions.low_mov_atom += beaker
if(bottle)
switch(severity)
if(EXPLODE_DEVASTATE)
SSexplosions.highobj += bottle
SSexplosions.high_mov_atom += bottle
if(EXPLODE_HEAVY)
SSexplosions.medobj += bottle
SSexplosions.med_mov_atom += bottle
if(EXPLODE_LIGHT)
SSexplosions.lowobj += bottle
SSexplosions.low_mov_atom += bottle
/obj/machinery/chem_master/handle_atom_del(atom/A)
..()
code/modules/reagents/chemistry/machinery/reagentgrinder.dm
+3 -3
View File
@@ -46,11 +46,11 @@
if(beaker)
switch(severity)
if(EXPLODE_DEVASTATE)
SSexplosions.highobj += beaker
SSexplosions.high_mov_atom += beaker
if(EXPLODE_HEAVY)
SSexplosions.medobj += beaker
SSexplosions.med_mov_atom += beaker
if(EXPLODE_LIGHT)
SSexplosions.lowobj += beaker
SSexplosions.low_mov_atom += beaker
/obj/machinery/reagentgrinder/RefreshParts()
speed = 1
code/modules/recycling/sortingmachinery.dm
+8 -8
View File
@@ -26,14 +26,14 @@
return ..()
/obj/structure/big_delivery/contents_explosion(severity, target)
for(var/atom/movable/AM in contents)
for(var/thing in contents)
switch(severity)
if(EXPLODE_DEVASTATE)
SSexplosions.highobj += AM
SSexplosions.high_mov_atom += thing
if(EXPLODE_HEAVY)
SSexplosions.medobj += AM
SSexplosions.med_mov_atom += thing
if(EXPLODE_LIGHT)
SSexplosions.lowobj += AM
SSexplosions.low_mov_atom += thing
/obj/structure/big_delivery/examine(mob/user)
. = ..()
@@ -177,14 +177,14 @@
var/obj/item/barcode/sticker
/obj/item/small_delivery/contents_explosion(severity, target)
for(var/atom/movable/AM in contents)
for(var/thing in contents)
switch(severity)
if(EXPLODE_DEVASTATE)
SSexplosions.highobj += AM
SSexplosions.high_mov_atom += thing
if(EXPLODE_HEAVY)
SSexplosions.medobj += AM
SSexplosions.med_mov_atom += thing
if(EXPLODE_LIGHT)
SSexplosions.lowobj += AM
SSexplosions.low_mov_atom += thing
/obj/item/small_delivery/attack_self(mob/user)
to_chat(user, "<span class='notice'>You start to unwrap the package...</span>")
code/modules/swarmers/swarmer.dm
+4 -4
View File
@@ -117,7 +117,7 @@
var/mob/living/silicon/borg = target
borg.adjustBruteLoss(melee_damage_lower)
return ..()
/mob/living/simple_animal/hostile/swarmer/MiddleClickOn(atom/A)
. = ..()
if(!LAZYLEN(dronelist))
@@ -203,7 +203,7 @@
new /obj/effect/temp_visual/swarmer/disintegration(get_turf(target))
do_attack_animation(target)
changeNext_move(CLICK_CD_MELEE)
SSexplosions.lowobj += target
SSexplosions.low_mov_atom += target
/**
* Called when a swarmer attempts to teleport a living entity away
@@ -224,9 +224,9 @@
if(!do_mob(src, target, 30))
return
teleport_target(target)
/mob/living/simple_animal/hostile/swarmer/proc/teleport_target(mob/living/target)
var/turf/open/floor/safe_turf = find_safe_turf(zlevels = z, extended_safety_checks = TRUE)