cyberpresidentvanellope/VOREStation
1
0
Fork 0
mirror of https://github.com/VOREStation/VOREStation.git synced 2026-08-26 05:27:39 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fix

Browse Source
This commit is contained in:
Guti
2024-09-18 18:33:15 +02:00
parent 06a46a237b
commit a3c7599065
19 changed files with 2 additions and 146 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/shieldgen/shield_capacitor.dm
-6
View File
@@ -38,15 +38,9 @@
/obj/machinery/shield_capacitor/attackby(obj/item/W, mob/user)
<<<<<<< HEAD
if(istype(W, /obj/item/card/id))
var/obj/item/card/id/C = W
if((access_captain in C.access) || (access_security in C.access) || (access_engine in C.access))
=======
if(istype(W, /obj/item/card/id))
var/obj/item/card/id/C = W
if((access_captain in C.GetAccess()) || (access_security in C.GetAccess()) || (access_engine in C.GetAccess()))
>>>>>>> master
src.locked = !src.locked
to_chat(user, "Controls are now [src.locked ? "locked." : "unlocked."]")
updateDialog()
code/modules/shieldgen/shield_gen.dm
-6
View File
@@ -58,15 +58,9 @@
s.start()
/obj/machinery/shield_gen/attackby(obj/item/W, mob/user)
<<<<<<< HEAD
if(istype(W, /obj/item/card/id))
var/obj/item/card/id/C = W
if((access_captain in C.access) || (access_security in C.access) || (access_engine in C.access))
=======
if(istype(W, /obj/item/card/id))
var/obj/item/card/id/C = W
if((access_captain in C.GetAccess()) || (access_security in C.GetAccess()) || (access_engine in C.GetAccess()))
>>>>>>> master
src.locked = !src.locked
to_chat(user, "Controls are now [src.locked ? "locked." : "unlocked."]")
updateDialog()