From ca9b47057c7479bb414dd4537984d0219d3d12d7 Mon Sep 17 00:00:00 2001 From: CHOMPStation2StaffMirrorBot <94713762+CHOMPStation2StaffMirrorBot@users.noreply.github.com> Date: Mon, 24 Mar 2025 03:20:52 -0700 Subject: [PATCH] [MIRROR] Makes a few loadout fluff items NOT give you 50% armor (#10463) Co-authored-by: Cameron Lennox Co-authored-by: Kashargul <144968721+Kashargul@users.noreply.github.com> --- .../preference_setup/loadout/loadout_uniform.dm | 2 +- code/modules/clothing/suits/jobs.dm | 1 + code/modules/vore/fluffstuff/custom_clothes_vr.dm | 14 +++++++------- .../living/simple_mob/subtypes/vore/cave_lamia.dm | 2 +- 4 files changed, 10 insertions(+), 9 deletions(-) diff --git a/code/modules/client/preference_setup/loadout/loadout_uniform.dm b/code/modules/client/preference_setup/loadout/loadout_uniform.dm index 8e7173bf64..cff45c890b 100644 --- a/code/modules/client/preference_setup/loadout/loadout_uniform.dm +++ b/code/modules/client/preference_setup/loadout/loadout_uniform.dm @@ -671,6 +671,7 @@ display_name = "fed uniform, sec" path = /obj/item/clothing/suit/storage/fluff/fedcoat allowed_roles = list(JOB_HEAD_OF_SECURITY, JOB_WARDEN, JOB_DETECTIVE, JOB_SECURITY_OFFICER, JOB_BLUESHIELD_GUARD, JOB_SECURITY_PILOT) //YW ADDITIONS + cost = 2 /datum/gear/suit/job_fed/medsci display_name = "fed uniform, med/sci" @@ -691,7 +692,6 @@ JOB_SCIENTIST,JOB_ROBOTICIST,JOB_XENOBIOLOGIST,JOB_XENOBOTANIST,JOB_ATMOSPHERIC_TECHNICIAN, JOB_ENGINEER,JOB_WARDEN,JOB_DETECTIVE,JOB_SECURITY_OFFICER, JOB_PATHFINDER,JOB_EXPLORER,JOB_FIELD_MEDIC,JOB_BLUESHIELD_GUARD,JOB_SECURITY_PILOT) //YW ADDITIONS //CHOMP keep explo - /* Swimsuits */ diff --git a/code/modules/clothing/suits/jobs.dm b/code/modules/clothing/suits/jobs.dm index cd8f31e31b..54c0b1fae3 100644 --- a/code/modules/clothing/suits/jobs.dm +++ b/code/modules/clothing/suits/jobs.dm @@ -177,6 +177,7 @@ /obj/item/tool/crowbar, /obj/item/tool/screwdriver, /obj/item/weldingtool, /obj/item/tool/wirecutters, /obj/item/tool/wrench, /obj/item/tank/emergency/oxygen, /obj/item/clothing/mask/gas, /obj/item/taperoll/engineering, /obj/item/taperoll/atmos, /obj/item/analyzer, /obj/item/extinguisher/mini) //VOREStation edit. Few more tools that can be put on vests body_parts_covered = UPPER_TORSO + armor = list(melee = 0, bullet = 0, laser = 0,energy = 0, bomb = 0, bio = 0, rad = 20) /obj/item/clothing/suit/storage/hazardvest/blue name = "blue hazard vest" diff --git a/code/modules/vore/fluffstuff/custom_clothes_vr.dm b/code/modules/vore/fluffstuff/custom_clothes_vr.dm index 85fa1261ca..740cd33322 100644 --- a/code/modules/vore/fluffstuff/custom_clothes_vr.dm +++ b/code/modules/vore/fluffstuff/custom_clothes_vr.dm @@ -200,7 +200,7 @@ blood_overlay_type = "coat" body_parts_covered = CHEST|ARMS allowed = list(POCKET_GENERIC, POCKET_EMERGENCY, POCKET_SECURITY, POCKET_DETECTIVE) - armor = list(melee = 0, bullet = 0, laser = 0, energy = 0, bomb = 0, bio = 0, rad = 0) + armor = list(melee = 10, bullet = 20, laser = 10, energy = 0, bomb = 0, bio = 0, rad = 0) //As much armor as the cyberpunk jacket. Also priced the same. var/unbuttoned = 0 /obj/item/clothing/suit/storage/fluff/fedcoat/verb/toggle() @@ -230,21 +230,21 @@ desc = "A uniform jacket from the United Federation. Starfleet still uses this uniform and there are variations of it. Wearing this may make you feel all scientific." icon_state = "fedblue" item_state = "fedblue" - armor = list(melee = 0, bullet = 0, laser = 0,energy = 0, bomb = 0, bio = 0, rad = 0) + armor = list(melee = 0, bullet = 0, laser = 0,energy = 0, bomb = 0, bio = 50, rad = 0) //As much armor as a normal labcoat. /obj/item/clothing/suit/storage/fluff/fedcoat/fedeng name = "Federation Uniform Jacket (Yellow)" desc = "A uniform jacket from the United Federation. Starfleet still uses this uniform and there are variations of it.Wearing it may make you feel like checking a warp core, whatever that is." icon_state = "fedeng" item_state = "fedeng" - armor = list(melee = 0, bullet = 0, laser = 0,energy = 0, bomb = 0, bio = 0, rad = 0) + armor = list(melee = 0, bullet = 0, laser = 0,energy = 0, bomb = 0, bio = 0, rad = 20) //I was going to say 'as much as a hazard vest' but then I checked and found that hazard vests either never HAD rad resistance or had it removed... Whatever. I gave the hazard vest it's rad resistance back as well. /obj/item/clothing/suit/storage/fluff/fedcoat/fedcapt name = "Federation Uniform Jacket (Command)" desc = "A uniform jacket from the United Federation. Starfleet still uses this uniform and there are variations of it. You feel like a commanding officer of Starfleet." icon_state = "fedcapt" item_state = "fedcapt" - armor = list(melee = 0, bullet = 0, laser = 0,energy = 0, bomb = 0, bio = 0, rad = 0) + armor = list(melee = 10, bullet = 20, laser = 10, energy = 0, bomb = 0, bio = 0, rad = 0) /obj/item/clothing/suit/storage/fluff/modernfedcoat name = "Modern Federation Uniform Jacket (Command)" @@ -259,7 +259,7 @@ blood_overlay_type = "coat" body_parts_covered = CHEST|ARMS allowed = list(POCKET_GENERIC, POCKET_EMERGENCY, POCKET_SECURITY, POCKET_DETECTIVE) - armor = list(melee = 0, bullet = 0, laser = 0,energy = 0, bomb = 0, bio = 0, rad = 0) + armor = list(melee = 10, bullet = 20, laser = 10, energy = 0, bomb = 0, bio = 0, rad = 0) //Variants /obj/item/clothing/suit/storage/fluff/modernfedcoat/modernfedblue @@ -274,14 +274,14 @@ desc = "A modern uniform jacket from the United Federation. Their Starfleet had recently started using these uniforms. You feel like you can handle any type of technical engineering problems." icon_state = "fedmoderneng" item_state = "fedmoderneng" - armor = list(melee = 0, bullet = 0, laser = 0,energy = 0, bomb = 0, bio = 0, rad = 0) + armor = list(melee = 0, bullet = 0, laser = 0,energy = 0, bomb = 0, bio = 0, rad = 20) /obj/item/clothing/suit/storage/fluff/modernfedcoat/modernfedsec name = "Modern Federation Uniform Jacket (Red)" desc = "A modern uniform jacket from the United Federation. Their Starfleet had recently started using these uniforms. This uniform makes you want to protect and serve as an officer." icon_state = "fedmodernsec" item_state = "fedmodernsec" - armor = list(melee = 0, bullet = 0, laser = 0,energy = 0, bomb = 0, bio = 0, rad = 0) + armor = list(melee = 10, bullet = 20, laser = 10, energy = 0, bomb = 0, bio = 0, rad = 0) /obj/item/clothing/head/caphat/formal/fedcover name = "Federation Officer's Cap" diff --git a/modular_chomp/code/modules/mob/living/simple_mob/subtypes/vore/cave_lamia.dm b/modular_chomp/code/modules/mob/living/simple_mob/subtypes/vore/cave_lamia.dm index f80b9f5bba..17550c24a4 100644 --- a/modular_chomp/code/modules/mob/living/simple_mob/subtypes/vore/cave_lamia.dm +++ b/modular_chomp/code/modules/mob/living/simple_mob/subtypes/vore/cave_lamia.dm @@ -13,4 +13,4 @@ melee_damage_lower = 5 melee_damage_upper = 5 vore_upper_transfer_chance = 75 - ai_holder_type = /datum/ai_holder/simple_mob/melee/evasive \ No newline at end of file + ai_holder_type = /datum/ai_holder/simple_mob/melee/evasive