shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #6636 from Citadel-Station-13/upstream-merge-37582

Browse Source 
[MIRROR] Makes more messages pronoun sensitive
This commit is contained in:
LetterJay
2018-05-23 07:46:26 -05:00
committed by GitHub
parent 469b7772da e7a3f6e128
commit e4eb4939b4
116 changed files with 224 additions and 202 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/research/xenobiology/crossbreeding/_corecross.dm
+1 -1
View File
@@ -147,7 +147,7 @@ To add a crossbreed:
reagents.trans_to(M, reagents.total_volume)
if(user != M)
to_chat(M, "<span class='warning'>[user] presses [src] against you!</span>")
to_chat(user, "<span class='notice'>You press [src] against [M], injecting them.</span>")
to_chat(user, "<span class='notice'>You press [src] against [M], injecting [M.p_them()].</span>")
else
to_chat(user, "<span class='notice'>You press [src] against yourself, and it flattens against you!</span>")
else
code/modules/research/xenobiology/crossbreeding/_status_effects.dm
+2 -2
View File
@@ -709,7 +709,7 @@ datum/status_effect/stabilized/blue/on_remove()
if(M.stat == DEAD)
return
if(!messagedelivered)
to_chat(owner,"<span class='notice'>You feel your hands melt around [M]'s neck and start to drain them of life.</span>")
to_chat(owner,"<span class='notice'>You feel your hands melt around [M]'s neck and start to drain [M.p_them()] of life.</span>")
to_chat(owner.pulling, "<span class='userdanger'>[owner]'s hands melt around your neck, and you can feel your life starting to drain away!</span>")
messagedelivered = TRUE
examine_text = "<span class='warning'>SUBJECTPRONOUN is draining health from [owner.pulling]!</span>"
@@ -742,7 +742,7 @@ datum/status_effect/stabilized/blue/on_remove()
/datum/status_effect/stabilized/lightpink/tick()
for(var/mob/living/carbon/human/H in range(1, get_turf(owner)))
if(H != owner && H.stat != DEAD && H.health <= 0 && !H.reagents.has_reagent("epinephrine"))
to_chat(owner, "[linked_extract] pulses in sync with [H]'s heartbeat, trying to keep them alive.")
to_chat(owner, "[linked_extract] pulses in sync with [H]'s heartbeat, trying to keep [H.p_them()] alive.")
H.reagents.add_reagent("epinephrine",5)
return ..()
code/modules/research/xenobiology/crossbreeding/burning.dm
+1 -1
View File
@@ -256,7 +256,7 @@ Burning extracts:
var/mob/living/L = user
if(!istype(L))
return
user.visible_message("<span class='danger'>[src] absorbs [user], transforming them into a slime!</span>")
user.visible_message("<span class='danger'>[src] absorbs [user], transforming [user.p_them()] into a slime!</span>")
var/obj/effect/proc_holder/spell/targeted/shapeshift/slimeform/S = new()
S.remove_on_restore = TRUE
user.mind.AddSpell(S)
code/modules/research/xenobiology/xenobio_camera.dm
+1 -1
View File
@@ -220,7 +220,7 @@
if(GLOB.cameranet.checkTurfVis(remote_eye.loc))
for(var/mob/living/carbon/monkey/M in remote_eye.loc)
if(M.stat)
M.visible_message("[M] vanishes as they are reclaimed for recycling!")
M.visible_message("[M] vanishes as [M.p_theyre()] reclaimed for recycling!")
X.monkeys = round(X.monkeys + 0.2,0.1)
qdel(M)
else