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

* sdfasf

* sdfas

* dsf
This commit is contained in:
Fluffy
2023-12-04 19:37:49 +00:00
committed by GitHub
parent 8f1a282756
commit d8d063edc6
143 changed files with 744 additions and 272 deletions
@@ -182,7 +182,11 @@
reload_sound = 'sound/weapons/reload_shell_emp.ogg'
/obj/item/ammo_casing/shotgun/stunshell/emp_act(severity)
if(prob(100/severity)) BB = null
. = ..()
if(prob(100/severity))
BB = null
update_icon()
//Does not stun, only blinds, but has area of effect.
+3 -2
View File
@@ -46,8 +46,9 @@
if(.)
update_icon()
/obj/item/gun/energy/emp_act(var/severity)
..()
/obj/item/gun/energy/emp_act(severity)
. = ..()
disable_cell_temp(severity)
queue_icon_update()
@@ -210,6 +210,8 @@
secondary_fire_sound = 'sound/weapons/laser3.ogg'
/obj/item/gun/energy/gun/skrell/emp_act(severity)
. = ..()
return //Fuck robots.
/obj/item/gun/energy/gun/skrell/pistol
@@ -221,7 +221,7 @@
firemodes = list()
/obj/item/gun/energy/rifle/ionrifle/emp_act(severity)
..(max(severity, 2)) //so it doesn't EMP itself, I guess
. = ..()
/obj/item/gun/energy/rifle/ionrifle/mounted
name = "mounted ion rifle"
@@ -44,9 +44,9 @@
else
to_chat(src, "<span class='notice'>Warning: Power surge detected, source - EMP. Surge prevention module is depleted and requires replacement</span>")
R.emp_act(2) // Borgs emp_act is 1-2
R.emp_act(EMP_LIGHT) // Borgs emp_act is 1-2
else
A.emp_act(3)
A.emp_act(EMP_LIGHT)
return
/obj/item/projectile/ion/small