cyberpresidentvanellope/Aurora.3
1
0
Fork 0
mirror of https://github.com/Aurorastation/Aurora.3.git synced 2026-08-28 23:51:17 +01:00
Code Issues Packages Projects Releases Wiki Activity

Converts emote("me", ...) to visible_message. (#10331)

Browse Source
This commit is contained in:
Matt Atlas
2020-10-26 08:29:18 +01:00
committed by GitHub
parent d52249e41f
commit 44a30fe363
15 changed files with 63 additions and 116 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/mob/living/carbon/human/MedicalSideEffects.dm
+2 -2
View File
@@ -127,7 +127,7 @@
if(11 to 30)
H.custom_pain("The muscles in your body cramp up painfully.",0)
if(31 to INFINITY)
H.emote("me",1,"flinches as all the muscles in their body cramp up.")
H.visible_message("<b>[H]</b> flinches!")
H.custom_pain("There's pain all over your body.",1)
// ITCH
@@ -145,5 +145,5 @@
if(11 to 30)
H.custom_pain("You want to scratch your itch badly.",0)
if(31 to INFINITY)
H.emote("me",1,"shivers slightly.")
H.visible_message("<b>[H]</b> shivers slightly.")
H.custom_pain("This itch makes it really hard to concentrate.",1)
code/modules/mob/living/carbon/human/chem_side_effects.dm
+3 -3
View File
@@ -127,8 +127,8 @@
if(11 to 30)
H.custom_pain("The muscles in your body cramp up painfully.",0)
if(31 to INFINITY)
H.emote("me",1,"flinches as all the muscles in their body cramp up.")
H.custom_pain("There's pain all over your body.",1)
H.visible_message("<b>[H]</b> flinches!")
H.custom_pain("There's pain all over your body!",1)
// ITCH
// ====
@@ -145,5 +145,5 @@
if(11 to 30)
H.custom_pain("You want to scratch your itch badly.",0)
if(31 to INFINITY)
H.emote("me",1,"shivers slightly.")
H.visible_message("<b>[H]</b> shivers slightly.")
H.custom_pain("This itch makes it really hard to concentrate.",1)
code/modules/mob/living/carbon/human/human_defense.dm
+2 -2
View File
@@ -72,10 +72,10 @@ emp_act
drop_from_inventory(c_hand)
if (affected.status & ORGAN_ROBOT)
emote("me", 1, "drops what they were holding, their [affected.name] malfunctioning!")
visible_message("<b>[src]</b> drops what they were holding, their [affected.name] malfunctioning!")
else
var/emote_scream = pick("screams in pain and ", "lets out a sharp cry and ", "cries out and ")
emote("me", 1, "[(!can_feel_pain()) ? "" : emote_scream ]drops what they were holding in their [affected.name]!")
visible_message("<b>[src]</b> [(!can_feel_pain()) ? "" : emote_scream ]drops what they were holding in their [affected.name]!")
..(stun_amount, agony_amount, def_zone)
code/modules/mob/living/carbon/human/human_organs.dm
+3 -3
View File
@@ -148,11 +148,11 @@
drop_from_inventory(r_hand)
var/emote_scream = pick(species.pain_item_drop_cry)
emote("me", 1, "[(species.flags & NO_PAIN) ? "" : emote_scream ]drops what they were holding in their [E.name]!")
visible_message("<b>[src]</b> [(species.flags & NO_PAIN) ? "" : emote_scream ]drops what they were holding in their [E.name]!")
else if(!(E.status & ORGAN_ROBOT) && (CE_DROPITEM in chem_effects) && prob(chem_effects[CE_DROPITEM]))
to_chat(src, SPAN_WARNING("Your [E.name] goes limp and unresponsive for a moment, dropping what it was holding!"))
emote("me", 1, "drops what they were holding in their [E.name]!")
visible_message("<b>[src]</b> drops what they were holding in their [E.name]!")
switch(E.body_part)
if(HAND_LEFT, ARM_LEFT)
if(!l_hand)
@@ -174,7 +174,7 @@
continue
drop_from_inventory(r_hand)
emote("me", 1, "drops what they were holding, their [E.name] malfunctioning!")
visible_message("<b>[src]</b> drops what they were holding, their [E.name] malfunctioning!")
spark(src, 5)