mirror of
https://github.com/CHOMPStation2/CHOMPStation2.git
synced 2025-12-10 10:12:45 +00:00
Merge pull request #9626 from Verkister/shieldgenie
Fixes station shieldgen icon jank (supposedly)
This commit is contained in:
committed by
Chompstation Bot
parent
710c6b5021
commit
5509d68b91
@@ -4,7 +4,7 @@
|
||||
/obj/effect/shield
|
||||
name = "energy shield"
|
||||
desc = "An impenetrable field of energy, capable of blocking anything as long as it's active."
|
||||
icon = 'icons/obj/machines/shielding.dmi'
|
||||
icon = 'icons/obj/machines/shielding_vr.dmi'
|
||||
icon_state = "shield"
|
||||
anchored = 1
|
||||
plane = MOB_PLANE
|
||||
@@ -110,7 +110,7 @@
|
||||
|
||||
diffused_for = max(duration, 0)
|
||||
gen?.damaged_segments |= src
|
||||
|
||||
|
||||
set_density(0)
|
||||
update_visuals()
|
||||
update_nearby_tiles() //Force ZAS update
|
||||
@@ -299,7 +299,7 @@
|
||||
//
|
||||
/obj/effect/temp_visual/shield_impact_effect
|
||||
name = "shield impact"
|
||||
icon = 'icons/obj/machines/shielding.dmi'
|
||||
icon = 'icons/obj/machines/shielding_vr.dmi'
|
||||
icon_state = "shield_impact"
|
||||
plane = MOB_PLANE
|
||||
layer = ABOVE_MOB_LAYER
|
||||
|
||||
@@ -123,7 +123,7 @@
|
||||
"max_charge" = C.max_charge,
|
||||
"failing" = (C.time_since_fail <= 2),
|
||||
)))
|
||||
|
||||
|
||||
data["lockedData"]["active"] = active
|
||||
data["lockedData"]["failing"] = (time_since_fail <= 2)
|
||||
data["lockedData"]["radius"] = field_radius
|
||||
@@ -201,7 +201,7 @@
|
||||
/obj/machinery/shield_gen/tgui_act(action, params)
|
||||
if(..())
|
||||
return TRUE
|
||||
|
||||
|
||||
switch(action)
|
||||
if("toggle")
|
||||
if (!active && !anchored)
|
||||
|
||||
@@ -4,7 +4,7 @@
|
||||
/obj/machinery/power/shield_generator
|
||||
name = "advanced shield generator"
|
||||
desc = "A heavy-duty shield generator and capacitor, capable of generating energy shields at large distances."
|
||||
icon = 'icons/obj/machines/shielding.dmi'
|
||||
icon = 'icons/obj/machines/shielding_vr.dmi'
|
||||
icon_state = "generator0"
|
||||
circuit = /obj/item/weapon/circuitboard/shield_generator
|
||||
density = 1
|
||||
@@ -105,7 +105,7 @@
|
||||
// Generates the field objects. Deletes existing field, if applicable.
|
||||
/obj/machinery/power/shield_generator/proc/regenerate_field()
|
||||
for(var/obj/effect/shield/S in field_segments)
|
||||
qdel(S)
|
||||
qdel(S)
|
||||
var/list/shielded_turfs
|
||||
|
||||
if(check_flag(MODEFLAG_HULL))
|
||||
|
||||
Reference in New Issue
Block a user