From b88aaea33630d1a1d15e4bba69d841c1fcfd91fd Mon Sep 17 00:00:00 2001 From: Cael_Aislinn Date: Sun, 28 Oct 2012 10:30:06 +1000 Subject: [PATCH 1/2] halved species-unfitting damage, made cramp damage actually stick to max 10 + lowered accum rate Signed-off-by: Cael_Aislinn --- code/modules/clothing/suits/suit_cramp.dm | 6 ++--- .../mob/living/carbon/human/inventory.dm | 26 +++++++++---------- 2 files changed, 16 insertions(+), 16 deletions(-) diff --git a/code/modules/clothing/suits/suit_cramp.dm b/code/modules/clothing/suits/suit_cramp.dm index 5f42e46e287..27a732e8321 100644 --- a/code/modules/clothing/suits/suit_cramp.dm +++ b/code/modules/clothing/suits/suit_cramp.dm @@ -19,9 +19,9 @@ var/afforgan = pick("chest","l_foot","r_foot","l_arm","l_leg") var/datum/organ/external/affecting = H.get_organ(afforgan) if(affecting) - if(prob(25)) - affecting.take_damage(5, 0, 0) - cramp_damage_caused += 5 + if(prob(20) && cramp_damage_caused < CRAMP_DAMAGE_MAX) + affecting.take_damage(3, 0, 0) + cramp_damage_caused += 3 H << "\red [pick("Your [affecting.display_name] goes to sleep.","Your [affecting.display_name] begins to twitch.","Your [affecting.display_name] begins to seize up.","You can feel cramps in your [affecting.display_name].","Your [affecting.display_name] begins to ache.","You can feel pins and needles in your [affecting.display_name].")]" spawn(rand(MIN_CRAMP_TIME, MAX_CRAMP_TIME)) diff --git a/code/modules/mob/living/carbon/human/inventory.dm b/code/modules/mob/living/carbon/human/inventory.dm index 1c0c701553c..9feea5312e2 100644 --- a/code/modules/mob/living/carbon/human/inventory.dm +++ b/code/modules/mob/living/carbon/human/inventory.dm @@ -235,23 +235,23 @@ if(cur_species == "Tajaran") if(prob(5)) src.visible_message("\red Your claws burst out of the [W], ripping them to shreds!", "\red [src]'s claws burst out of the [W], ripping them to shreds!", "\red You hear a ripping, tearing sound!") - var/datum/organ/external/affecting = get_organ("l_foot") + var/datum/organ/external/affecting = get_organ("l_hand") if(affecting) - affecting.take_damage(5, 0, 0) + affecting.take_damage(2.5, 0, 0) affecting = get_organ("r_foot") if(affecting) - affecting.take_damage(5, 0, 0) + affecting.take_damage(2.5, 0, 0) broken = 1 spawn(0) del(W) else if(prob(50)) src << "\red You hurt your claws forcing them into the [W]!" - var/datum/organ/external/affecting = get_organ("l_foot") + var/datum/organ/external/affecting = get_organ("r_hand") if(affecting) - affecting.take_damage(5, 0, 0) + affecting.take_damage(2.5, 0, 0) affecting = get_organ("r_foot") if(affecting) - affecting.take_damage(5, 0, 0) + affecting.take_damage(2.5, 0, 0) if(!broken) src.gloves = W W.equipped(src, slot) @@ -271,21 +271,21 @@ src.visible_message("\red Your feet burst out of the [W], ripping them to shreds!", "\red [src]'s feet burst out of the [W], ripping them to shreds!", "\red You hear a ripping, tearing sound!") var/datum/organ/external/affecting = get_organ("l_foot") if(affecting) - affecting.take_damage(5, 0, 0) + affecting.take_damage(2.5, 0, 0) affecting = get_organ("r_foot") if(affecting) - affecting.take_damage(5, 0, 0) + affecting.take_damage(2.5, 0, 0) broken = 1 spawn(0) del(W) else if(prob(50)) src << "\red You hurt your feet forcing them into the [W]!" - var/datum/organ/external/affecting = get_organ("l_foot") + var/datum/organ/external/affecting = get_organ("r_foot") if(affecting) - affecting.take_damage(5, 0, 0) + affecting.take_damage(2.5, 0, 0) affecting = get_organ("r_foot") if(affecting) - affecting.take_damage(5, 0, 0) + affecting.take_damage(2.5, 0, 0) if(!broken) src.shoes = W W.equipped(src, slot) @@ -329,13 +329,13 @@ src << "\red You twist your tail trying to fit it into the [W]!" var/datum/organ/external/affecting = get_organ("chest") if(affecting) - affecting.take_damage(10, 0, 0) + affecting.take_damage(5, 0, 0) if( W.body_parts_covered & HEAD && W.flags & BLOCKHAIR && (cur_species == "Skrell")) if(prob(50)) src << "\red You twist your eartails trying to fit them into the [W]!" var/datum/organ/external/affecting = get_organ("head") if(affecting) - affecting.take_damage(10, 0, 0) + affecting.take_damage(5, 0, 0) W.layer = 20 From 12a677cf0b4a2b4644b4071d2b11b5fd1439d494 Mon Sep 17 00:00:00 2001 From: Cael_Aislinn Date: Sun, 28 Oct 2012 15:43:55 +1000 Subject: [PATCH 2/2] increased cramp interval, removed damage chance Signed-off-by: Cael_Aislinn --- code/modules/clothing/suits/suit_cramp.dm | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/code/modules/clothing/suits/suit_cramp.dm b/code/modules/clothing/suits/suit_cramp.dm index 27a732e8321..455ae543254 100644 --- a/code/modules/clothing/suits/suit_cramp.dm +++ b/code/modules/clothing/suits/suit_cramp.dm @@ -1,7 +1,7 @@ //might be a better place to put this, but it's fine here for now -#define MIN_CRAMP_TIME 600 -#define MAX_CRAMP_TIME 3600 +#define MIN_CRAMP_TIME 1200 +#define MAX_CRAMP_TIME 7200 #define CRAMP_DAMAGE_MAX 10 /obj/item/clothing/suit/var/causes_cramps = 0 @@ -19,9 +19,9 @@ var/afforgan = pick("chest","l_foot","r_foot","l_arm","l_leg") var/datum/organ/external/affecting = H.get_organ(afforgan) if(affecting) - if(prob(20) && cramp_damage_caused < CRAMP_DAMAGE_MAX) + /*if(prob(20) && cramp_damage_caused < CRAMP_DAMAGE_MAX) affecting.take_damage(3, 0, 0) - cramp_damage_caused += 3 + cramp_damage_caused += 3*/ H << "\red [pick("Your [affecting.display_name] goes to sleep.","Your [affecting.display_name] begins to twitch.","Your [affecting.display_name] begins to seize up.","You can feel cramps in your [affecting.display_name].","Your [affecting.display_name] begins to ache.","You can feel pins and needles in your [affecting.display_name].")]" spawn(rand(MIN_CRAMP_TIME, MAX_CRAMP_TIME))