cyberpresidentvanellope/VOREStation
1
0
Fork 0
mirror of https://github.com/VOREStation/VOREStation.git synced 2026-07-20 11:35:19 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fix a couple places that might cause belly emotes

Browse Source
This commit is contained in:
Aronai Sieyes
2021-05-15 10:58:26 -04:00
parent 3b8018b4be
commit a29a081d3e
4 changed files with 19 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/mob/living/carbon/breathe.dm
+1 -1
View File
@@ -17,7 +17,7 @@
if(losebreath>0) //Suffocating so do not take a breath
AdjustLosebreath(-1)
if (prob(10)) //Gasp per 10 ticks? Sounds about right.
if (prob(10) && !isbelly(loc)) //Gasp per 10 ticks? Sounds about right. //VOREStation Add
spawn emote("gasp")
else
//Okay, we can breathe, now check if we can get air
code/modules/mob/living/carbon/human/human_defense.dm
+6 -5
View File
@@ -68,11 +68,12 @@ emp_act
msg_admin_attack("[key_name(src)] was disarmed by a stun effect")
drop_from_inventory(c_hand)
if (affected.robotic >= ORGAN_ROBOT)
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 ")
custom_emote(VISIBLE_MESSAGE, "[affected.organ_can_feel_pain() ? "" : emote_scream] drops what they were holding in their [affected.name]!")
if(!isbelly(loc)) //VOREStation Add
if (affected.robotic >= ORGAN_ROBOT)
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 ")
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
+11 -9
View File
@@ -163,8 +163,9 @@
continue
drop_from_inventory(r_hand)
var/emote_scream = pick("screams in pain and ", "lets out a sharp cry and ", "cries out and ")
custom_emote(VISIBLE_MESSAGE, "[(can_feel_pain()) ? "" : emote_scream ]drops what they were holding in their [E.name]!")
if(!isbelly(loc)) //VOREStation Add
var/emote_scream = pick("screams in pain and ", "lets out a sharp cry and ", "cries out and ")
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)
@@ -177,14 +178,15 @@
continue
drop_from_inventory(r_hand)
custom_emote(VISIBLE_MESSAGE, "drops what they were holding, their [E.name] malfunctioning!")
if(!isbelly(loc)) //VOREStation Add
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)
spark_system.attach(src)
spark_system.start()
spawn(10)
qdel(spark_system)
var/datum/effect/effect/system/spark_spread/spark_system = new /datum/effect/effect/system/spark_spread()
spark_system.set_up(5, 0, src)
spark_system.attach(src)
spark_system.start()
spawn(10)
qdel(spark_system)
//Handles chem traces
/mob/living/carbon/human/proc/handle_trace_chems()
code/modules/reagents/reagents/dispenser.dm
+1 -1
View File
@@ -419,7 +419,7 @@
if(affecting.take_damage(0, removed * power * 0.1))
H.UpdateDamageIcon()
if(prob(100 * removed / meltdose)) // Applies disfigurement
if (affecting.organ_can_feel_pain())
if (affecting.organ_can_feel_pain() && !isbelly(loc)) //VOREStation Add
H.emote("scream")
H.status_flags |= DISFIGURED
else