cyberpresidentvanellope/Polaris
1
0
Fork 0
mirror of https://github.com/PolarisSS13/Polaris.git synced 2026-08-21 20:26:48 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #8058 from MistakeNot4892/emotes

Browse Source 
Swaps emote(me) out for custom_emote().
This commit is contained in:
Atermonera
2021-05-02 20:58:58 -07:00
committed by GitHub
parent 4b4e9768b3 b4632da349
commit 0e55e04de8
9 changed files with 21 additions and 21 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.custom_emote(VISIBLE_MESSAGE, "flinches as all the muscles in their body cramp up.")
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.custom_emote(VISIBLE_MESSAGE, "shivers slightly.")
H.custom_pain("This itch makes it really hard to concentrate.",1)
code/modules/mob/living/carbon/human/chem_side_effects.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.custom_emote(VISIBLE_MESSAGE, "flinches as all the muscles in their body cramp up.")
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.custom_emote(VISIBLE_MESSAGE, "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
@@ -69,10 +69,10 @@ emp_act
drop_from_inventory(c_hand)
if (affected.robotic >= ORGAN_ROBOT)
emote("me", 1, "drops what they were holding, their [affected.name] malfunctioning!")
custom_emote(VISIBLE_MESSAGE, "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, "[affected.organ_can_feel_pain() ? "" : emote_scream] drops what they were holding in their [affected.name]!")
custom_emote(VISIBLE_MESSAGE, "[affected.organ_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
+2 -2
View File
@@ -162,7 +162,7 @@
drop_from_inventory(r_hand)
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 [E.name]!")
custom_emote(VISIBLE_MESSAGE, "[(can_feel_pain()) ? "" : emote_scream ]drops what they were holding in their [E.name]!")
else if(E.is_malfunctioning())
switch(E.body_part)
@@ -175,7 +175,7 @@
continue
drop_from_inventory(r_hand)
emote("me", 1, "drops what they were holding, their [E.name] malfunctioning!")
custom_emote(VISIBLE_MESSAGE, "drops what they were holding, their [E.name] malfunctioning!")
var/datum/effect/effect/system/spark_spread/spark_system = new /datum/effect/effect/system/spark_spread()
spark_system.set_up(5, 0, src)
code/modules/mob/living/carbon/human/life.dm
+3 -3
View File
@@ -1529,7 +1529,7 @@
custom_pain("[pick("It hurts so much", "You really need some painkillers", "Dear god, the pain")]!", 40)
if(shock_stage >= 30)
if(shock_stage == 30) emote("me",1,"is having trouble keeping their eyes open.")
if(shock_stage == 30) custom_emote(VISIBLE_MESSAGE, "is having trouble keeping their eyes open.")
eye_blurry = max(2, eye_blurry)
stuttering = max(stuttering, 5)
@@ -1537,7 +1537,7 @@
to_chat(src, "<span class='danger'>[pick("The pain is excruciating", "Please&#44; just end the pain", "Your whole body is going numb")]!</span>")
if (shock_stage >= 60)
if(shock_stage == 60) emote("me",1,"'s body becomes limp.")
if(shock_stage == 60) custom_emote(VISIBLE_MESSAGE, "'s body becomes limp.")
if (prob(2))
to_chat(src, "<span class='danger'>[pick("The pain is excruciating", "Please&#44; just end the pain", "Your whole body is going numb")]!</span>")
Weaken(20)
@@ -1553,7 +1553,7 @@
Paralyse(5)
if(shock_stage == 150)
emote("me",1,"can no longer stand, collapsing!")
custom_emote(VISIBLE_MESSAGE, "can no longer stand, collapsing!")
Weaken(20)
if(shock_stage >= 150)