cyberpresidentvanellope/GS13
1
0
Fork 0
mirror of https://github.com/KabKebab/GS13.git synced 2026-08-23 13:06:18 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fix merge conflicts

Browse Source
This commit is contained in:
Archie
2021-01-05 03:41:08 -03:00
parent d98266036f 90ae23caaa
commit 9e37d3be62
106 changed files with 13604 additions and 13417 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/power/apc.dm
+3 -3
View File
@@ -748,11 +748,11 @@
return FALSE
/obj/machinery/power/apc/AltClick(mob/user)
..()
. = ..()
if(!user.canUseTopic(src, !issilicon(user)) || !isturf(loc))
return
else
togglelock(user)
togglelock(user)
return TRUE
/obj/machinery/power/apc/proc/togglelock(mob/living/user)
if(obj_flags & EMAGGED)