shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #6418 from Citadel-Station-13/upstream-merge-37215

Browse Source 
[MIRROR] fixes borgs being able to control the CentCom ferry
This commit is contained in:
deathride58
2018-04-16 02:49:38 +00:00
committed by GitHub
parent 87079e1ddb 107add66bb
commit 41af940981
1 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/shuttle/ferry.dm
+5 -2
View File
@@ -6,7 +6,7 @@
possible_destinations = "ferry_home;ferry_away" possible_destinations = "ferry_home;ferry_away"
req_access = list(ACCESS_CENT_GENERAL) req_access = list(ACCESS_CENT_GENERAL)
var/aiControlDisabled = TRUE var/allow_silicons = FALSE
var/allow_emag = FALSE var/allow_emag = FALSE
/obj/machinery/computer/shuttle/ferry/emag_act(mob/user) /obj/machinery/computer/shuttle/ferry/emag_act(mob/user)
@@ -16,7 +16,10 @@
return ..() return ..()
/obj/machinery/computer/shuttle/ferry/attack_ai() /obj/machinery/computer/shuttle/ferry/attack_ai()
return aiControlDisabled? FALSE : ..() return allow_silicons ? ..() : FALSE
/obj/machinery/computer/shuttle/ferry/attack_robot()
return allow_silicons ? ..() : FALSE
/obj/machinery/computer/shuttle/ferry/request /obj/machinery/computer/shuttle/ferry/request
name = "ferry console" name = "ferry console"