From f36d52043c2253b331b91be284ae797156b5a9fe Mon Sep 17 00:00:00 2001 From: Arokha Sieyes Date: Sat, 4 Mar 2017 21:18:54 -0500 Subject: [PATCH 1/3] Raise *flip trouble chances slightly Also make synth limbs fly off because they can't break. Wouldn't want them to be left out of the fun. --- .../mob/living/carbon/human/emote_vr.dm | 19 +++++++++++++------ 1 file changed, 13 insertions(+), 6 deletions(-) diff --git a/code/modules/mob/living/carbon/human/emote_vr.dm b/code/modules/mob/living/carbon/human/emote_vr.dm index f6f89d160f..52e3617ba9 100644 --- a/code/modules/mob/living/carbon/human/emote_vr.dm +++ b/code/modules/mob/living/carbon/human/emote_vr.dm @@ -8,17 +8,17 @@ message = "awoos loudly. AwoooOOOOoooo!" m_type = 2 if ("flip") - var/danger = 1 //Base 1% chance to break something. + var/danger = 2 //Base 1% chance to break something. var/list/involved_parts = list(BP_L_LEG, BP_R_LEG, BP_L_FOOT, BP_R_FOOT) for(var/organ_name in involved_parts) var/obj/item/organ/external/E = get_organ(organ_name) if(!E || E.is_stump() || E.splinted || (E.status & ORGAN_BROKEN)) involved_parts -= organ_name - danger += 2 + danger += 5 //Taurs are harder to flip if(istype(tail_style, /datum/sprite_accessory/tail/taur)) - danger += 1 + danger += 2 //Check if they are physically capable if(src.sleeping || src.resting || src.buckled || src.weakened || src.restrained() || involved_parts.len < 2) @@ -33,9 +33,16 @@ spawn(10) //Stick the landing. var/breaking = pick(involved_parts) var/obj/item/organ/external/E = get_organ(breaking) - src.Weaken(5) - E.fracture() - log_and_message_admins("broke their [breaking] with *flip, ahahah.", src) + if(isSynthetic()) + src.Weaken(5) + E.droplimb(1,DROPLIMB_EDGE) + visible_message("[src]'s [E.name] flies off!","Your flipping seems to have cost you, this time.") + log_and_message_admins("lost their [breaking] with *flip, ahahah.", src) + else + src.Weaken(5) + E.fracture() + visible_message("[src]'s [E.name] emits a sickening crunch as they land!","Your flipping seems to have cost you, this time.") + log_and_message_admins("broke their [breaking] with *flip, ahahah.", src) if (message) log_emote("[name]/[key] : [message]") From 9f1db703d26ceec641937e1e6614bb6436b388a2 Mon Sep 17 00:00:00 2001 From: Arokha Sieyes Date: Sat, 4 Mar 2017 21:24:40 -0500 Subject: [PATCH 2/3] Message tweaks. --- code/modules/mob/living/carbon/human/emote_vr.dm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/code/modules/mob/living/carbon/human/emote_vr.dm b/code/modules/mob/living/carbon/human/emote_vr.dm index 52e3617ba9..4e9711b1ec 100644 --- a/code/modules/mob/living/carbon/human/emote_vr.dm +++ b/code/modules/mob/living/carbon/human/emote_vr.dm @@ -2,7 +2,7 @@ switch(act) if ("mlem") - message = "mlems their tongue up over their nose. Mlem." + message = "mlems [get_visible_gender() == MALE ? "his" : get_visible_gender() == FEMALE ? "her" : "their"] tongue up over [get_visible_gender() == MALE ? "his" : get_visible_gender() == FEMALE ? "her" : "their"] nose. Mlem." m_type = 1 if ("awoo") message = "awoos loudly. AwoooOOOOoooo!" @@ -36,12 +36,12 @@ if(isSynthetic()) src.Weaken(5) E.droplimb(1,DROPLIMB_EDGE) - visible_message("[src]'s [E.name] flies off!","Your flipping seems to have cost you, this time.") + message += " And loses a limb!" log_and_message_admins("lost their [breaking] with *flip, ahahah.", src) else src.Weaken(5) E.fracture() - visible_message("[src]'s [E.name] emits a sickening crunch as they land!","Your flipping seems to have cost you, this time.") + message += " And breaks something!" log_and_message_admins("broke their [breaking] with *flip, ahahah.", src) if (message) From 0937ee103d4150f7153083ff18ec15008ef6650a Mon Sep 17 00:00:00 2001 From: Arokha Sieyes Date: Sat, 4 Mar 2017 22:10:30 -0500 Subject: [PATCH 3/3] Further tweaks flip chances Eh 2% may have been a bit overboard. --- code/modules/mob/living/carbon/human/emote_vr.dm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/code/modules/mob/living/carbon/human/emote_vr.dm b/code/modules/mob/living/carbon/human/emote_vr.dm index 4e9711b1ec..95a0c3eb9c 100644 --- a/code/modules/mob/living/carbon/human/emote_vr.dm +++ b/code/modules/mob/living/carbon/human/emote_vr.dm @@ -8,17 +8,17 @@ message = "awoos loudly. AwoooOOOOoooo!" m_type = 2 if ("flip") - var/danger = 2 //Base 1% chance to break something. + var/danger = 1 //Base 1% chance to break something. var/list/involved_parts = list(BP_L_LEG, BP_R_LEG, BP_L_FOOT, BP_R_FOOT) for(var/organ_name in involved_parts) var/obj/item/organ/external/E = get_organ(organ_name) if(!E || E.is_stump() || E.splinted || (E.status & ORGAN_BROKEN)) involved_parts -= organ_name - danger += 5 + danger += 5 //Add 5% to the chance for each problem limb //Taurs are harder to flip if(istype(tail_style, /datum/sprite_accessory/tail/taur)) - danger += 2 + danger += 1 //Check if they are physically capable if(src.sleeping || src.resting || src.buckled || src.weakened || src.restrained() || involved_parts.len < 2)