Skip to content

Commit a2ee27f

Browse files
Merge pull request #1 from victorShchagin/device_shock_fix
Fix devices shocking repeatedly
2 parents 6fcebd4 + 9620477 commit a2ee27f

File tree

4 files changed

+0
-16
lines changed

4 files changed

+0
-16
lines changed

code/datums/wires/airlock.dm

-4
Original file line numberDiff line numberDiff line change
@@ -32,10 +32,6 @@
3232
if(!..())
3333
return FALSE
3434
var/obj/machinery/door/airlock/A = holder
35-
if(!istype(user, /mob/living/silicon))
36-
if(A.isElectrified())
37-
if(A.shock(user, 100))
38-
return FALSE
3935
if(!A.p_open)
4036
return FALSE
4137
return TRUE

code/datums/wires/smartfridge.dm

-4
Original file line numberDiff line numberDiff line change
@@ -20,10 +20,6 @@
2020
if(!..())
2121
return FALSE
2222
var/obj/machinery/smartfridge/S = holder
23-
if(!istype(user, /mob/living/silicon))
24-
if(S.seconds_electrified)
25-
if(S.shock(user, 100))
26-
return FALSE
2723
if(S.panel_open)
2824
return TRUE
2925
return FALSE

code/datums/wires/suit_storage_unit.dm

-4
Original file line numberDiff line numberDiff line change
@@ -15,10 +15,6 @@
1515
if(!..())
1616
return FALSE
1717
var/obj/machinery/suit_cycler/S = holder
18-
if(!istype(user, /mob/living/silicon))
19-
if(S.electrified)
20-
if(S.shock(user, 100))
21-
return FALSE
2218
if(S.panel_open)
2319
return TRUE
2420
return FALSE

code/datums/wires/vending.dm

-4
Original file line numberDiff line numberDiff line change
@@ -20,10 +20,6 @@
2020
if(!..())
2121
return FALSE
2222
var/obj/machinery/vending/V = holder
23-
if(!istype(user, /mob/living/silicon))
24-
if(V.seconds_electrified)
25-
if(V.shock(user, 100))
26-
return FALSE
2723
if(V.panel_open)
2824
return TRUE
2925
return FALSE

0 commit comments

Comments
 (0)