cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-08-23 20:16:55 +01:00
Code Issues Packages Projects Releases Wiki Activity

Update pronoun usage

Browse Source
This commit is contained in:
Tayyyyyyy
2018-05-25 18:34:22 -07:00
parent a3799aa84c
commit 497072d4d1
28 changed files with 88 additions and 93 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/game/objects/effects/spiders.dm
+1 -1
View File
@@ -219,7 +219,7 @@
if(C)
S.key = C.key
if(S.master_commander)
to_chat(S, "<span class='biggerdanger'>You are a spider who is loyal to [S.master_commander], obey [S.master_commander]'s every order and assist them in completing their goals at any cost.</span>")
to_chat(S, "<span class='biggerdanger'>You are a spider who is loyal to [S.master_commander], obey [S.master_commander]'s every order and assist them in completing [S.master_commander.p_their()] goals at any cost.</span>")
qdel(src)
/obj/effect/decal/cleanable/spiderling_remains
code/game/objects/items/weapons/holy_weapons.dm
+2 -2
View File
@@ -585,12 +585,12 @@
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
to_chat(missionary, "<span class='warning'>Your faith is strong, but their mind is already slaved to someone else's ideals. Perhaps an inquisition would reveal more...</span>")
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
if(ismindshielded(target))
faith -= 75
to_chat(missionary, "<span class='warning'>Your faith is strong, but their mind remains closed to your ideals. Your resolve helps you retain a bit of faith though.</span>")
to_chat(missionary, "<span class='warning'>Your faith is strong, but [target.p_their()] mind remains closed to your ideals. Your resolve helps you retain a bit of faith though.</span>")
return
else if(target.mind.assigned_role == "Psychiatrist" || target.mind.assigned_role == "Librarian") //fancy book lernin helps counter religion (day 0 job love, what madness!)
if(prob(35)) //35% chance to fail
code/game/objects/items/weapons/implants/implantchair.dm
+1 -1
View File
@@ -79,7 +79,7 @@
return
var/mob/M = G.affecting
if(M.buckled_mob)
to_chat(usr, "[M] will not fit into [src] because they have a slime latched onto their head.")
to_chat(usr, "[M] will not fit into [src] because [M.p_they()] have a slime latched onto [M.p_their()] head.")
return
if(put_mob(M))
qdel(G)
code/game/objects/items/weapons/tape.dm
+2 -2
View File
@@ -14,11 +14,11 @@
/obj/item/stack/tape_roll/attack(mob/living/carbon/human/M as mob, mob/living/user as mob)
if(M.wear_mask)
to_chat(user, "Remove their mask first!")
to_chat(user, "Remove [M.p_their()] mask first!")
else if(amount < 2)
to_chat(user, "You'll need more tape for this!")
else if(!M.check_has_mouth())
to_chat(user, "They have no mouth to tape over!")
to_chat(user, "[M.p_they()] have no mouth to tape over!")
else
if(M == user)
to_chat(user, "You try to tape your own mouth shut.")