From bc977804decb21b52b26bdef7f4da4e30ff02e5c Mon Sep 17 00:00:00 2001 From: Tayyyyyyy Date: Wed, 2 May 2018 21:59:45 -0500 Subject: [PATCH] Small fixes --- code/game/objects/items/weapons/cosmetics.dm | 8 ++++---- code/game/objects/items/weapons/lighters.dm | 2 +- code/game/objects/items/weapons/tape.dm | 2 +- code/modules/mining/lavaland/loot/bubblegum_loot.dm | 2 +- code/modules/mob/living/carbon/human/human.dm | 2 +- code/modules/power/supermatter/supermatter.dm | 4 ++-- 6 files changed, 10 insertions(+), 10 deletions(-) diff --git a/code/game/objects/items/weapons/cosmetics.dm b/code/game/objects/items/weapons/cosmetics.dm index d83bf7ebaca..ec8a2a5e325 100644 --- a/code/game/objects/items/weapons/cosmetics.dm +++ b/code/game/objects/items/weapons/cosmetics.dm @@ -63,8 +63,8 @@ to_chat(user, "You need to wipe off the old lipstick first!") return if(H == user) - user.visible_message("[user] does [user.p_their()] lips with \the [src].", \ - "You take a moment to apply \the [src]. Perfect!") + user.visible_message("[user] does [user.p_their()] lips with [src].", \ + "You take a moment to apply [src]. Perfect!") H.lip_style = "lipstick" H.lip_color = colour H.update_body() @@ -109,8 +109,8 @@ user.visible_message("[user] starts to shave [user.p_their()] facial hair with [src].", \ "You take a moment shave your facial hair with \the [src].") if(do_after(user, 50 * toolspeed, target = H)) - user.visible_message("[user] shaves [user.p_their()] facial hair clean with the [src].", \ - "You finish shaving with the [src]. Fast and clean!") + user.visible_message("[user] shaves [user.p_their()] facial hair clean with [src].", \ + "You finish shaving with [src]. Fast and clean!") C.f_style = "Shaved" H.update_fhair() playsound(src.loc, usesound, 20, 1) diff --git a/code/game/objects/items/weapons/lighters.dm b/code/game/objects/items/weapons/lighters.dm index 50cb9226dcf..94e97ea7c20 100644 --- a/code/game/objects/items/weapons/lighters.dm +++ b/code/game/objects/items/weapons/lighters.dm @@ -95,7 +95,7 @@ cig.attackby(src, user) else if(istype(src, /obj/item/lighter/zippo)) - cig.light("[user] whips the [name] out and holds it for [M]. [user.p_their()] arm is as steady as the unflickering flame [user.p_they()] light[user.p_s()] \the [cig] with.") + cig.light("[user] whips the [name] out and holds it for [M]. [user.p_their(TRUE)] arm is as steady as the unflickering flame [user.p_they()] light[user.p_s()] \the [cig] with.") else cig.light("[user] holds the [name] out for [M], and lights the [cig.name].") M.update_inv_wear_mask() diff --git a/code/game/objects/items/weapons/tape.dm b/code/game/objects/items/weapons/tape.dm index d26236dd4fa..57e0290346e 100644 --- a/code/game/objects/items/weapons/tape.dm +++ b/code/game/objects/items/weapons/tape.dm @@ -18,7 +18,7 @@ else if(amount < 2) to_chat(user, "You'll need more tape for this!") else if(!M.check_has_mouth()) - to_chat(user, "[M.p_they()] [M.p_have()] no mouth to tape over!") + to_chat(user, "[M.p_they(TRUE)] [M.p_have()] no mouth to tape over!") else if(M == user) to_chat(user, "You try to tape your own mouth shut.") diff --git a/code/modules/mining/lavaland/loot/bubblegum_loot.dm b/code/modules/mining/lavaland/loot/bubblegum_loot.dm index 7f107847f11..613239b58a9 100644 --- a/code/modules/mining/lavaland/loot/bubblegum_loot.dm +++ b/code/modules/mining/lavaland/loot/bubblegum_loot.dm @@ -75,7 +75,7 @@ for(var/mob/living/carbon/human/H in player_list) if(H == L) continue - to_chat(H, "You have an overwhelming desire to kill [L]. [L.p_they()] [L.p_have()] been marked red! Go kill [L.p_them()]!") + to_chat(H, "You have an overwhelming desire to kill [L]. [L.p_they(TRUE)] [L.p_have()] been marked red! Go kill [L.p_them()]!") H.put_in_hands(new /obj/item/kitchen/knife/butcher(H)) qdel(src) \ No newline at end of file diff --git a/code/modules/mob/living/carbon/human/human.dm b/code/modules/mob/living/carbon/human/human.dm index 28dca1afe99..fcb0e3d8b25 100644 --- a/code/modules/mob/living/carbon/human/human.dm +++ b/code/modules/mob/living/carbon/human/human.dm @@ -1064,7 +1064,7 @@ var/fail_msg if(!affecting) . = 0 - fail_msg = "[p_they()] [p_are()] missing that limb." + fail_msg = "[p_they(TRUE)] [p_are()] missing that limb." else if(affecting.status & ORGAN_ROBOT) . = 0 fail_msg = "That limb is robotic." diff --git a/code/modules/power/supermatter/supermatter.dm b/code/modules/power/supermatter/supermatter.dm index ad51ff0c656..43d418aadf7 100644 --- a/code/modules/power/supermatter/supermatter.dm +++ b/code/modules/power/supermatter/supermatter.dm @@ -244,7 +244,7 @@ ui_interact(user) /obj/machinery/power/supermatter_shard/attack_hand(mob/user as mob) - user.visible_message("\The [user] reaches out and touches \the [src], inducing a resonance... [user.p_their()] body starts to glow and bursts into flames before flashing into ash.",\ + user.visible_message("\The [user] reaches out and touches \the [src], inducing a resonance... [user.p_their(TRUE)] body starts to glow and bursts into flames before flashing into ash.",\ "You reach out and touch \the [src]. Everything starts burning and all you can hear is ringing. Your last thought is \"That was not a wise decision.\"",\ "You hear an uneartly ringing, then what sounds like a shrilling kettle as you are washed with a wave of heat.") @@ -309,7 +309,7 @@ /obj/machinery/power/supermatter_shard/Bumped(atom/AM as mob|obj) if(istype(AM, /mob/living)) - AM.visible_message("\The [AM] slams into \the [src] inducing a resonance... [AM.p_their()] body starts to glow and catch flame before flashing into ash.",\ + AM.visible_message("\The [AM] slams into \the [src] inducing a resonance... [AM.p_their(TRUE)] body starts to glow and catch flame before flashing into ash.",\ "You slam into \the [src] as your ears are filled with unearthly ringing. Your last thought is \"Oh, fuck.\"",\ "You hear an unearthly noise as a wave of heat washes over you.") else if(isobj(AM) && !istype(AM, /obj/effect))