From f36d52043c2253b331b91be284ae797156b5a9fe Mon Sep 17 00:00:00 2001 From: Arokha Sieyes Date: Sat, 4 Mar 2017 21:18:54 -0500 Subject: [PATCH 1/6] 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 f6f89d160ff..52e3617ba97 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/6] 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 52e3617ba97..4e9711b1ec3 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 3a5c1337d1c4b185538a8c097f02dae294c0297a Mon Sep 17 00:00:00 2001 From: Arokha Sieyes Date: Sat, 4 Mar 2017 22:08:43 -0500 Subject: [PATCH 3/6] KIN -> KHI Renames They don't have a Navy, I dunno why I put that. Also checks the file that SOMEONE keeps forgetting to check. --- .../loadout/loadout_uniform_vr.dm | 10 ++++---- .../vore/fluffstuff/custom_clothes_vr.dm | 24 +++++++++---------- 2 files changed, 17 insertions(+), 17 deletions(-) diff --git a/code/modules/client/preference_setup/loadout/loadout_uniform_vr.dm b/code/modules/client/preference_setup/loadout/loadout_uniform_vr.dm index 86ca4b5619c..b5671449220 100644 --- a/code/modules/client/preference_setup/loadout/loadout_uniform_vr.dm +++ b/code/modules/client/preference_setup/loadout/loadout_uniform_vr.dm @@ -4,27 +4,27 @@ //KHI Uniforms /datum/gear/uniform/job_khi/cmd - display_name = "kin uniform, cmd" + display_name = "khi uniform, cmd" path = /obj/item/clothing/under/rank/khi/cmd allowed_roles = list("Colony Director","Head of Personnel") /datum/gear/uniform/job_khi/sec - display_name = "kin uniform, sec" + display_name = "khi uniform, sec" path = /obj/item/clothing/under/rank/khi/sec allowed_roles = list("Head of Security", "Warden", "Detective", "Security Officer") /datum/gear/uniform/job_khi/med - display_name = "kin uniform, med" + display_name = "khi uniform, med" path = /obj/item/clothing/under/rank/khi/med allowed_roles = list("Chief Medical Officer","Medical Doctor","Chemist","Paramedic","Geneticist") /datum/gear/uniform/job_khi/eng - display_name = "kin uniform, eng" + display_name = "khi uniform, eng" path = /obj/item/clothing/under/rank/khi/eng allowed_roles = list("Chief Engineer","Atmospheric Technician","Station Engineer") /datum/gear/uniform/job_khi/sci - display_name = "kin uniform, sci" + display_name = "khi uniform, sci" path = /obj/item/clothing/under/rank/khi/sci allowed_roles = list("Research Director","Scientist", "Roboticist", "Xenobiologist") diff --git a/code/modules/vore/fluffstuff/custom_clothes_vr.dm b/code/modules/vore/fluffstuff/custom_clothes_vr.dm index cc895eb859b..7b52461329d 100644 --- a/code/modules/vore/fluffstuff/custom_clothes_vr.dm +++ b/code/modules/vore/fluffstuff/custom_clothes_vr.dm @@ -803,48 +803,48 @@ item_state = "" cmd //Command version - name = "KIN command suit" - desc = "Kitsuhana Industrial Navy uniform. An extra-comfortable command one, at that. I guess if you DON'T want anarchy for some reason." + name = "KHI command suit" + desc = "Kitsuhana Heavy Industries uniform. An extra-comfortable command one, at that. I guess if you DON'T want anarchy for some reason." icon_state = "khi_uniform_cmd_i" item_state = "khi_uniform_cmd" worn_state = "khi_uniform_cmd" armor = list(melee = 5, bullet = 10, laser = 10, energy = 0, bomb = 0, bio = 0, rad = 0) sec //Security version - name = "KIN security suit" - desc = "Kitsuhana Industrial Navy uniform. This one has angry red security stripes. Keepin' the peace in style." + name = "KHI security suit" + desc = "Kitsuhana Heavy Industries uniform. This one has angry red security stripes. Keepin' the peace in style." icon_state = "khi_uniform_sec_i" item_state = "khi_uniform_sec" worn_state = "khi_uniform_sec" armor = list(melee = 10, bullet = 0, laser = 0, energy = 0, bomb = 0, bio = 0, rad = 0) med //Medical version - name = "KIN medical suit" - desc = "Kitsuhana Industrial Navy uniform. The medical version. Why not just get a new body, anyway?" + name = "KHI medical suit" + desc = "Kitsuhana Heavy Industries uniform. The medical version. Why not just get a new body, anyway?" icon_state = "khi_uniform_med_i" item_state = "khi_uniform_med" worn_state = "khi_uniform_med" armor = list(melee = 0, bullet = 0, laser = 0, energy = 0, bomb = 0, bio = 50, rad = 5) eng //Engineering version - name = "KIN engineering suit" - desc = "Kitsuhana Industrial Navy uniform. One fit for an engineer, by the looks of it. Building the future, one disaster at a time." + name = "KHI engineering suit" + desc = "Kitsuhana Heavy Industries uniform. One fit for an engineer, by the looks of it. Building the future, one disaster at a time." icon_state = "khi_uniform_eng_i" item_state = "khi_uniform_eng" worn_state = "khi_uniform_eng" armor = list(melee = 0, bullet = 0, laser = 0, energy = 0, bomb = 0, bio = 0, rad = 10) sci //Science version - name = "KIN science suit" - desc = "Kitsuhana Industrial Navy uniform. For performing science in, based on the color! Only SCIENCE can save us now." + name = "KHI science suit" + desc = "Kitsuhana Heavy Industries uniform. For performing science in, based on the color! Only SCIENCE can save us now." icon_state = "khi_uniform_sci_i" item_state = "khi_uniform_sci" worn_state = "khi_uniform_sci" armor = list(melee = 0, bullet = 0, laser = 0, energy = 0, bomb = 5, bio = 0, rad = 5) fluff/aronai //Aro fluff version - name = "KIN meditech suit" - desc = "Kitsuhana Industrial Navy uniform. This one has the colors of a resleeving or mnemonics engineer. It has 'Aronai' written inside the top." + name = "KHI meditech suit" + desc = "Kitsuhana Heavy Industries uniform. This one has the colors of a resleeving or mnemonics engineer. It has 'Aronai' written inside the top." icon_state = "khi_uniform_aro_i" item_state = "khi_uniform_aro" worn_state = "khi_uniform_aro" From 0937ee103d4150f7153083ff18ec15008ef6650a Mon Sep 17 00:00:00 2001 From: Arokha Sieyes Date: Sat, 4 Mar 2017 22:10:30 -0500 Subject: [PATCH 4/6] 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 4e9711b1ec3..95a0c3eb9cb 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) From ffac4f72bac4588aab2589d3b9c45aac817f1bf3 Mon Sep 17 00:00:00 2001 From: Arokha Sieyes Date: Sat, 4 Mar 2017 22:08:43 -0500 Subject: [PATCH 5/6] KIN -> KHI Renames They don't have a Navy, I dunno why I put that. Also checks the file that SOMEONE keeps forgetting to check. --- .../loadout/loadout_uniform_vr.dm | 10 ++++---- .../vore/fluffstuff/custom_clothes_vr.dm | 24 +++++++++---------- 2 files changed, 17 insertions(+), 17 deletions(-) diff --git a/code/modules/client/preference_setup/loadout/loadout_uniform_vr.dm b/code/modules/client/preference_setup/loadout/loadout_uniform_vr.dm index 86ca4b5619c..b5671449220 100644 --- a/code/modules/client/preference_setup/loadout/loadout_uniform_vr.dm +++ b/code/modules/client/preference_setup/loadout/loadout_uniform_vr.dm @@ -4,27 +4,27 @@ //KHI Uniforms /datum/gear/uniform/job_khi/cmd - display_name = "kin uniform, cmd" + display_name = "khi uniform, cmd" path = /obj/item/clothing/under/rank/khi/cmd allowed_roles = list("Colony Director","Head of Personnel") /datum/gear/uniform/job_khi/sec - display_name = "kin uniform, sec" + display_name = "khi uniform, sec" path = /obj/item/clothing/under/rank/khi/sec allowed_roles = list("Head of Security", "Warden", "Detective", "Security Officer") /datum/gear/uniform/job_khi/med - display_name = "kin uniform, med" + display_name = "khi uniform, med" path = /obj/item/clothing/under/rank/khi/med allowed_roles = list("Chief Medical Officer","Medical Doctor","Chemist","Paramedic","Geneticist") /datum/gear/uniform/job_khi/eng - display_name = "kin uniform, eng" + display_name = "khi uniform, eng" path = /obj/item/clothing/under/rank/khi/eng allowed_roles = list("Chief Engineer","Atmospheric Technician","Station Engineer") /datum/gear/uniform/job_khi/sci - display_name = "kin uniform, sci" + display_name = "khi uniform, sci" path = /obj/item/clothing/under/rank/khi/sci allowed_roles = list("Research Director","Scientist", "Roboticist", "Xenobiologist") diff --git a/code/modules/vore/fluffstuff/custom_clothes_vr.dm b/code/modules/vore/fluffstuff/custom_clothes_vr.dm index 477e833f69d..22478a94ff2 100644 --- a/code/modules/vore/fluffstuff/custom_clothes_vr.dm +++ b/code/modules/vore/fluffstuff/custom_clothes_vr.dm @@ -803,48 +803,48 @@ item_state = "" cmd //Command version - name = "KIN command suit" - desc = "Kitsuhana Industrial Navy uniform. An extra-comfortable command one, at that. I guess if you DON'T want anarchy for some reason." + name = "KHI command suit" + desc = "Kitsuhana Heavy Industries uniform. An extra-comfortable command one, at that. I guess if you DON'T want anarchy for some reason." icon_state = "khi_uniform_cmd_i" item_state = "khi_uniform_cmd" worn_state = "khi_uniform_cmd" armor = list(melee = 5, bullet = 10, laser = 10, energy = 0, bomb = 0, bio = 0, rad = 0) sec //Security version - name = "KIN security suit" - desc = "Kitsuhana Industrial Navy uniform. This one has angry red security stripes. Keepin' the peace in style." + name = "KHI security suit" + desc = "Kitsuhana Heavy Industries uniform. This one has angry red security stripes. Keepin' the peace in style." icon_state = "khi_uniform_sec_i" item_state = "khi_uniform_sec" worn_state = "khi_uniform_sec" armor = list(melee = 10, bullet = 0, laser = 0, energy = 0, bomb = 0, bio = 0, rad = 0) med //Medical version - name = "KIN medical suit" - desc = "Kitsuhana Industrial Navy uniform. The medical version. Why not just get a new body, anyway?" + name = "KHI medical suit" + desc = "Kitsuhana Heavy Industries uniform. The medical version. Why not just get a new body, anyway?" icon_state = "khi_uniform_med_i" item_state = "khi_uniform_med" worn_state = "khi_uniform_med" armor = list(melee = 0, bullet = 0, laser = 0, energy = 0, bomb = 0, bio = 50, rad = 5) eng //Engineering version - name = "KIN engineering suit" - desc = "Kitsuhana Industrial Navy uniform. One fit for an engineer, by the looks of it. Building the future, one disaster at a time." + name = "KHI engineering suit" + desc = "Kitsuhana Heavy Industries uniform. One fit for an engineer, by the looks of it. Building the future, one disaster at a time." icon_state = "khi_uniform_eng_i" item_state = "khi_uniform_eng" worn_state = "khi_uniform_eng" armor = list(melee = 0, bullet = 0, laser = 0, energy = 0, bomb = 0, bio = 0, rad = 10) sci //Science version - name = "KIN science suit" - desc = "Kitsuhana Industrial Navy uniform. For performing science in, based on the color! Only SCIENCE can save us now." + name = "KHI science suit" + desc = "Kitsuhana Heavy Industries uniform. For performing science in, based on the color! Only SCIENCE can save us now." icon_state = "khi_uniform_sci_i" item_state = "khi_uniform_sci" worn_state = "khi_uniform_sci" armor = list(melee = 0, bullet = 0, laser = 0, energy = 0, bomb = 5, bio = 0, rad = 5) fluff/aronai //Aro fluff version - name = "KIN meditech suit" - desc = "Kitsuhana Industrial Navy uniform. This one has the colors of a resleeving or mnemonics engineer. It has 'Aronai' written inside the top." + name = "KHI meditech suit" + desc = "Kitsuhana Heavy Industries uniform. This one has the colors of a resleeving or mnemonics engineer. It has 'Aronai' written inside the top." icon_state = "khi_uniform_aro_i" item_state = "khi_uniform_aro" worn_state = "khi_uniform_aro" From 7b026c703279de952f608c41db4e294f4bc7c38e Mon Sep 17 00:00:00 2001 From: Arokha Sieyes Date: Sat, 4 Mar 2017 22:15:38 -0500 Subject: [PATCH 6/6] Checks those files. --- vorestation.dme | 2 ++ 1 file changed, 2 insertions(+) diff --git a/vorestation.dme b/vorestation.dme index eafce1bda3c..df67e42a8bc 100644 --- a/vorestation.dme +++ b/vorestation.dme @@ -1253,6 +1253,7 @@ #include "code\modules\client\preference_setup\loadout\loadout_shoes.dm" #include "code\modules\client\preference_setup\loadout\loadout_smoking.dm" #include "code\modules\client\preference_setup\loadout\loadout_suit.dm" +#include "code\modules\client\preference_setup\loadout\loadout_suit_vr.dm" #include "code\modules\client\preference_setup\loadout\loadout_uniform.dm" #include "code\modules\client\preference_setup\loadout\loadout_uniform_vr.dm" #include "code\modules\client\preference_setup\loadout\loadout_utility.dm" @@ -2055,6 +2056,7 @@ #include "code\modules\reagents\Chemistry-Reagents\Chemistry-Reagents-Core.dm" #include "code\modules\reagents\Chemistry-Reagents\Chemistry-Reagents-Dispenser.dm" #include "code\modules\reagents\Chemistry-Reagents\Chemistry-Reagents-Food-Drinks.dm" +#include "code\modules\reagents\Chemistry-Reagents\Chemistry-Reagents-Food-Drinks_vr.dm" #include "code\modules\reagents\Chemistry-Reagents\Chemistry-Reagents-Medicine.dm" #include "code\modules\reagents\Chemistry-Reagents\Chemistry-Reagents-Other.dm" #include "code\modules\reagents\Chemistry-Reagents\Chemistry-Reagents-Toxins.dm"