cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-08-22 03:27:05 +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/game/objects/items/devices/traitordevices.dm
+1 -1
View File
@@ -271,7 +271,7 @@
if(HAS_TRAIT(user, TRAIT_RESISTHEAT))
to_chat(user, "<span class='warning'>You are already fireproof!</span>")
return
if(user.mind && (ischangeling(user) || user.mind.has_antag_datum(/datum/antagonist/vampire)) || (user.dna && user.dna.species.name != "Plasmaman"))
if(user.mind && (IS_CHANGELING(user) || user.mind.has_antag_datum(/datum/antagonist/vampire)) || (user.dna && user.dna.species.name != "Plasmaman"))
to_chat(user, "<span class='warning'>The injector is not compatable with your biology!</span>")
return
if(used)
code/game/objects/items/weapons/bio_chips/bio_chip_traitor.dm
+1 -1
View File
@@ -20,7 +20,7 @@
return FALSE
// Fails if they're already a mindslave of someone, or if they're mindshielded.
if(ismindslave(mindslave_target) || ismindshielded(mindslave_target))
if(IS_MINDSLAVE(mindslave_target) || ismindshielded(mindslave_target))
mindslave_target.visible_message(
"<span class='warning'>[mindslave_target] seems to resist the bio-chip!</span>", \
"<span class='warning'>You feel a strange sensation in your head that quickly dissipates.</span>")
code/game/objects/items/weapons/caution.dm
+1 -1
View File
@@ -24,7 +24,7 @@
/obj/item/caution/proximity_sign/attack_self(mob/user as mob)
if(ishuman(user))
var/mob/living/carbon/human/H = user
if(!H.mind.has_antag_datum(/datum/antagonist/traitor) && !ismindslave(H))
if(!H.mind.has_antag_datum(/datum/antagonist/traitor) && !IS_MINDSLAVE(H))
return
if(armed)
armed = FALSE
code/game/objects/items/weapons/holy_weapons.dm
+1 -1
View File
@@ -757,7 +757,7 @@
if(!target || !ishuman(target) || !missionary || !ishuman(missionary))
return
if(ismindslave(target) || target.mind.zealot_master) //mindslaves and zealots override the staff because the staff is just a temporary mindslave
if(IS_MINDSLAVE(target) || target.mind.zealot_master) //mindslaves and zealots override the staff because the staff is just a temporary mindslave
to_chat(missionary, "<span class='warning'>Your faith is strong, but [target.p_their()] mind is already slaved to someone else's ideals. Perhaps an inquisition would reveal more...</span>")
faith -= 25 //same faith cost as losing sight of them mid-conversion, but did you just find someone who can lead you to a fellow traitor?
return