cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-07-22 04:24:20 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #10028 from SomeSortaSquid/master

Browse Source 
Fix for Airlocks Shocking Remotely
This commit is contained in:
variableundefined
2018-10-29 08:00:16 +08:00
committed by GitHub
parent 35bed9de2f bfbd4213d3
commit cd553f1be6
1 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/datums/wires/airlock.dm
+5 -4
View File
@@ -55,9 +55,10 @@ var/const/AIRLOCK_WIRE_LIGHT = 512
/datum/wires/airlock/CanUse(mob/living/L)
var/obj/machinery/door/airlock/A = holder
if(iscarbon(L))
if(A.isElectrified())
if(A.shock(L, 100))
return 0
if(A.Adjacent(L))
if(A.isElectrified())
if(A.shock(L, 100))
return 0
if(A.panel_open)
return 1
return 0
@@ -211,4 +212,4 @@ var/const/AIRLOCK_WIRE_LIGHT = 512
A.lights = !A.lights
A.update_icon()
..()
..()