From 8ee6a817a72ca8c490dc847c5877890f16318552 Mon Sep 17 00:00:00 2001 From: generalthrax <139387950+generalthrax@users.noreply.github.com> Date: Thu, 14 Nov 2024 19:18:14 -0600 Subject: [PATCH] Frontiersman Vests Repathed to be like Everyone Else (Hits Simplemobs Too) (#3738) ## About The Pull Request Repaths Frontiersmen armour vests to be normal armour vests (35 bullet armour) instead of bulletproof vests (60 bullet) armour. I'm 90% sure nothing testmerged has Frontie armour in it so this should be fine. Does not repath Frontier X11s because all X11s are bulletproof too. Decreases the price of the blackmarket Frontie armour to reflect this. ## Why It's Good For The Game This is more so intended for Frontiersmen armoured simplemobs that are fully armoured (frontier body-wide armour is 75 compared to this 60), meaning you do not have to fight 8 full-body armoured 60 bullet armour Monsters on every ruin (that most likely have assault rifles or shotguns that They Do Not Drop). It's also a little funny to me that a worn-out pirate vest is significantly better than the faction vests of every single faction with a stake in the Frontier. ## Changelog :cl: balance: Frontiersmen vests now count as normal armour vests and not bulletproof balance: Frontiersmen simplemobs count this for their armour values balance: Frontie armour vest in the blackmarket cost decreased /:cl: --- _maps/RandomRuins/IceRuins/icemoon_ice_lodge.dmm | 4 ++-- _maps/RandomRuins/JungleRuins/jungle_cavecrew.dmm | 6 +++--- .../LavaRuins/lavaland_crashed_starwalker.dmm | 2 +- _maps/shuttles/pirate/pirate_tortuga.dmm | 8 ++++---- .../cargo/blackmarket/blackmarket_items/clothing.dm | 12 ++++++------ code/modules/clothing/factions/frontiersmen.dm | 4 ++-- .../modules/clothing/outfits/ert/frontiersmen_ert.dm | 4 ++-- .../clothing/outfits/factions/frontiersmen.dm | 2 +- code/modules/mob/living/simple_animal/corpse.dm | 2 +- .../simple_animal/hostile/human/frontiersman.dm | 6 +++--- 10 files changed, 25 insertions(+), 25 deletions(-) diff --git a/_maps/RandomRuins/IceRuins/icemoon_ice_lodge.dmm b/_maps/RandomRuins/IceRuins/icemoon_ice_lodge.dmm index a698cf49ea18..511265ade760 100644 --- a/_maps/RandomRuins/IceRuins/icemoon_ice_lodge.dmm +++ b/_maps/RandomRuins/IceRuins/icemoon_ice_lodge.dmm @@ -2033,9 +2033,9 @@ name = "equipment locker"; req_access_txt = "1" }, -/obj/item/clothing/suit/armor/vest/bulletproof/frontier, +/obj/item/clothing/suit/armor/vest/frontier, /obj/item/clothing/head/helmet/bulletproof/x11/frontier, -/obj/item/clothing/suit/armor/vest/bulletproof/frontier, +/obj/item/clothing/suit/armor/vest/frontier, /obj/item/clothing/head/helmet/bulletproof/x11/frontier, /obj/item/clothing/gloves/combat, /obj/item/clothing/gloves/combat, diff --git a/_maps/RandomRuins/JungleRuins/jungle_cavecrew.dmm b/_maps/RandomRuins/JungleRuins/jungle_cavecrew.dmm index f681541a434a..9abecb5dec66 100644 --- a/_maps/RandomRuins/JungleRuins/jungle_cavecrew.dmm +++ b/_maps/RandomRuins/JungleRuins/jungle_cavecrew.dmm @@ -3928,9 +3928,9 @@ /obj/item/clothing/under/frontiersmen, /obj/item/clothing/under/frontiersmen, /obj/item/clothing/under/frontiersmen, -/obj/item/clothing/suit/armor/vest/bulletproof/frontier, -/obj/item/clothing/suit/armor/vest/bulletproof/frontier, -/obj/item/clothing/suit/armor/vest/bulletproof/frontier, +/obj/item/clothing/suit/armor/vest/frontier, +/obj/item/clothing/suit/armor/vest/frontier, +/obj/item/clothing/suit/armor/vest/frontier, /obj/item/clothing/head/helmet/bulletproof/x11/frontier, /obj/item/clothing/head/helmet/bulletproof/x11/frontier, /obj/item/clothing/head/helmet/bulletproof/x11/frontier, diff --git a/_maps/RandomRuins/LavaRuins/lavaland_crashed_starwalker.dmm b/_maps/RandomRuins/LavaRuins/lavaland_crashed_starwalker.dmm index 47d8eb8a5b41..779d6da2e3c6 100644 --- a/_maps/RandomRuins/LavaRuins/lavaland_crashed_starwalker.dmm +++ b/_maps/RandomRuins/LavaRuins/lavaland_crashed_starwalker.dmm @@ -2003,7 +2003,7 @@ req_one_access_txt = "1" }, /obj/effect/decal/cleanable/dirt/dust, -/obj/item/clothing/suit/armor/vest/bulletproof/frontier, +/obj/item/clothing/suit/armor/vest/frontier, /obj/item/clothing/head/helmet/bulletproof/x11/frontier{ pixel_y = 6 }, diff --git a/_maps/shuttles/pirate/pirate_tortuga.dmm b/_maps/shuttles/pirate/pirate_tortuga.dmm index 35387ea53cd5..022ef2e8c8d8 100644 --- a/_maps/shuttles/pirate/pirate_tortuga.dmm +++ b/_maps/shuttles/pirate/pirate_tortuga.dmm @@ -1092,20 +1092,20 @@ pixel_y = 6; pixel_x = 7 }, -/obj/item/clothing/suit/armor/vest/bulletproof/frontier{ +/obj/item/clothing/suit/armor/vest/frontier{ pixel_y = -4; pixel_x = 8 }, /obj/machinery/light/directional/north, -/obj/item/clothing/suit/armor/vest/bulletproof/frontier{ +/obj/item/clothing/suit/armor/vest/frontier{ pixel_y = -4; pixel_x = 8 }, -/obj/item/clothing/suit/armor/vest/bulletproof/frontier{ +/obj/item/clothing/suit/armor/vest/frontier{ pixel_y = -4; pixel_x = 8 }, -/obj/item/clothing/suit/armor/vest/bulletproof/frontier{ +/obj/item/clothing/suit/armor/vest/frontier{ pixel_y = -4; pixel_x = 8 }, diff --git a/code/modules/cargo/blackmarket/blackmarket_items/clothing.dm b/code/modules/cargo/blackmarket/blackmarket_items/clothing.dm index 677b82624bae..1beb0a0de7d2 100644 --- a/code/modules/cargo/blackmarket/blackmarket_items/clothing.dm +++ b/code/modules/cargo/blackmarket/blackmarket_items/clothing.dm @@ -92,20 +92,20 @@ return B /datum/blackmarket_item/clothing/frontiersmen_armor_set - name = "X-11 Bulletproof Armor Set" - desc = "We got a good deal on some extra bulletproof armor from a Frontiersmen Quartermaster, and we're passing those savings onto you!" + name = "X-11 Armor Set" + desc = "We got a good deal on some extra armor from a Frontiersmen Quartermaster, and we're passing those savings onto you!" item = /obj/item/storage/box - price_min = 1000 - price_max = 1750 + price_min = 500 + price_max = 1250 stock_max = 3 availability_prob = 50 /datum/blackmarket_item/clothing/frontiersmen_armor_set/spawn_item(loc) var/obj/item/storage/box/B = ..() - B.name = "Bulletproof Armor Set Box" + B.name = "Armor Set Box" B.desc = "A beat up looking box with some armor inside." - new /obj/item/clothing/suit/armor/vest/bulletproof/frontier(B) + new /obj/item/clothing/suit/armor/vest/frontier(B) new /obj/item/clothing/head/helmet/bulletproof/x11/frontier(B) return B diff --git a/code/modules/clothing/factions/frontiersmen.dm b/code/modules/clothing/factions/frontiersmen.dm index ab18f7a2b738..946601ce1d5f 100644 --- a/code/modules/clothing/factions/frontiersmen.dm +++ b/code/modules/clothing/factions/frontiersmen.dm @@ -53,8 +53,8 @@ //Armored suits// ///////////////// -/obj/item/clothing/suit/armor/vest/bulletproof/frontier - name = "\improper Frontiersmen bulletproof armor" +/obj/item/clothing/suit/armor/vest/frontier + name = "\improper Frontiersmen armor vest" desc = "A scrap piece of armor made of disused protective plates. This one was used to protect the squishy bits of a Frontiersman, once." icon_state = "frontier_armor" icon = 'icons/obj/clothing/faction/frontiersmen/suits.dmi' diff --git a/code/modules/clothing/outfits/ert/frontiersmen_ert.dm b/code/modules/clothing/outfits/ert/frontiersmen_ert.dm index ca623bbf38b2..7ec649bedf75 100644 --- a/code/modules/clothing/outfits/ert/frontiersmen_ert.dm +++ b/code/modules/clothing/outfits/ert/frontiersmen_ert.dm @@ -55,7 +55,7 @@ if(prob(60)) suit = pick_weight(list( /obj/item/clothing/suit/armor/vest = 5, - /obj/item/clothing/suit/armor/vest/bulletproof/frontier = 5, + /obj/item/clothing/suit/armor/vest/frontier = 5, /obj/item/clothing/suit/armor/vest/scrap = 1)) if(prob(50)) @@ -231,7 +231,7 @@ head = /obj/item/clothing/head/helmet/bulletproof/x11/frontier mask = /obj/item/clothing/mask/breath/ngr - suit = /obj/item/clothing/suit/armor/vest/bulletproof/frontier + suit = /obj/item/clothing/suit/armor/vest/frontier suit_store = /obj/item/gun/ballistic/automatic/pistol/mauler belt = /obj/item/storage/belt/medical/webbing/frontiersmen/combat glasses = /obj/item/clothing/glasses/hud/health diff --git a/code/modules/clothing/outfits/factions/frontiersmen.dm b/code/modules/clothing/outfits/factions/frontiersmen.dm index 997eec2209d4..b9e350da7a3c 100644 --- a/code/modules/clothing/outfits/factions/frontiersmen.dm +++ b/code/modules/clothing/outfits/factions/frontiersmen.dm @@ -145,7 +145,7 @@ accessory = /obj/item/clothing/accessory/armband uniform = /obj/item/clothing/under/frontiersmen/officer head = /obj/item/clothing/head/beret/sec/frontier/officer - suit = /obj/item/clothing/suit/armor/vest/bulletproof/frontier + suit = /obj/item/clothing/suit/armor/vest/frontier shoes = /obj/item/clothing/shoes/jackboots gloves = /obj/item/clothing/gloves/combat backpack_contents = list(/obj/item/clothing/mask/gas/frontiersmen, /obj/item/melee/baton/loaded=1) diff --git a/code/modules/mob/living/simple_animal/corpse.dm b/code/modules/mob/living/simple_animal/corpse.dm index 7779c09e8bf9..eb8de8863ce1 100644 --- a/code/modules/mob/living/simple_animal/corpse.dm +++ b/code/modules/mob/living/simple_animal/corpse.dm @@ -145,7 +145,7 @@ /datum/outfit/frontier/trooper name = "Frontiersman Armored Corpse" - suit = /obj/item/clothing/suit/armor/vest/bulletproof/frontier + suit = /obj/item/clothing/suit/armor/vest/frontier shoes = /obj/item/clothing/shoes/combat gloves = /obj/item/clothing/gloves/tackler/combat ears = /obj/item/radio/headset diff --git a/code/modules/mob/living/simple_animal/hostile/human/frontiersman.dm b/code/modules/mob/living/simple_animal/hostile/human/frontiersman.dm index 593c33642b5f..c22da6cf7195 100644 --- a/code/modules/mob/living/simple_animal/hostile/human/frontiersman.dm +++ b/code/modules/mob/living/simple_animal/hostile/human/frontiersman.dm @@ -120,7 +120,7 @@ casingtype = /obj/item/ammo_casing/shotgun/buckshot loot = list(/obj/effect/mob_spawn/human/corpse/frontier/ranged/trooper, /obj/item/gun/ballistic/shotgun/brimstone) - armor_base = /obj/item/clothing/suit/armor/vest/bulletproof/frontier + armor_base = /obj/item/clothing/suit/armor/vest/frontier /mob/living/simple_animal/hostile/human/frontier/ranged/trooper/internals icon_state = "frontiersmanrangedelite_mask" @@ -177,7 +177,7 @@ casingtype = /obj/item/ammo_casing/a762_40 loot = list(/obj/effect/mob_spawn/human/corpse/frontier/ranged/trooper, /obj/item/gun/ballistic/automatic/assault/skm) - armor_base = /obj/item/clothing/suit/armor/vest/bulletproof/frontier + armor_base = /obj/item/clothing/suit/armor/vest/frontier /mob/living/simple_animal/hostile/human/frontier/ranged/trooper/skm/internals icon_state = "frontiersmanrangedak47_mask" @@ -205,7 +205,7 @@ /obj/item/gun/ballistic/rifle/illestren) casingtype = /obj/item/ammo_casing/a8_50r projectilesound = 'sound/weapons/gun/rifle/mosin.ogg' - armor_base = /obj/item/clothing/suit/armor/vest/bulletproof/frontier + armor_base = /obj/item/clothing/suit/armor/vest/frontier /mob/living/simple_animal/hostile/human/frontier/ranged/trooper/rifle/internals icon_state = "frontiersmanrangedmosin_mask"