Skip to content

Commit

Permalink
Merge pull request tgstation#18639 from ChangelingRain/sigiluse
Browse files Browse the repository at this point in the history
Sigils of Submission/Accession now work on people in crit
  • Loading branch information
Razharas authored Jun 17, 2016
2 parents 76c1cbd + 0b25ead commit d74da03
Showing 1 changed file with 4 additions and 3 deletions.
7 changes: 4 additions & 3 deletions code/game/gamemodes/clock_cult/clock_structures.dm
Original file line number Diff line number Diff line change
Expand Up @@ -667,7 +667,7 @@
burn_state = FIRE_PROOF
burntime = 1
var/affects_servants = FALSE
var/affects_stat = FALSE
var/stat_affected = CONSCIOUS

/obj/effect/clockwork/sigil/attack_hand(mob/user)
if(iscarbon(user) && !user.stat && (!is_servant_of_ratvar(user) || (is_servant_of_ratvar(user) && user.a_intent == "harm")))
Expand All @@ -680,7 +680,7 @@
..()
if(isliving(AM))
var/mob/living/L = AM
if(!L.stat || affects_stat)
if(L.stat <= stat_affected)
if((!is_servant_of_ratvar(L) || (is_servant_of_ratvar(L) && affects_servants)) && L.mind)
sigil_effects(L)
return 1
Expand Down Expand Up @@ -718,6 +718,7 @@
icon_state = "sigilsubmission"
color = "#FAE48C"
alpha = 125
stat_affected = UNCONSCIOUS
var/convert_time = 50
var/glow_light = 2 //soft light
var/glow_falloff = 1
Expand Down Expand Up @@ -835,7 +836,7 @@
color = "#123456"
alpha = 75
affects_servants = TRUE
affects_stat = TRUE
stat_affected = DEAD
var/vitality = 0
var/base_revive_cost = 25
var/sigil_active = FALSE
Expand Down

0 comments on commit d74da03

Please sign in to comment.