From 472f973cac0e61511845f47f253e45ad98aff5d9 Mon Sep 17 00:00:00 2001 From: Ikarrus Date: Mon, 6 Jul 2015 08:27:52 -0600 Subject: [PATCH 1/2] Reduces the chance of your clothes getting shredded with light blast damage --- code/modules/mob/living/carbon/human/human.dm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/code/modules/mob/living/carbon/human/human.dm b/code/modules/mob/living/carbon/human/human.dm index 64bdbcfeb82..2b816ed863c 100644 --- a/code/modules/mob/living/carbon/human/human.dm +++ b/code/modules/mob/living/carbon/human/human.dm @@ -140,12 +140,12 @@ b_loss += 30 if (prob(getarmor(null, "bomb"))) b_loss = b_loss/2 - else - shred_clothing(1,10) if (!istype(ears, /obj/item/clothing/ears/earmuffs)) adjustEarDamage(15,60) if (prob(50)) Paralyse(10) + if(b_loss >= 30) + shred_clothing(1,10) var/update = 0 for(var/obj/item/organ/limb/temp in organs) From 75578aa69d97c159e39d5d1afffd9c17b16a533e Mon Sep 17 00:00:00 2001 From: Ikarrus Date: Mon, 6 Jul 2015 08:32:49 -0600 Subject: [PATCH 2/2] Removed Shredding for light blasts --- code/modules/mob/living/carbon/human/human.dm | 2 -- .../mob/living/carbon/human/inventory.dm | 4 +-- html/changelogs/ikarrus-hitler.yml | 36 +++++++++++++++++++ 3 files changed, 38 insertions(+), 4 deletions(-) create mode 100644 html/changelogs/ikarrus-hitler.yml diff --git a/code/modules/mob/living/carbon/human/human.dm b/code/modules/mob/living/carbon/human/human.dm index 2b816ed863c..20d8b20e620 100644 --- a/code/modules/mob/living/carbon/human/human.dm +++ b/code/modules/mob/living/carbon/human/human.dm @@ -144,8 +144,6 @@ adjustEarDamage(15,60) if (prob(50)) Paralyse(10) - if(b_loss >= 30) - shred_clothing(1,10) var/update = 0 for(var/obj/item/organ/limb/temp in organs) diff --git a/code/modules/mob/living/carbon/human/inventory.dm b/code/modules/mob/living/carbon/human/inventory.dm index 4b118cc0fe5..66c011ba797 100644 --- a/code/modules/mob/living/carbon/human/inventory.dm +++ b/code/modules/mob/living/carbon/human/inventory.dm @@ -398,7 +398,7 @@ //Backpacks can never be protected but are annoying as fuck to lose, so they get a lower chance to be shredded if(back) - back.shred(bomb,shock-30,src) + back.shred(bomb,shock-20,src) if(head) covered_parts |= head.flags_inv @@ -437,7 +437,7 @@ if(w_uniform) var/absorbed = ((covered_parts & HIDEJUMPSUIT) ? suit_absorbed : 0) if(absorbed >= 0) - w_uniform.shred(bomb,shock-absorbed,src) + w_uniform.shred(bomb,shock-20-absorbed,src) //Uniforms are also annoying to get shredded /obj/item/proc/shred(var/bomb,var/shock,var/mob/living/carbon/human/Human) if(flags & ABSTRACT) diff --git a/html/changelogs/ikarrus-hitler.yml b/html/changelogs/ikarrus-hitler.yml new file mode 100644 index 00000000000..494b0b7a82c --- /dev/null +++ b/html/changelogs/ikarrus-hitler.yml @@ -0,0 +1,36 @@ +################################ +# Example Changelog File +# +# Note: This file, and files beginning with ".", and files that don't end in ".yml" will not be read. If you change this file, you will look really dumb. +# +# Your changelog will be merged with a master changelog. (New stuff added only, and only on the date entry for the day it was merged.) +# When it is, any changes listed below will disappear. +# +# Valid Prefixes: +# bugfix +# wip (For works in progress) +# tweak +# soundadd +# sounddel +# rscadd (general adding of nice things) +# rscdel (general deleting of nice things) +# imageadd +# imagedel +# spellcheck (typo fixes) +# experiment +# tgs (TG-ported fixes?) +################################# + +# Your name. +author: Ikarrus + +# Optional: Remove this file after generating master changelog. Useful for PR changelogs that won't get used again. +delete-after: True + +# Any changes you've made. See valid prefix list above. +# INDENT WITH TWO SPACES. NOT TABS. SPACES. +# SCREW THIS UP AND IT WON'T WORK. +# Also, this gets changed to [] after reading. Just remove the brackets when you add new shit. +# Please surround your changes in double quotes ("). It works without them, but if you use certain characters it screws up compiling. The quotes will not show up in the changelog. +changes: + - rscdel: "Light severity explosions no longer shred clothes." \ No newline at end of file