EMP Refactor & Multi Z-level EMPs (#17781)

* sdfasf

* sdfas

* dsf
This commit is contained in:
Fluffy
2023-12-04 20:37:49 +01:00
committed by GitHub
parent 8f1a282756
commit d8d063edc6
143 changed files with 744 additions and 272 deletions
+12 -5
View File
@@ -729,12 +729,17 @@
playsound(src,'sound/effects/sparks4.ogg', 50, 1)
qdel(src)
/obj/item/device/wormhole_jaunter/emp_act(power)
/obj/item/device/wormhole_jaunter/emp_act(severity)
. = ..()
var/triggered = FALSE
if(power == 1)
triggered = TRUE
else if(power == 2 && prob(50))
triggered = TRUE
switch(severity)
if(EMP_HEAVY)
triggered = TRUE
if(EMP_LIGHT)
if(prob(50))
triggered = TRUE
if(triggered)
usr.visible_message(SPAN_WARNING("\The [src] overloads and activates!"))
@@ -833,6 +838,8 @@
return
/obj/item/lazarus_injector/emp_act()
. = ..()
if(!malfunctioning)
malfunctioning = TRUE
update_icon()
+3 -1
View File
@@ -130,7 +130,9 @@
M.client.images += ore_ping
ore_pings += ore_ping
/obj/item/ore_detector/emp_act()
/obj/item/ore_detector/emp_act(severity)
. = ..()
deactivate()
/obj/item/ore_detector/proc/activate(var/mob/user)