cyberpresidentvanellope/Bubberstation
1
0
Fork 0
mirror of https://github.com/Bubberstation/Bubberstation.git synced 2026-08-23 21:18:37 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #20698 from ChangelingRain/imtransandthisisapresenttoyall

Browse Source 
Adds some pronoun helpers
This commit is contained in:
Cheridan
2016-09-29 12:41:27 -05:00
committed by GitHub
parent e88272f1a5 a414d28999
commit 1e92582bdd
25 changed files with 299 additions and 119 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/reagents/chemistry/reagents/other_reagents.dm
+3 -3
View File
@@ -346,9 +346,9 @@
N.regenerate_icons()
if(prob(7))
if(N.w_uniform)
M.visible_message(pick("<b>[M]</b>'s collar pops up without warning.</span>", "<b>[M]</b> flexes their arms."))
M.visible_message(pick("<b>[M]</b>'s collar pops up without warning.</span>", "<b>[M]</b> flexes [M.their_pronoun()] arms."))
else
M.visible_message("<b>[M]</b> flexes their arms.")
M.visible_message("<b>[M]</b> [M.their_pronoun()] their arms.")
if(prob(10))
M.say(pick("Check these sweet biceps bro!", "Deal with it.", "CHUG! CHUG! CHUG! CHUG!", "Winning!", "NERDS!", "My name is John and I hate every single one of you."))
..()
@@ -370,7 +370,7 @@
/datum/reagent/unstableslimetoxin/on_mob_life(mob/living/carbon/human/H)
..()
H << "<span class='warning'><b>You crumple in agony as your flesh wildly morphs into new forms!</b></span>"
H.visible_message("<b>[H]</b> falls to the ground and screams as their skin bubbles and froths!") //'froths' sounds painful when used with SKIN.
H.visible_message("<b>[H]</b> falls to the ground and screams as [H.their_pronoun()] skin bubbles and froths!") //'froths' sounds painful when used with SKIN.
H.Weaken(3, 0)
spawn(30)
if(!H || qdeleted(H))
code/modules/reagents/chemistry/reagents/toxin_reagents.dm
+1 -1
View File
@@ -525,7 +525,7 @@
if(!H.heart_attack)
H.heart_attack = 1 // rip in pepperoni
if(H.stat == CONSCIOUS)
H.visible_message("<span class='userdanger'>[H] clutches at their chest as if their heart stopped!</span>")
H.visible_message("<span class='userdanger'>[H] clutches at [H.their_pronoun()] chest as if [H.their_pronoun()] heart stopped!</span>")
else
H.losebreath += 10
H.adjustOxyLoss(rand(5,25), 0)
code/modules/reagents/reagent_containers.dm
+1 -1
View File
@@ -62,7 +62,7 @@
else if(C.is_mouth_covered(mask_only = 1))
covered = "mask"
if(covered)
var/who = (isnull(user) || eater == user) ? "your" : "their"
var/who = (isnull(user) || eater == user) ? "your" : "[eater.their_pronoun()]"
user << "<span class='warning'>You have to remove [who] [covered] first!</span>"
return 0
return 1