From a4819fad65afffe54e54bcd8dcc27baf2384a35e Mon Sep 17 00:00:00 2001 From: Uristthedorf <40842973+Uristthedorf@users.noreply.github.com> Date: Sat, 25 May 2024 03:01:32 -0700 Subject: [PATCH 1/6] Buffs durathread --- code/modules/clothing/head/helmet.dm | 4 ++-- code/modules/clothing/suits/armor.dm | 5 +++-- code/modules/clothing/under/miscellaneous.dm | 2 ++ 3 files changed, 7 insertions(+), 4 deletions(-) diff --git a/code/modules/clothing/head/helmet.dm b/code/modules/clothing/head/helmet.dm index db7de736cb47..ad40bfa0fde5 100644 --- a/code/modules/clothing/head/helmet.dm +++ b/code/modules/clothing/head/helmet.dm @@ -455,8 +455,8 @@ strip_delay = 60 /datum/armor/helmet_durathread - melee = 20 - bullet = 10 + melee = 25 + bullet = 15 laser = 30 energy = 40 bomb = 15 diff --git a/code/modules/clothing/suits/armor.dm b/code/modules/clothing/suits/armor.dm index 53009e2df8c9..d95bd165fc19 100644 --- a/code/modules/clothing/suits/armor.dm +++ b/code/modules/clothing/suits/armor.dm @@ -476,13 +476,14 @@ dog_fashion = null /datum/armor/vest_durathread - melee = 20 - bullet = 10 + melee = 25 + bullet = 15 laser = 30 energy = 40 bomb = 15 fire = 40 acid = 50 + wound = 5 /obj/item/clothing/suit/armor/vest/russian name = "russian vest" diff --git a/code/modules/clothing/under/miscellaneous.dm b/code/modules/clothing/under/miscellaneous.dm index 68749df3ed0b..7bba2e8a6535 100644 --- a/code/modules/clothing/under/miscellaneous.dm +++ b/code/modules/clothing/under/miscellaneous.dm @@ -100,11 +100,13 @@ /datum/armor/misc_durathread melee = 10 + bullet = 5 laser = 10 fire = 40 acid = 10 bomb = 5 bio = 10 + wound = 5 /obj/item/clothing/under/misc/bouncer name = "bouncer uniform" From 52ac3f1f3b27e93fa770a3114fe69019c0a92d6d Mon Sep 17 00:00:00 2001 From: Uristthedorf <40842973+Uristthedorf@users.noreply.github.com> Date: Sat, 25 May 2024 04:13:12 -0700 Subject: [PATCH 2/6] Update miscellaneous.dm --- code/modules/clothing/under/miscellaneous.dm | 1 + 1 file changed, 1 insertion(+) diff --git a/code/modules/clothing/under/miscellaneous.dm b/code/modules/clothing/under/miscellaneous.dm index 7bba2e8a6535..2c5d844e9610 100644 --- a/code/modules/clothing/under/miscellaneous.dm +++ b/code/modules/clothing/under/miscellaneous.dm @@ -102,6 +102,7 @@ melee = 10 bullet = 5 laser = 10 + energy = 10 fire = 40 acid = 10 bomb = 5 From d6bfb867f34910634c79e431b6f1d624b2a64d73 Mon Sep 17 00:00:00 2001 From: Uristthedorf <40842973+Uristthedorf@users.noreply.github.com> Date: Sat, 25 May 2024 11:18:12 -0700 Subject: [PATCH 3/6] Update miscellaneous.dm --- code/modules/clothing/under/miscellaneous.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/modules/clothing/under/miscellaneous.dm b/code/modules/clothing/under/miscellaneous.dm index 2c5d844e9610..218c67f4d144 100644 --- a/code/modules/clothing/under/miscellaneous.dm +++ b/code/modules/clothing/under/miscellaneous.dm @@ -102,7 +102,7 @@ melee = 10 bullet = 5 laser = 10 - energy = 10 + energy = 5 fire = 40 acid = 10 bomb = 5 From 5131ed57eaf26ddb2c9ed218fe82129c97d6dfc3 Mon Sep 17 00:00:00 2001 From: Uristthedorf <40842973+Uristthedorf@users.noreply.github.com> Date: Sat, 25 May 2024 22:51:46 -0700 Subject: [PATCH 4/6] Modularizes --- code/modules/clothing/suits/armor.dm | 5 ++--- code/modules/clothing/under/miscellaneous.dm | 2 -- monkestation/code/modules/clothing/head/misc.dm | 4 ++++ monkestation/code/modules/clothing/suits/coats.dm | 5 +++++ monkestation/code/modules/clothing/under/undersuit.dm | 4 ++++ 5 files changed, 15 insertions(+), 5 deletions(-) diff --git a/code/modules/clothing/suits/armor.dm b/code/modules/clothing/suits/armor.dm index d95bd165fc19..53009e2df8c9 100644 --- a/code/modules/clothing/suits/armor.dm +++ b/code/modules/clothing/suits/armor.dm @@ -476,14 +476,13 @@ dog_fashion = null /datum/armor/vest_durathread - melee = 25 - bullet = 15 + melee = 20 + bullet = 10 laser = 30 energy = 40 bomb = 15 fire = 40 acid = 50 - wound = 5 /obj/item/clothing/suit/armor/vest/russian name = "russian vest" diff --git a/code/modules/clothing/under/miscellaneous.dm b/code/modules/clothing/under/miscellaneous.dm index 218c67f4d144..976f241c91c5 100644 --- a/code/modules/clothing/under/miscellaneous.dm +++ b/code/modules/clothing/under/miscellaneous.dm @@ -102,12 +102,10 @@ melee = 10 bullet = 5 laser = 10 - energy = 5 fire = 40 acid = 10 bomb = 5 bio = 10 - wound = 5 /obj/item/clothing/under/misc/bouncer name = "bouncer uniform" diff --git a/monkestation/code/modules/clothing/head/misc.dm b/monkestation/code/modules/clothing/head/misc.dm index d8eabf72c0eb..785eca2d3981 100644 --- a/monkestation/code/modules/clothing/head/misc.dm +++ b/monkestation/code/modules/clothing/head/misc.dm @@ -220,3 +220,7 @@ icon = 'monkestation/icons/obj/clothing/hats.dmi' worn_icon = 'monkestation/icons/mob/clothing/head.dmi' icon_state = "syndieheadband" + +/datum/armor/helmet_durathread + melee = 25 + bullet = 15 diff --git a/monkestation/code/modules/clothing/suits/coats.dm b/monkestation/code/modules/clothing/suits/coats.dm index e8f2ab3b3dcd..e04e3ecc73ba 100644 --- a/monkestation/code/modules/clothing/suits/coats.dm +++ b/monkestation/code/modules/clothing/suits/coats.dm @@ -326,3 +326,8 @@ greyscale_colors = null //End of Bunny Costume Jackets + +/datum/armor/vest_durathread + melee = 25 + bullet = 15 + wound = 5 diff --git a/monkestation/code/modules/clothing/under/undersuit.dm b/monkestation/code/modules/clothing/under/undersuit.dm index 6ef54e516fc1..e4dadd4fcc33 100644 --- a/monkestation/code/modules/clothing/under/undersuit.dm +++ b/monkestation/code/modules/clothing/under/undersuit.dm @@ -86,3 +86,7 @@ worn_icon = 'monkestation/icons/mob/clothing/uniform.dmi' icon_state = "artisan" can_adjust = FALSE + +/datum/armor/misc_durathread + energy = 5 + wound = 5 From b0b95c9074f241a5c89db30ca4de46b6dfbdab18 Mon Sep 17 00:00:00 2001 From: Uristthedorf <40842973+Uristthedorf@users.noreply.github.com> Date: Sat, 25 May 2024 22:53:58 -0700 Subject: [PATCH 5/6] Modularizes part 2 --- code/modules/clothing/head/helmet.dm | 4 ++-- code/modules/clothing/under/miscellaneous.dm | 1 - monkestation/code/modules/clothing/under/undersuit.dm | 1 + 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/code/modules/clothing/head/helmet.dm b/code/modules/clothing/head/helmet.dm index ad40bfa0fde5..db7de736cb47 100644 --- a/code/modules/clothing/head/helmet.dm +++ b/code/modules/clothing/head/helmet.dm @@ -455,8 +455,8 @@ strip_delay = 60 /datum/armor/helmet_durathread - melee = 25 - bullet = 15 + melee = 20 + bullet = 10 laser = 30 energy = 40 bomb = 15 diff --git a/code/modules/clothing/under/miscellaneous.dm b/code/modules/clothing/under/miscellaneous.dm index 976f241c91c5..68749df3ed0b 100644 --- a/code/modules/clothing/under/miscellaneous.dm +++ b/code/modules/clothing/under/miscellaneous.dm @@ -100,7 +100,6 @@ /datum/armor/misc_durathread melee = 10 - bullet = 5 laser = 10 fire = 40 acid = 10 diff --git a/monkestation/code/modules/clothing/under/undersuit.dm b/monkestation/code/modules/clothing/under/undersuit.dm index e4dadd4fcc33..a773a0dbfa86 100644 --- a/monkestation/code/modules/clothing/under/undersuit.dm +++ b/monkestation/code/modules/clothing/under/undersuit.dm @@ -88,5 +88,6 @@ can_adjust = FALSE /datum/armor/misc_durathread + bullet = 5 energy = 5 wound = 5 From c440db637c202eea26a0344987219e543d26df86 Mon Sep 17 00:00:00 2001 From: Uristthedorf <40842973+Uristthedorf@users.noreply.github.com> Date: Sun, 26 May 2024 01:36:05 -0700 Subject: [PATCH 6/6] Removes melee buff --- monkestation/code/modules/clothing/head/misc.dm | 1 - monkestation/code/modules/clothing/suits/coats.dm | 1 - 2 files changed, 2 deletions(-) diff --git a/monkestation/code/modules/clothing/head/misc.dm b/monkestation/code/modules/clothing/head/misc.dm index 785eca2d3981..7d49579577e5 100644 --- a/monkestation/code/modules/clothing/head/misc.dm +++ b/monkestation/code/modules/clothing/head/misc.dm @@ -222,5 +222,4 @@ icon_state = "syndieheadband" /datum/armor/helmet_durathread - melee = 25 bullet = 15 diff --git a/monkestation/code/modules/clothing/suits/coats.dm b/monkestation/code/modules/clothing/suits/coats.dm index e04e3ecc73ba..60fc006554aa 100644 --- a/monkestation/code/modules/clothing/suits/coats.dm +++ b/monkestation/code/modules/clothing/suits/coats.dm @@ -328,6 +328,5 @@ //End of Bunny Costume Jackets /datum/armor/vest_durathread - melee = 25 bullet = 15 wound = 5