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

Makes more messages pronoun sensitive

Browse Source
This commit is contained in:
ShizCalev
2018-05-03 18:45:55 -04:00
committed by CitadelStationBot
parent d574fc5590
commit b5a95e9da8
118 changed files with 234 additions and 202 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/paperwork/contract.dm
+2 -2
View File
@@ -194,7 +194,7 @@
to_chat(user, "<span class='notice'>Your signature simply slides off the sheet, it seems this contract is not meant for you to sign.</span>")
return 0
if(user.mind.soulOwner == owner)
to_chat(user, "<span class='notice'>This devil already owns your soul, you may not sell it to them again.</span>")
to_chat(user, "<span class='notice'>This devil already owns your soul, you may not sell it to [owner.p_them()] again.</span>")
return 0
if(signed)
to_chat(user, "<span class='notice'>This contract has already been signed. It may not be signed again.</span>")
@@ -220,7 +220,7 @@
/obj/item/paper/contract/infernal/revive/attack(mob/M, mob/living/user)
if (target == M.mind && M.stat == DEAD && M.mind.soulOwner == M.mind)
if (cooldown)
to_chat(user, "<span class='notice'>Give [M] a chance to think through the contract, don't rush them.</span>")
to_chat(user, "<span class='notice'>Give [M] a chance to think through the contract, don't rush [M.p_them()].</span>")
return 0
cooldown = TRUE
var/mob/living/carbon/human/H = M
code/modules/paperwork/paper.dm
+1 -1
View File
@@ -312,7 +312,7 @@
if(P.is_hot())
if(user.has_trait(TRAIT_CLUMSY) && prob(10))
user.visible_message("<span class='warning'>[user] accidentally ignites themselves!</span>", \
user.visible_message("<span class='warning'>[user] accidentally ignites [user.p_them()]self!</span>", \
"<span class='userdanger'>You miss the paper and accidentally light yourself on fire!</span>")
user.dropItemToGround(P)
user.adjust_fire_stacks(1)
code/modules/paperwork/paperplane.dm
+1 -1
View File
@@ -66,7 +66,7 @@
else if(P.is_hot())
if(user.has_trait(TRAIT_CLUMSY) && prob(10))
user.visible_message("<span class='warning'>[user] accidentally ignites themselves!</span>", \
user.visible_message("<span class='warning'>[user] accidentally ignites [user.p_them()]self!</span>", \
"<span class='userdanger'>You miss [src] and accidentally light yourself on fire!</span>")
user.dropItemToGround(P)
user.adjust_fire_stacks(1)
code/modules/paperwork/photocopier.dm
+5
View File
@@ -138,8 +138,13 @@
else if(ass) //ASS COPY. By Miauw
for(var/i = 0, i < copies, i++)
var/icon/temp_img
<<<<<<< HEAD
if(ishuman(ass) && (ass.get_item_by_slot(slot_w_uniform) || ass.get_item_by_slot(slot_wear_suit)))
to_chat(usr, "<span class='notice'>You feel kind of silly, copying [ass == usr ? "your" : ass][ass == usr ? "" : "\'s"] ass with [ass == usr ? "your" : "their"] clothes on.</span>" )
=======
if(ishuman(ass) && (ass.get_item_by_slot(SLOT_W_UNIFORM) || ass.get_item_by_slot(SLOT_WEAR_SUIT)))
to_chat(usr, "<span class='notice'>You feel kind of silly, copying [ass == usr ? "your" : ass][ass == usr ? "" : "\'s"] ass with [ass == usr ? "your" : "[ass.p_their()]"] clothes on.</span>" )
>>>>>>> ba1030f... Makes more messages pronoun sensitive (#37582)
break
else if(toner >= 5 && !busy && check_ass()) //You have to be sitting on the copier and either be a xeno or a human without clothes on.
if(isalienadult(ass) || istype(ass, /mob/living/simple_animal/hostile/alien)) //Xenos have their own asses, thanks to Pybro.
code/modules/paperwork/photography.dm
+1 -1
View File
@@ -288,7 +288,7 @@
for(var/obj/item/I in L.held_items)
if(!holding)
holding += "[L.p_they(TRUE)] [L.p_are()] holding \a [I]"
holding += "[L.p_theyre(TRUE)] holding \a [I]"
else
holding += " and \a [I]"
holding = holding.Join()