Fixes "ocular wardens don't target buckled mobs" (#36628)

* Ocular wardens now shoot handcuffed and buckled, but not if they're spelled handcuffed.

* Clock cultists can spell cuff sec cuffed carbon mobs, so the ocular doesn't shoot them.

* Added in review suggestions

* More oversight
This commit is contained in:
Davidj361
2018-03-28 14:43:42 -04:00
committed by CitadelStationBot
parent 77f40b6be9
commit 60091c50b5
2 changed files with 7 additions and 3 deletions
@@ -40,7 +40,7 @@
else if(L.stat)
to_chat(ranged_ability_user, "<span class='neovgre'>\"There is use in shackling the dead, but for examples.\"</span>")
return TRUE
else if(L.handcuffed)
else if (istype(L.handcuffed,/obj/item/restraints/handcuffs/clockwork))
to_chat(ranged_ability_user, "<span class='neovgre'>\"They are already helpless, no?\"</span>")
return TRUE
@@ -49,7 +49,7 @@
"<span class='neovgre_small'>You begin shaping replicant alloy into manacles around [L]'s wrists...</span>")
to_chat(L, "<span class='userdanger'>[ranged_ability_user] begins forming manacles around your wrists!</span>")
if(do_mob(ranged_ability_user, L, 30))
if(!L.handcuffed)
if(!(istype(L.handcuffed,/obj/item/restraints/handcuffs/clockwork)))
L.handcuffed = new/obj/item/restraints/handcuffs/clockwork(L)
L.update_handcuffed()
to_chat(ranged_ability_user, "<span class='neovgre_small'>You shackle [L].</span>")
@@ -112,8 +112,12 @@
continue
if(is_servant_of_ratvar(L) || (L.has_trait(TRAIT_BLIND)) || L.anti_magic_check(TRUE, TRUE))
continue
if(L.stat || L.restrained() || L.buckled || L.lying)
if(L.stat || L.lying)
continue
if (iscarbon(L))
var/mob/living/carbon/c = L
if (istype(c.handcuffed,/obj/item/restraints/handcuffs/clockwork))
continue
if(ishostile(L))
var/mob/living/simple_animal/hostile/H = L
if(("ratvar" in H.faction) || (!H.mind && "neutral" in H.faction))