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

refactor tags

Browse Source
This commit is contained in:
kevinz000
2020-01-16 20:58:00 -07:00
parent 2ba226b912
commit 9ef4cbfa76
42 changed files with 114 additions and 114 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/datums/brain_damage/severe.dm
+1 -1
View File
@@ -132,7 +132,7 @@
/datum/brain_trauma/severe/narcolepsy/on_life()
..()
if(owner._REFACTORING_IsSleeping())
if(owner.IsSleeping())
return
var/sleep_chance = 1
if(owner.m_intent == MOVE_INTENT_RUN)
code/datums/components/butchering.dm
+1 -1
View File
@@ -32,7 +32,7 @@
if(ishuman(M) && source.force && source.get_sharpness())
var/mob/living/carbon/human/H = M
if((H.health <= H.crit_threshold || (user.pulling == H && user.grab_state >= GRAB_NECK) || H._REFACTORING_IsSleeping()) && user.zone_selected == BODY_ZONE_PRECISE_MOUTH) // Only sleeping, neck grabbed, or crit, can be sliced.
if((H.health <= H.crit_threshold || (user.pulling == H && user.grab_state >= GRAB_NECK) || H.IsSleeping()) && user.zone_selected == BODY_ZONE_PRECISE_MOUTH) // Only sleeping, neck grabbed, or crit, can be sliced.
if(H.has_status_effect(/datum/status_effect/neck_slice))
user.show_message("<span class='warning'>[H]'s neck has already been already cut, you can't make the bleeding any worse!</span>", 1, \
"<span class='warning'>Their neck has already been already cut, you can't make the bleeding any worse!</span>")
code/datums/diseases/advance/symptoms/heal.dm
+2 -2
View File
@@ -253,11 +253,11 @@
var/mob/living/M = A.affected_mob
if(HAS_TRAIT(M, TRAIT_DEATHCOMA))
return power
else if(M._REFACTORING_IsUnconscious() || M.stat == UNCONSCIOUS)
else if(M.IsUnconscious() || M.stat == UNCONSCIOUS)
return power * 0.9
else if(M.stat == SOFT_CRIT)
return power * 0.5
else if(M._REFACTORING_IsSleeping())
else if(M.IsSleeping())
return power * 0.25
else if(M.getBruteLoss() + M.getFireLoss() >= 70 && !active_coma)
to_chat(M, "<span class='warning'>You feel yourself slip into a regenerative coma...</span>")
code/datums/martial/sleeping_carp.dm
+1 -1
View File
@@ -227,7 +227,7 @@
H.visible_message("<span class='warning'>[H] collapses!</span>", \
"<span class='userdanger'>Your legs give out!</span>")
H.DefaultCombatKnockdown(80)
if(H.staminaloss && !H._REFACTORING_IsSleeping())
if(H.staminaloss && !H.IsSleeping())
var/total_health = (H.health - H.staminaloss)
if(total_health <= HEALTH_THRESHOLD_CRIT && !H.stat)
H.visible_message("<span class='warning'>[user] delivers a heavy hit to [H]'s head, knocking [H.p_them()] out cold!</span>", \
code/datums/mutations/body.dm
+1 -1
View File
@@ -99,7 +99,7 @@
text_gain_indication = "<span class='danger'>You twitch.</span>"
/datum/mutation/human/tourettes/on_life(mob/living/carbon/human/owner)
if(prob(10) && owner.stat == CONSCIOUS && !owner._REFACTORING_IsStun())
if(prob(10) && owner.stat == CONSCIOUS && !owner.IsStun())
owner.Stun(200)
switch(rand(1, 3))
if(1)