cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-08-27 05:57:24 +01:00
Code Issues Packages Projects Releases Wiki Activity

Changes the is_changeling and is_mindslave procs into proper defines (#25212)

Browse Source 
* Changes these procs into proper defines

* Henri review
This commit is contained in:
DGamerL
2024-04-28 20:57:26 +00:00
committed by GitHub
parent fc7acc4597
commit fb027f73dd
24 changed files with 34 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/antagonists/changeling/powers/mutations.dm
+1 -1
View File
@@ -40,7 +40,7 @@
/datum/action/changeling/weapon/proc/retract(atom/target, any_hand = FALSE)
SIGNAL_HANDLER
if(!ischangeling(owner))
if(!IS_CHANGELING(owner))
return
if(!any_hand && !istype(owner.get_active_hand(), weapon_type))
return
code/modules/antagonists/changeling/powers/shriek.dm
+1 -1
View File
@@ -19,7 +19,7 @@
var/mob/living/carbon/human/H = M
if(H.check_ear_prot() >= HEARING_PROTECTION_TOTAL)
continue
if(!M.mind || !ischangeling(M))
if(!M.mind || !IS_CHANGELING(M))
M.Deaf(30 SECONDS)
M.AdjustConfused(40 SECONDS)
M.Jitter(100 SECONDS)
code/modules/antagonists/changeling/powers/swap_form.dm
+1 -1
View File
@@ -23,7 +23,7 @@
if(!istype(target) || !target.mind || issmall(target) || HAS_TRAIT(target, TRAIT_GENELESS))
to_chat(user, "<span class='warning'>[target] is not compatible with this ability.</span>")
return FALSE
if(ischangeling(target))
if(IS_CHANGELING(target))
to_chat(user, "<span class='warning'>We are unable to swap forms with another changeling!</span>")
return FALSE
return TRUE
code/modules/antagonists/changeling/powers/tiny_prick.dm
+2 -2
View File
@@ -57,7 +57,7 @@
if(ismachineperson(target))
to_chat(user, "<span class='warning'>This won't work on synthetics.</span>")
return FALSE
if(ischangeling(target))
if(IS_CHANGELING(target))
sting_feedback(user, target)
take_chemical_cost()
return FALSE
@@ -67,7 +67,7 @@
if(!target)
return
to_chat(user, "<span class='notice'>We stealthily sting [target.name].</span>")
if(ischangeling(target))
if(IS_CHANGELING(target))
to_chat(target, "<span class='warning'>You feel a tiny prick.</span>")
add_attack_logs(user, target, "Unsuccessful sting (changeling)")
return TRUE
code/modules/antagonists/vampire/vampire_powers/dantalion_powers.dm
+1 -1
View File
@@ -55,7 +55,7 @@
if(V.subclass.thrall_cap <= length(user.mind.som.serv))
to_chat(user, "<span class='warning'>You don't have enough power to enthrall any more people!</span>")
return
if(ismindshielded(C) || C.mind.has_antag_datum(/datum/antagonist/vampire) || C.mind.has_antag_datum(/datum/antagonist/mindslave))
if(ismindshielded(C) || C.mind.has_antag_datum(/datum/antagonist/vampire) || IS_MINDSLAVE(C))
C.visible_message("<span class='warning'>[C] seems to resist the takeover!</span>", "<span class='notice'>You feel a familiar sensation in your skull that quickly dissipates.</span>")
return
if(HAS_MIND_TRAIT(C, TRAIT_HOLY))