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

Add themselves as a pronoun helper, fixes some usages of it (#20184)

Browse Source 
* Add themselves helper

* Testing and replacing

* Fixes some non-standard usages
This commit is contained in:
Luc
2023-01-20 19:28:48 -05:00
committed by GitHub
parent aec7c3ff3f
commit 9ba005de9f
32 changed files with 76 additions and 43 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/mob/living/carbon/carbon.dm
+4 -4
View File
@@ -298,7 +298,7 @@
/mob/living/carbon/proc/check_self_for_injuries()
var/mob/living/carbon/human/H = src
visible_message("<span class='notice'>[src] examines [H.p_them()]self.</span>", \
visible_message("<span class='notice'>[src] examines [H.p_themselves()].</span>", \
"<span class='notice'>You check yourself for injuries.</span>" \
)
var/list/status_list = list()
@@ -871,7 +871,7 @@ GLOBAL_LIST_INIT(ventcrawl_machinery, list(/obj/machinery/atmospherics/unary/ven
return
var/time = I.breakouttime
visible_message("<span class='warning'>[src] attempts to unbuckle [p_them()]self!</span>",
visible_message("<span class='warning'>[src] attempts to unbuckle [p_themselves()]!</span>",
"<span class='notice'>You attempt to unbuckle yourself... (This will take around [time / 10] seconds and you need to stay still.)</span>")
if(!do_after(src, time, FALSE, src, extra_checks = list(CALLBACK(src, PROC_REF(buckle_check)))))
if(src && buckled)
@@ -895,11 +895,11 @@ GLOBAL_LIST_INIT(ventcrawl_machinery, list(/obj/machinery/atmospherics/unary/ven
fire_stacks -= 5
Weaken(6 SECONDS, TRUE) //We dont check for CANWEAKEN, I don't care how immune to weakening you are, if you're rolling on the ground, you're busy.
spin(32, 2)
visible_message("<span class='danger'>[src] rolls on the floor, trying to put [p_them()]self out!</span>",
visible_message("<span class='danger'>[src] rolls on the floor, trying to put [p_themselves()] out!</span>",
"<span class='notice'>You stop, drop, and roll!</span>")
sleep(3 SECONDS)
if(fire_stacks <= 0)
visible_message("<span class='danger'>[src] has successfully extinguished [p_them()]self!</span>",
visible_message("<span class='danger'>[src] has successfully extinguished [p_themselves()]!</span>",
"<span class='notice'>You extinguish yourself.</span>")
ExtinguishMob()
code/modules/mob/living/carbon/superheroes.dm
+1 -1
View File
@@ -189,7 +189,7 @@
switch(progress)
if(1)
to_chat(user, "<span class='notice'>You begin by introducing yourself and explaining what you're about.</span>")
user.visible_message("<span class='danger'>[user] introduces [user.p_them()]self and explains [user.p_their()] plans.</span>")
user.visible_message("<span class='danger'>[user] introduces [user.p_themselves()] and explains [user.p_their()] plans.</span>")
if(2)
to_chat(user, "<span class='notice'>You begin the recruitment of [target].</span>")
user.visible_message("<span class='danger'>[user] leans over towards [target], whispering excitedly as [user.p_they()] give[user.p_s()] a speech.</span>")
code/modules/mob/mob.dm
+1 -1
View File
@@ -1225,7 +1225,7 @@ GLOBAL_LIST_INIT(slot_equipment_priority, list( \
location.add_vomit_floor(FALSE, TRUE)
else
if(!no_text)
visible_message("<span class='warning'>[src] pukes all over [p_them()]self!</span>","<span class='warning'>You puke all over yourself!</span>")
visible_message("<span class='warning'>[src] pukes all over [p_themselves()]!</span>","<span class='warning'>You puke all over yourself!</span>")
location.add_vomit_floor(TRUE)
/mob/proc/AddSpell(obj/effect/proc_holder/spell/S)