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

Merge pull request #2064 from Citadel-Station-13/upstream-merge-29290

Browse Source 
[MIRROR] Unwrenching clockwork structures no longer damages them
This commit is contained in:
LetterJay
2017-07-30 23:14:39 -05:00
committed by GitHub
parent 05f7040d12 45de96b542
commit 77c67b31c6
4 changed files with 29 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/game/gamemodes/clock_cult/clock_structures/ocular_warden.dm
+5 -9
View File
@@ -32,16 +32,12 @@
return 25
/obj/structure/destructible/clockwork/ocular_warden/can_be_unfasten_wrench(mob/user, silent)
if(anchored)
if(obj_integrity <= max_integrity * 0.25)
if(!silent)
to_chat(user, "<span class='warning'>[src] is too damaged to unsecure!</span>")
return FAILED_UNFASTEN
else
if(!anchored)
for(var/obj/structure/destructible/clockwork/ocular_warden/W in orange(OCULAR_WARDEN_EXCLUSION_RANGE, src))
if(!silent)
to_chat(user, "<span class='neovgre'>You sense another ocular warden too near this location. Activating this one this close would cause them to fight.</span>")
return FAILED_UNFASTEN
if(W.anchored)
if(!silent)
to_chat(user, "<span class='neovgre'>You sense another ocular warden too near this location. Activating this one this close would cause them to fight.</span>")
return FAILED_UNFASTEN
return SUCCESSFUL_UNFASTEN
/obj/structure/destructible/clockwork/ocular_warden/ratvar_act()