cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-11 18:53:06 +00:00
Code Issues Packages Projects Releases Wiki Activity

Undo meteor shield changes (#8141)

Browse Source
This commit is contained in:
Raeschen
2024-04-03 10:27:38 +02:00
committed by GitHub
parent f08d981b81
commit 9913c5e80c
2 changed files with 0 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
code/modules/shieldgen/shield_diffuser.dm
View File

@@ -85,8 +85,6 @@
if(!duration) if(!duration)
return return
alarm = round(max(alarm, duration)) alarm = round(max(alarm, duration))
for(var/obj/machinery/shield_gen/gen in global.machines) // CHOMPEdit - Fills the gaps made by diffusers
gen.fill_diffused()
update_icon() update_icon()
/obj/machinery/shield_diffuser/examine(var/mob/user) /obj/machinery/shield_diffuser/examine(var/mob/user)

15
code/modules/shieldgen/shield_gen.dm
View File

@@ -258,21 +258,6 @@
for(var/mob/M in view(5,src)) for(var/mob/M in view(5,src))
to_chat(M, "[icon2html(src, M.client)] You hear heavy droning fade out.") to_chat(M, "[icon2html(src, M.client)] You hear heavy droning fade out.")
shield_hum.stop() shield_hum.stop()
// CHOMPAdd Start - Fills gaps when meteors happen
/obj/machinery/shield_gen/proc/fill_diffused()
if(active)
var/list/covered_turfs = get_shielded_turfs()
var/turf/T = get_turf(src)
var/obj/effect/energy_field/E
if(T in covered_turfs)
covered_turfs.Remove(T)
for(var/turf/O in covered_turfs)
if(locate(/obj/effect/energy_field, O) || locate(/obj/machinery/pointdefense, orange(2, O)))
continue
E = new(O, src)
field.Add(E)
covered_turfs = null
// CHOMPAdd End
/obj/machinery/shield_gen/update_icon() /obj/machinery/shield_gen/update_icon()
if(stat & BROKEN) if(stat & BROKEN)