Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit450

2019-12-11 21:10:24 +01:00
parent 7a3cb3bd58 f2fc50119d
commit 651370c5b4
102 changed files with 296 additions and 181 deletions
@@ -694,11 +694,11 @@
 		return ..()

 /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)