From 5df769f502ab1a03789c5d1a5b4ebd2d65800415 Mon Sep 17 00:00:00 2001 From: Aronai Sieyes Date: Sat, 15 May 2021 10:44:03 -0400 Subject: [PATCH 1/4] Restore old flip functionality --- code/modules/emotes/definitions/visible_animated.dm | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/code/modules/emotes/definitions/visible_animated.dm b/code/modules/emotes/definitions/visible_animated.dm index 2e035d289c7..c66fa789c17 100644 --- a/code/modules/emotes/definitions/visible_animated.dm +++ b/code/modules/emotes/definitions/visible_animated.dm @@ -27,7 +27,12 @@ /decl/emote/visible/flip/do_extra(mob/user) . = ..() - if(istype(user)) + // VOREStation Add - Fancy flips + if(ishuman(user)) + var/mob/living/carbon/human/H = user + H.handle_flip_vr() + // VOREStation Add End + else if(istype(user)) user.SpinAnimation(7,1) /decl/emote/visible/floorspin From 3b8018b4be0435bcc3b2f154413d5ad16bf6c4bf Mon Sep 17 00:00:00 2001 From: Aronai Sieyes Date: Sat, 15 May 2021 10:50:30 -0400 Subject: [PATCH 2/4] Readd emote cooldown --- code/modules/emotes/definitions/_mob.dm | 1 + code/modules/emotes/emote_mob.dm | 5 +++++ 2 files changed, 6 insertions(+) diff --git a/code/modules/emotes/definitions/_mob.dm b/code/modules/emotes/definitions/_mob.dm index 8c10b4cde2f..46a2bf94da3 100644 --- a/code/modules/emotes/definitions/_mob.dm +++ b/code/modules/emotes/definitions/_mob.dm @@ -27,6 +27,7 @@ var/list/_default_mob_emotes = list( /mob var/list/usable_emotes + var/nextemote = 1 //VOREStation Add /mob/proc/update_emotes(var/skip_sort) usable_emotes = list() diff --git a/code/modules/emotes/emote_mob.dm b/code/modules/emotes/emote_mob.dm index 3e45f05091e..546ee4c7aec 100644 --- a/code/modules/emotes/emote_mob.dm +++ b/code/modules/emotes/emote_mob.dm @@ -1,4 +1,9 @@ /mob/proc/can_emote(var/emote_type) + //VOREStation Add + if(src.nextemote >= world.time) + return FALSE + src.nextemote = world.time + 12 + //VOREStation Add End return (stat == CONSCIOUS) /mob/living/can_emote(var/emote_type) From a29a081d3e82d7fa085d9c8fa111e3f2f7fefdad Mon Sep 17 00:00:00 2001 From: Aronai Sieyes Date: Sat, 15 May 2021 10:58:26 -0400 Subject: [PATCH 3/4] Fix a couple places that might cause belly emotes --- code/modules/mob/living/carbon/breathe.dm | 2 +- .../mob/living/carbon/human/human_defense.dm | 11 +++++----- .../mob/living/carbon/human/human_organs.dm | 20 ++++++++++--------- code/modules/reagents/reagents/dispenser.dm | 2 +- 4 files changed, 19 insertions(+), 16 deletions(-) diff --git a/code/modules/mob/living/carbon/breathe.dm b/code/modules/mob/living/carbon/breathe.dm index 2b8ce410635..1945db3e90a 100644 --- a/code/modules/mob/living/carbon/breathe.dm +++ b/code/modules/mob/living/carbon/breathe.dm @@ -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 diff --git a/code/modules/mob/living/carbon/human/human_defense.dm b/code/modules/mob/living/carbon/human/human_defense.dm index cdfef35b596..3ceea87f7b4 100644 --- a/code/modules/mob/living/carbon/human/human_defense.dm +++ b/code/modules/mob/living/carbon/human/human_defense.dm @@ -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) diff --git a/code/modules/mob/living/carbon/human/human_organs.dm b/code/modules/mob/living/carbon/human/human_organs.dm index f9c9bc831d1..4b94ff930a4 100644 --- a/code/modules/mob/living/carbon/human/human_organs.dm +++ b/code/modules/mob/living/carbon/human/human_organs.dm @@ -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() diff --git a/code/modules/reagents/reagents/dispenser.dm b/code/modules/reagents/reagents/dispenser.dm index 8d825ef91c7..8a7777e9f4a 100644 --- a/code/modules/reagents/reagents/dispenser.dm +++ b/code/modules/reagents/reagents/dispenser.dm @@ -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 From dc043a8f5347b62d5e01a35a632527236d03247f Mon Sep 17 00:00:00 2001 From: Novacat <35587478+Novacat@users.noreply.github.com> Date: Sat, 15 May 2021 11:03:48 -0400 Subject: [PATCH 4/4] Update dispenser.dm --- code/modules/reagents/reagents/dispenser.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/modules/reagents/reagents/dispenser.dm b/code/modules/reagents/reagents/dispenser.dm index 8a7777e9f4a..6dd8a79285a 100644 --- a/code/modules/reagents/reagents/dispenser.dm +++ b/code/modules/reagents/reagents/dispenser.dm @@ -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() && !isbelly(loc)) //VOREStation Add + if (affecting.organ_can_feel_pain() && !isbelly(H.loc)) //VOREStation Add H.emote("scream") H.status_flags |= DISFIGURED else