cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-08-24 20:47:10 +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/fish/fish_items.dm
+1 -1
View File
@@ -52,7 +52,7 @@
attack_verb = list("scrubbed", "brushed", "scraped")
/obj/item/tank_brush/suicide_act(mob/user)
visible_message("<span class='suicide'>[user] is vigorously scrubbing [user.p_them()]self raw with [src]! It looks like [user.p_theyre()] trying to commit suicide.</span>")
visible_message("<span class='suicide'>[user] is vigorously scrubbing [user.p_themselves()] raw with [src]! It looks like [user.p_theyre()] trying to commit suicide.</span>")
return BRUTELOSS|FIRELOSS
/obj/item/storage/bag/fish
code/modules/food_and_drinks/drinks/drinks/bottle.dm
+2 -2
View File
@@ -107,8 +107,8 @@
target.visible_message("<span class='danger'>[user] has hit [target][head_attack_message] with a bottle of [name]!</span>", \
"<span class='userdanger'>[user] has hit [target][head_attack_message] with a bottle of [name]!</span>")
else
user.visible_message("<span class='danger'>[target] hits [target.p_them()]self with a bottle of [name][head_attack_message]!</span>", \
"<span class='userdanger'>[target] hits [target.p_them()]self with a bottle of [name][head_attack_message]!</span>")
user.visible_message("<span class='danger'>[target] hits [target.p_themselves()] with a bottle of [name][head_attack_message]!</span>", \
"<span class='userdanger'>[target] hits [target.p_themselves()] with a bottle of [name][head_attack_message]!</span>")
//Attack logs
add_attack_logs(user, target, "Hit with [src]")
code/modules/food_and_drinks/drinks/drinks/shotglass.dm
+1 -1
View File
@@ -43,7 +43,7 @@
/obj/item/reagent_containers/food/drinks/drinkingglass/shotglass/proc/clumsilyDrink(mob/living/carbon/human/user) //Clowns beware
if(!(resistance_flags & ON_FIRE))
return
user.visible_message("<span class = 'warning'>[user] pours [src] all over [user.p_them()]self!</span>", "<span class = 'danger'>You pour [src] all over yourself!</span>", "<span class = 'warning'>You hear a 'whoompf' and a sizzle.</span>")
user.visible_message("<span class = 'warning'>[user] pours [src] all over [user.p_themselves()]!</span>", "<span class = 'danger'>You pour [src] all over yourself!</span>", "<span class = 'warning'>You hear a 'whoompf' and a sizzle.</span>")
extinguish(TRUE)
reagents.reaction(user, REAGENT_TOUCH)
reagents.clear_reagents()
code/modules/games/cards.dm
+1 -1
View File
@@ -230,7 +230,7 @@
H.concealed = TRUE
H.update_appearance(UPDATE_NAME|UPDATE_DESC|UPDATE_OVERLAYS)
if(user == target)
user.visible_message("<span class='notice'>[user] deals [dcard] card(s) to \himself.</span>")
user.visible_message("<span class='notice'>[user] deals [dcard] card(s) to [user.p_themselves()].</span>")
else
user.visible_message("<span class='notice'>[user] deals [dcard] card(s) to [target].</span>")
H.throw_at(get_step(target,target.dir),3,1,H)
code/modules/hydroponics/grown/banana.dm
+1 -1
View File
@@ -27,7 +27,7 @@
tastes = list("banana" = 1)
/obj/item/reagent_containers/food/snacks/grown/banana/suicide_act(mob/user)
user.visible_message("<span class='suicide'>[user] is aiming [src] at [user.p_them()]self! It looks like [user.p_theyre()] trying to commit suicide.</span>")
user.visible_message("<span class='suicide'>[user] is aiming [src] at [user.p_themselves()]! It looks like [user.p_theyre()] trying to commit suicide.</span>")
playsound(loc, 'sound/items/bikehorn.ogg', 50, 1, -1)
sleep(25)
if(!user)
code/modules/hydroponics/hydroitemdefines.dm
+2 -2
View File
@@ -98,7 +98,7 @@
sharp = TRUE
/obj/item/hatchet/suicide_act(mob/user)
user.visible_message("<span class='suicide'>[user] is chopping at [user.p_them()]self with [src]! It looks like [user.p_theyre()] trying to commit suicide.</span>")
user.visible_message("<span class='suicide'>[user] is chopping at [user.p_themselves()] with [src]! It looks like [user.p_theyre()] trying to commit suicide.</span>")
playsound(loc, 'sound/weapons/bladeslice.ogg', 50, 1, -1)
return BRUTELOSS
@@ -142,7 +142,7 @@
origin_tech = "materials=1;combat=2"
/obj/item/scythe/suicide_act(mob/user)
user.visible_message("<span class='suicide'>[user] is beheading [user.p_them()]self with [src]! It looks like [user.p_theyre()] trying to commit suicide.</span>")
user.visible_message("<span class='suicide'>[user] is beheading [user.p_themselves()] with [src]! It looks like [user.p_theyre()] trying to commit suicide.</span>")
if(ishuman(user))
var/mob/living/carbon/human/H = user
var/obj/item/organ/external/affecting = H.get_organ("head")
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)
code/modules/paperwork/paper.dm
+1 -1
View File
@@ -438,7 +438,7 @@
if(is_hot(P))
if(HAS_TRAIT(user, TRAIT_CLUMSY) && prob(10))
user.visible_message("<span class='warning'>[user] accidentally ignites [user.p_them()]self!</span>", \
user.visible_message("<span class='warning'>[user] accidentally ignites [user.p_themselves()]!</span>", \
"<span class='userdanger'>You miss the paper and accidentally light yourself on fire!</span>")
user.unEquip(P)
user.adjust_fire_stacks(1)
code/modules/paperwork/paperplane.dm
+1 -1
View File
@@ -72,7 +72,7 @@
else if(is_hot(P))
if(HAS_TRAIT(user, TRAIT_CLUMSY) && prob(10))
user.visible_message("<span class='warning'>[user] accidentally ignites [user.p_them()]self!</span>", \
user.visible_message("<span class='warning'>[user] accidentally ignites [user.p_themselves()]!</span>", \
"<span class='userdanger'>You miss [src] and accidentally light yourself on fire!</span>")
user.unEquip(P)
user.adjust_fire_stacks(1)
code/modules/paperwork/pen.dm
+1 -1
View File
@@ -25,7 +25,7 @@
pressure_resistance = 2
/obj/item/pen/suicide_act(mob/user)
to_chat(viewers(user), "<span class='suicide'>[user] starts scribbling numbers over [user.p_them()]self with [src]! It looks like [user.p_theyre()] trying to commit sudoku.</span>")
to_chat(viewers(user), "<span class='suicide'>[user] starts scribbling numbers over [user.p_themselves()] with [src]! It looks like [user.p_theyre()] trying to commit sudoku.</span>")
return BRUTELOSS
/obj/item/pen/blue
code/modules/paperwork/ticketmachine.dm
+1 -1
View File
@@ -216,7 +216,7 @@
..()
if(is_hot(P))
if(HAS_TRAIT(user, TRAIT_CLUMSY) && prob(10))
user.visible_message("<span class='warning'>[user] accidentally ignites [user.p_them()]self!</span>", \
user.visible_message("<span class='warning'>[user] accidentally ignites [user.p_themselves()]!</span>", \
"<span class='userdanger'>You miss the paper and accidentally light yourself on fire!</span>")
user.drop_item()
user.adjust_fire_stacks(1)
code/modules/power/cable.dm
+1 -1
View File
@@ -510,7 +510,7 @@ GLOBAL_LIST_INIT(cable_coil_recipes, list (new/datum/stack_recipe/cable_restrain
if(locate(/obj/structure/chair/stool) in user.loc)
user.visible_message("<span class='suicide'>[user] is making a noose with [src]! It looks like [user.p_theyre()] trying to commit suicide.</span>")
else
user.visible_message("<span class='suicide'>[user] is strangling [user.p_them()]self with [src]! It looks like [user.p_theyre()] trying to commit suicide.</span>")
user.visible_message("<span class='suicide'>[user] is strangling [user.p_themselves()] with [src]! It looks like [user.p_theyre()] trying to commit suicide.</span>")
return OXYLOSS
/obj/item/stack/cable_coil/New(loc, length = MAXCOIL, paramcolor = null)
code/modules/projectiles/guns/magic/wand.dm
+3 -3
View File
@@ -49,10 +49,10 @@
update_icon()
/obj/item/gun/magic/wand/proc/zap_self(mob/living/user)
user.visible_message("<span class='danger'>[user] zaps [user.p_them()]self with [src].</span>")
user.visible_message("<span class='danger'>[user] zaps [user.p_themselves()] with [src].</span>")
playsound(user, fire_sound, 50, 1)
user.create_attack_log("<b>[key_name(user)]</b> zapped [user.p_them()]self with a <b>[src]</b>")
add_attack_logs(user, user, "zapped [user.p_them()]self with a [src]", ATKLOG_ALL)
user.create_attack_log("<b>[key_name(user)]</b> zapped [user.p_themselves()] with a <b>[src]</b>")
add_attack_logs(user, user, "zapped [user.p_themselves()] with a [src]", ATKLOG_ALL)
/////////////////////////////////////
//WAND OF DEATH
code/modules/reagents/chemistry/reagents/toxins.dm
+1 -1
View File
@@ -717,7 +717,7 @@
update_flags |= M.adjustBruteLoss(5, FALSE)
M.Weaken(10 SECONDS)
M.AdjustJitter(12 SECONDS)
M.visible_message("<span class='danger'>[M] falls to the floor, scratching [M.p_them()]self violently!</span>")
M.visible_message("<span class='danger'>[M] falls to the floor, scratching [M.p_themselves()] violently!</span>")
M.emote("scream")
return ..() | update_flags
code/modules/reagents/reagent_containers/applicator.dm
+1 -1
View File
@@ -74,7 +74,7 @@
if(ignore_flags || M.can_inject(user, TRUE))
if(M == user)
M.visible_message("[user] begins mending [user.p_them()]self with [src].", "<span class='notice'>You begin mending yourself with [src].</span>")
M.visible_message("[user] begins mending [user.p_themselves()] with [src].", "<span class='notice'>You begin mending yourself with [src].</span>")
else
user.visible_message("<span class='warning'>[user] begins mending [M] with [src].</span>", "<span class='notice'>You begin mending [M] with [src].</span>")
if(M.reagents)