From 30a9e41871da709ba2bb95feb384d88b410d2084 Mon Sep 17 00:00:00 2001 From: Sadhorizon <108196626+Sadhorizon@users.noreply.github.com> Date: Thu, 19 Sep 2024 12:54:20 +0200 Subject: [PATCH] scraps the western aesthetic --- _maps/configs/independent_scarab.json | 4 ++-- .../shuttles/independent/independent_scarab.dmm | 13 ++----------- .../clothing/outfits/factions/independent.dm | 17 +++++++---------- 3 files changed, 11 insertions(+), 23 deletions(-) diff --git a/_maps/configs/independent_scarab.json b/_maps/configs/independent_scarab.json index 97e318e9ec07..969520434156 100644 --- a/_maps/configs/independent_scarab.json +++ b/_maps/configs/independent_scarab.json @@ -21,12 +21,12 @@ "limit": 1, "job_slots": { "Captain": { - "outfit": "/datum/outfit/job/independent/captain/western", + "outfit": "/datum/outfit/job/independent/captain", "officer": true, "slots": 1 }, "Foreman": { - "outfit": "/datum/outfit/job/independent/quartermaster/western", + "outfit": "/datum/outfit/job/independent/quartermaster", "officer": true, "slots": 1 }, diff --git a/_maps/shuttles/independent/independent_scarab.dmm b/_maps/shuttles/independent/independent_scarab.dmm index 2f537e2537eb..631631f18ed1 100644 --- a/_maps/shuttles/independent/independent_scarab.dmm +++ b/_maps/shuttles/independent/independent_scarab.dmm @@ -2717,13 +2717,7 @@ }, /obj/item/clothing/under/rank/security/detective, /obj/item/clothing/suit/hazardvest, -/obj/item/clothing/suit/jacket/leather/duster{ - name = "foreman's duster"; - desc = "A long, utilitarian leather coat. Ideal for protecting its wearer from rain, sun, dust and paperwork." - }, /obj/item/storage/belt/utility/full, -/obj/item/clothing/gloves/fingerless, -/obj/item/clothing/head/cowboy/sec, /obj/item/clothing/head/hardhat/orange, /obj/item/clothing/head/hardhat/white, /obj/effect/turf_decal/box, @@ -3556,14 +3550,11 @@ /obj/item/storage/backpack/satchel/cap, /obj/item/clothing/under/rank/command/captain, /obj/item/clothing/under/rank/command/captain/skirt, -/obj/item/clothing/shoes/cowboy/fancy{ - pixel_y = -7 +/obj/item/clothing/shoes/laceup{ + pixel_y = -12 }, -/obj/item/clothing/suit/jacket/leather/duster/command, -/obj/item/clothing/suit/armor/vest/capcarapace/duster, /obj/item/clothing/gloves/color/white, /obj/item/clothing/head/caphat, -/obj/item/clothing/head/caphat/cowboy, /obj/item/ammo_box/c38_box, /obj/machinery/power/apc/auto_name/directional/north, /obj/structure/cable/green{ diff --git a/code/modules/clothing/outfits/factions/independent.dm b/code/modules/clothing/outfits/factions/independent.dm index d3c1798d83e6..c96566df0add 100644 --- a/code/modules/clothing/outfits/factions/independent.dm +++ b/code/modules/clothing/outfits/factions/independent.dm @@ -542,29 +542,26 @@ job_icon = "quartermaster" ears = /obj/item/radio/headset/headset_cargo - uniform = /obj/item/clothing/under/rank/cargo/qm - head = /obj/item/clothing/head/supply_chief + uniform = /obj/item/clothing/under/rank/security/detective + head = /obj/item/clothing/head/hardhat/white dcoat = /obj/item/clothing/suit/hooded/wintercoat/cargo - shoes = /obj/item/clothing/shoes/sneakers/brown + suit = /obj/item/clothing/suit/hazardvest + shoes = /obj/item/clothing/shoes/workboots glasses = /obj/item/clothing/glasses/sunglasses r_pocket = /obj/item/clipboard backpack_contents = list(/obj/item/modular_computer/tablet/preset/cargo=1) + backpack = /obj/item/storage/backpack/industrial + satchel = /obj/item/storage/backpack/satchel/eng chameleon_extras = /obj/item/stamp/qm /datum/outfit/job/independent/quartermaster/western name = "Independent - Quartermaster (Western)" - uniform = /obj/item/clothing/under/rank/security/detective - suit = /obj/item/clothing/suit/hazardvest - shoes = /obj/item/clothing/shoes/workboots + suit = /obj/item/clothing/suit/jacket/leather/duster gloves = /obj/item/clothing/gloves/fingerless - glasses = /obj/item/clothing/glasses/sunglasses head = /obj/item/clothing/head/cowboy/sec - backpack = /obj/item/storage/backpack/industrial - satchel = /obj/item/storage/backpack/satchel/eng - /datum/outfit/job/independent/miner name = "Independent - Miner" jobtype = /datum/job/mining