Replaces \gender to fix metagaming issues. (#9745)

This commit is contained in:
MarinaGryphon
2020-08-25 11:46:34 +02:00
committed by GitHub
parent 9bebe3269c
commit 87e071fce5
63 changed files with 314 additions and 338 deletions
+1 -1
View File
@@ -1113,7 +1113,7 @@ var/global/list/obj/item/device/pda/PDAs = list()
/obj/item/device/pda/proc/create_message(var/mob/living/U = usr, var/obj/item/device/pda/P, var/tap = 1)
if(tap)
U.visible_message("<b>\The [U]</b> taps on \his PDA's screen.")
U.visible_message("<b>\The [U]</b> taps on [U.get_pronoun("his")] PDA's screen.")
var/t = input(U, "Please enter message", P.name, null) as text|null
t = sanitize(t)
//t = readd_quotes(t)
@@ -124,7 +124,7 @@
locked = !locked
playsound(src, 'sound/machines/ping.ogg', 30, 1)
var/msg = "[I] through \the [src] and it [locked ? "locks" : "unlocks"] with a beep."
var/pos_adj = "[user.name] swipes \his "
var/pos_adj = "[user.name] swipes [user.get_pronoun("his")] "
var/fp_adj = "You swipe your "
user.visible_message("<span class='warning'>[addtext(pos_adj, msg)]</span>", "<span class='notice'>[addtext(fp_adj, msg)]</span>")
update_icon()
+1 -1
View File
@@ -27,7 +27,7 @@
if(ishuman(user))
var/mob/living/carbon/human/H = user
if(isskrell(H))
H.visible_message("<span class='notice'>\The [H] holds the brassy instrument up to \his eye and peers at something unseen.</span>",
H.visible_message("<span class='notice'>\The [H] holds the brassy instrument up to [H.get_pronoun("his")] eye and peers at something unseen.</span>",
"<span class='notice'>You see the starry edge of srom floating on the void of space.</span>")
if(projection_ready)
new/obj/effect/temp_visual/constellation (get_turf(user))
+4 -4
View File
@@ -130,10 +130,10 @@
return FALSE
if(H == user) //shaving yourself
user.visible_message("\The [user] starts to shave \his head with \the [src].", \
user.visible_message("\The [user] starts to shave [user.get_pronoun("his")] head with \the [src].", \
"<span class='notice'>You start to shave your head with \the [src].</span>")
if(do_mob(user, user, 20))
user.visible_message("\The [user] shaves \his head with \the [src].", \
user.visible_message("\The [user] shaves [user.get_pronoun("his")] head with \the [src].", \
"<span class='notice'>You finish shaving with \the [src].</span>")
shave(H, target_zone)
@@ -164,10 +164,10 @@
return FALSE
if(H == user) //shaving yourself
user.visible_message("<span class='warning'>\The [user] starts to shave \his facial hair with \the [src].</span>", \
user.visible_message("<span class='warning'>\The [user] starts to shave [user.get_pronoun("his")] facial hair with \the [src].</span>", \
"<span class='notice'>You take a moment to shave your facial hair with \the [src].</span>")
if(do_mob(user, user, 20))
user.visible_message("<span class='warning'>\The [user] shaves \his facial hair clean with \the [src].</span>", \
user.visible_message("<span class='warning'>\The [user] shaves [user.get_pronoun("his")] facial hair clean with \the [src].</span>", \
"<span class='notice'>You finish shaving with \the [src].</span>")
shave(H, target_zone)
+2 -2
View File
@@ -106,9 +106,9 @@
var/obj/item/organ/external/O = H.organs_by_name[H.hand?BP_L_HAND:BP_R_HAND]
if (!O) return
var/s = SPAN_WARNING("[H.name] chews on \his [O.name]!")
var/s = SPAN_WARNING("[H] chews on [H.get_pronoun("his")] [O.name]!")
H.visible_message(s, SPAN_WARNING("You chew on your [O.name]!"))
message_admins("[key_name_admin(H)] is chewing on [H.get_pronoun(1)] restrained hand - (<A HREF='?_src_=holder;adminplayerobservecoodjump=1;X=[H.x];Y=[H.y];Z=[H.z]'>JMP</a>)")
message_admins("[key_name_admin(H)] is chewing on [H.get_pronoun("his")] restrained hand - (<A HREF='?_src_=holder;adminplayerobservecoodjump=1;X=[H.x];Y=[H.y];Z=[H.z]'>JMP</a>)")
H.attack_log += text("\[[time_stamp()]\] <font color='red'>[s] ([H.ckey])</font>")
log_attack("[s] ([H.ckey])",ckey=key_name(H))
@@ -47,7 +47,7 @@
/obj/item/melee/energy/attack_self(mob/living/user as mob)
if (active)
if ((user.is_clumsy()) && prob(50))
user.visible_message("<span class='danger'>\The [user] accidentally cuts \himself with \the [src].</span>",\
user.visible_message("<span class='danger'>\The [user] accidentally cuts [user.get_pronoun("himself")] with \the [src].</span>",\
"<span class='danger'>You accidentally cut yourself with \the [src].</span>")
user.take_organ_damage(5,5)
deactivate(user)
@@ -340,7 +340,7 @@
/obj/item/melee/energy/sword/powersword/attack_self(mob/living/user as mob)
..()
if(prob(30))
user.visible_message("<span class='danger'>\The [user] accidentally cuts \himself with \the [src].</span>",\
user.visible_message("<span class='danger'>\The [user] accidentally cuts [user.get_pronoun("himself")] with \the [src].</span>",\
"<span class='danger'>You accidentally cut yourself with \the [src].</span>")
user.take_organ_damage(5,5)
/*