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

Restricts some more areas from servant warp, and lets admins start the Ark on non-clockcult rounds (#31723)

Browse Source 
* Cleans up clockcult code a little

* Another thing with servants_active

* Now it compiles
This commit is contained in:
Ashe Higgs
2017-10-27 17:36:31 -05:00
committed by CitadelStationBot
parent 0a32eb3162
commit 37bb75a645
7 changed files with 42 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/game/machinery/computer/camera_advanced.dm
+3 -3
View File
@@ -281,7 +281,7 @@
/datum/action/innate/servant_warp/Activate()
if(QDELETED(target) || !(ishuman(owner) || iscyborg(owner)) || !owner.canUseTopic(target) || warping)
return
if(!istype(SSticker.mode, /datum/game_mode/clockwork_cult)) //No leaving unless there's servants from the get-go
if(!GLOB.servants_active) //No leaving unless there's servants from the get-go
return
var/mob/living/carbon/human/user = owner
var/mob/camera/aiEye/remote/remote_eye = user.remote_control
@@ -296,8 +296,8 @@
to_chat(user, "<span class='sevtug_small'>[prob(1) ? "Servant cannot into space." : "You can't teleport into space."]</span>")
return
var/area/AR = get_area(T)
if(istype(AR, /area/ai_monitored))
to_chat(user, "<span class='sevtug_small'>The structure there is too dense for [src] to pierce. (This is normal in high-security areas.)</span>")
if(!AR.clockwork_warp_allowed)
to_chat(user, "<span class='sevtug_small'>[AR.clockwork_warp_fail]</span>")
return
if(alert(user, "Are you sure you want to warp to [AR]?", target.name, "Warp", "Cancel") == "Cancel" || QDELETED(R) || !user.canUseTopic(R))
return