cyberpresidentvanellope/Yogstation
1
0
Fork 0
mirror of https://github.com/yogstation13/Yogstation.git synced 2025-02-26 09:04:50 +00:00
Code Issues Packages Projects Releases Wiki Activity

Makes more messages pronoun sensitive (#37582)

Browse Source 
* Makes more messages pronoun sensitive

* Some cleanup

* more pronouns

* rever
This commit is contained in:
ShizCalev
2018-05-03 18:45:55 -04:00
committed by yogstation13-bot
parent a3fa28a0de
commit c32d567cb9
118 changed files with 226 additions and 204 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
code/game/objects/items/robot/robot_items.dm
View File

@@ -114,7 +114,7 @@
if(M.health >= 0)
if(ishuman(M)||ismonkey(M))
M.electrocute_act(5, "[user]", safety = 1)
user.visible_message("<span class='userdanger'>[user] electrocutes [M] with their touch!</span>", \
user.visible_message("<span class='userdanger'>[user] electrocutes [M] with [user.p_their()] touch!</span>", \
"<span class='danger'>You electrocute [M] with your touch!</span>")
M.update_canmove()
else
@@ -132,7 +132,7 @@
if(ccooldown < world.time)
if(M.health >= 0)
if(ishuman(M))
user.visible_message("<span class='userdanger'>[user] crushes [M] in their grip!</span>", \
user.visible_message("<span class='userdanger'>[user] crushes [M] in [user.p_their()] grip!</span>", \
"<span class='danger'>You crush [M] in your grip!</span>")
else
user.visible_message("<span class='userdanger'>[user] crushes [M]!</span>", \