diff --git a/_maps/map_files/stations/boxstation.dmm b/_maps/map_files/stations/boxstation.dmm index dec972b08ad..9a6768b5dd3 100644 --- a/_maps/map_files/stations/boxstation.dmm +++ b/_maps/map_files/stations/boxstation.dmm @@ -43231,8 +43231,8 @@ layer = 2.9 }, /obj/item/tank/internals/emergency_oxygen/engi, -/obj/item/clothing/suit/storage/hazardvest, -/obj/item/clothing/suit/storage/hazardvest, +/obj/item/clothing/suit/storage/hazardvest/staff, +/obj/item/clothing/suit/storage/hazardvest/staff, /obj/item/tank/internals/emergency_oxygen/engi, /obj/item/clothing/mask/gas, /obj/item/clothing/mask/gas{ @@ -43466,9 +43466,9 @@ dir = 8; layer = 2.9 }, -/obj/item/clothing/suit/storage/hazardvest, +/obj/item/clothing/suit/storage/hazardvest/staff, /obj/item/tank/internals/emergency_oxygen/engi, -/obj/item/clothing/suit/storage/hazardvest, +/obj/item/clothing/suit/storage/hazardvest/staff, /obj/item/tank/internals/emergency_oxygen/engi, /obj/item/clothing/mask/gas, /obj/item/clothing/mask/gas{ diff --git a/_maps/map_files/stations/deltastation.dmm b/_maps/map_files/stations/deltastation.dmm index 911dd437d2d..1966e030047 100644 --- a/_maps/map_files/stations/deltastation.dmm +++ b/_maps/map_files/stations/deltastation.dmm @@ -13429,7 +13429,7 @@ dir = 8 }, /obj/item/clothing/gloves/color/black, -/obj/item/clothing/suit/storage/hazardvest, +/obj/item/clothing/suit/storage/hazardvest/staff, /obj/item/clothing/mask/gas, /obj/machinery/atmospherics/pipe/simple/visible/cyan{ dir = 4 @@ -46436,18 +46436,6 @@ icon_state = "neutralfull" }, /area/station/supply/expedition) -"czW" = ( -/obj/effect/spawner/random_spawners/dirt_often, -/obj/machinery/requests_console{ - department = "Expedition"; - pixel_x = -30; - dir = 4 - }, -/turf/simulated/floor/plasteel{ - dir = 8; - icon_state = "browncorner" - }, -/area/station/supply/expedition) "czY" = ( /turf/simulated/floor/plasteel{ dir = 4; @@ -89334,6 +89322,18 @@ /obj/effect/spawner/window/reinforced/grilled, /turf/simulated/floor/plating, /area/station/science/robotics/showroom) +"sjl" = ( +/obj/effect/spawner/random_spawners/dirt_often, +/obj/machinery/requests_console{ + department = "Expedition"; + pixel_x = -30; + dir = 4 + }, +/turf/simulated/floor/plasteel{ + dir = 8; + icon_state = "browncorner" + }, +/area/station/supply/expedition) "sjA" = ( /obj/structure/disposalpipe/sortjunction/reversed{ dir = 8; @@ -141166,7 +141166,7 @@ cxe cvK cyw cyr -czW +sjl cBw cCV cyv diff --git a/_maps/map_files/stations/metastation.dmm b/_maps/map_files/stations/metastation.dmm index 426773de555..bc68a34cc63 100644 --- a/_maps/map_files/stations/metastation.dmm +++ b/_maps/map_files/stations/metastation.dmm @@ -50578,10 +50578,10 @@ dir = 8; layer = 2.9 }, -/obj/item/clothing/suit/storage/hazardvest, -/obj/item/clothing/suit/storage/hazardvest, -/obj/item/clothing/suit/storage/hazardvest, -/obj/item/clothing/suit/storage/hazardvest, +/obj/item/clothing/suit/storage/hazardvest/staff, +/obj/item/clothing/suit/storage/hazardvest/staff, +/obj/item/clothing/suit/storage/hazardvest/staff, +/obj/item/clothing/suit/storage/hazardvest/staff, /obj/item/clothing/gloves/color/black, /obj/item/clothing/gloves/color/black, /obj/item/clothing/gloves/color/black, diff --git a/code/game/machinery/vendors/wardrobe_vendors.dm b/code/game/machinery/vendors/wardrobe_vendors.dm index f5be50a1995..5c2e1f4a658 100644 --- a/code/game/machinery/vendors/wardrobe_vendors.dm +++ b/code/game/machinery/vendors/wardrobe_vendors.dm @@ -444,7 +444,7 @@ /obj/item/clothing/under/rank/engineering/engineer/skirt = 3, /obj/item/clothing/suit/hooded/wintercoat/engineering = 3, /obj/item/clothing/suit/jacket/engibomber = 3, - /obj/item/clothing/suit/storage/hazardvest = 3, + /obj/item/clothing/suit/storage/hazardvest/staff = 3, /obj/item/clothing/head/beret/eng = 3, /obj/item/clothing/head/hardhat = 2, /obj/item/clothing/head/hardhat/orange = 2, @@ -465,7 +465,7 @@ /obj/item/clothing/under/rank/engineering/engineer/skirt = 50, /obj/item/clothing/suit/hooded/wintercoat/engineering = 75, /obj/item/clothing/suit/jacket/engibomber = 75, - /obj/item/clothing/suit/storage/hazardvest = 75, + /obj/item/clothing/suit/storage/hazardvest/staff = 50, /obj/item/clothing/head/beret/eng = 20, /obj/item/clothing/head/hardhat = 20, /obj/item/clothing/head/hardhat/orange = 30, @@ -497,7 +497,7 @@ /obj/item/clothing/under/rank/engineering/atmospheric_technician/skirt = 3, /obj/item/clothing/suit/hooded/wintercoat/engineering/atmos = 3, /obj/item/clothing/suit/jacket/atmosbomber = 3, - /obj/item/clothing/suit/storage/hazardvest = 3, + /obj/item/clothing/suit/storage/hazardvest/staff = 3, /obj/item/clothing/head/beret/atmos = 3, /obj/item/clothing/head/hardhat = 2, /obj/item/clothing/head/hardhat/red = 2, @@ -518,7 +518,7 @@ /obj/item/clothing/under/rank/engineering/atmospheric_technician/skirt = 50, /obj/item/clothing/suit/hooded/wintercoat/engineering/atmos = 75, /obj/item/clothing/suit/jacket/atmosbomber = 75, - /obj/item/clothing/suit/storage/hazardvest = 50, + /obj/item/clothing/suit/storage/hazardvest/staff = 50, /obj/item/clothing/head/beret/atmos = 20, /obj/item/clothing/head/hardhat = 20, /obj/item/clothing/head/hardhat/red = 30, @@ -538,10 +538,11 @@ /obj/machinery/economy/vending/cargodrobe name = "\improper CargoDrobe" desc = "A highly advanced vending machine for buying cargo related clothing for free... most of the time." - icon_state = "yellow_drobe" + icon_state = "cargodrobe" icon_lightmask = "base_drobe" icon_panel = "drobe" - icon_addon = "cargodrobe" + icon_broken = "base_drobe" + icon_off = "base_drobe" category = VENDOR_TYPE_CLOTHING ads_list = list("Upgraded Assistant Style! Pick yours today!", "These shorts are comfy and easy to wear, get yours now!") @@ -549,12 +550,13 @@ vend_reply = "Thank you for using the CargoDrobe!" products = list(/obj/item/clothing/under/rank/cargo/tech = 6, /obj/item/clothing/under/rank/cargo/tech/skirt = 3, - /obj/item/clothing/under/rank/cargo/deliveryboy = 2, - /obj/item/clothing/head/soft/deliverysoft = 2, + /obj/item/clothing/under/rank/cargo/tech/overalls = 3, + /obj/item/clothing/under/rank/cargo/tech/delivery = 2, /obj/item/clothing/suit/hooded/wintercoat/cargo = 3, /obj/item/clothing/suit/jacket/cargobomber = 3, - /obj/item/clothing/suit/storage/hazardvest = 3, + /obj/item/clothing/suit/storage/hazardvest/staff = 3, /obj/item/clothing/head/soft/cargo = 3, + /obj/item/clothing/head/beret/cargo = 3, /obj/item/clothing/head/hardhat/orange = 2, /obj/item/clothing/gloves/fingerless = 6, /obj/item/clothing/accessory/armband/cargo = 6, @@ -567,12 +569,13 @@ prices = list(/obj/item/clothing/under/rank/cargo/tech = 50, /obj/item/clothing/under/rank/cargo/tech/skirt = 50, - /obj/item/clothing/under/rank/cargo/deliveryboy = 100, - /obj/item/clothing/head/soft/deliverysoft = 50, + /obj/item/clothing/under/rank/cargo/tech/overalls = 50, + /obj/item/clothing/under/rank/cargo/tech/delivery = 100, /obj/item/clothing/suit/hooded/wintercoat/cargo = 75, /obj/item/clothing/suit/jacket/cargobomber = 75, - /obj/item/clothing/suit/storage/hazardvest = 50, + /obj/item/clothing/suit/storage/hazardvest/staff = 50, /obj/item/clothing/head/soft/cargo = 20, + /obj/item/clothing/head/beret/cargo = 20, /obj/item/clothing/head/hardhat/orange = 30, /obj/item/clothing/gloves/fingerless = 20, /obj/item/clothing/accessory/armband/cargo = 20, @@ -599,6 +602,7 @@ /obj/item/clothing/head/soft/expedition = 3, /obj/item/clothing/head/beret/expedition = 3, /obj/item/clothing/suit/jacket/expeditionbomber = 3, + /obj/item/clothing/suit/storage/hazardvest/staff = 3, /obj/item/mod/skin_applier = 3, /obj/item/clothing/gloves/color/black = 3, /obj/item/clothing/accessory/armband/cargo = 3, @@ -615,6 +619,7 @@ /obj/item/clothing/head/soft/expedition = 20, /obj/item/clothing/head/beret/expedition = 20, /obj/item/clothing/suit/jacket/expeditionbomber = 75, + /obj/item/clothing/suit/storage/hazardvest/staff = 50, /obj/item/clothing/gloves/color/black = 20, /obj/item/clothing/accessory/armband/cargo = 20, /obj/item/clothing/shoes/jackboots = 20, @@ -770,6 +775,7 @@ /obj/item/clothing/head/soft/janitorgrey = 3, /obj/item/clothing/head/soft/janitorpurple = 3, /obj/item/clothing/head/beret/janitor = 3, + /obj/item/clothing/suit/storage/hazardvest/staff = 3, /obj/item/clothing/gloves/janitor = 3, /obj/item/clothing/shoes/galoshes = 3, /obj/item/clothing/accessory/armband/service = 3, @@ -783,6 +789,7 @@ /obj/item/clothing/head/soft/janitorgrey = 20, /obj/item/clothing/head/soft/janitorpurple = 20, /obj/item/clothing/head/beret/janitor = 20, + /obj/item/clothing/suit/storage/hazardvest/staff = 50, /obj/item/clothing/accessory/armband/service = 20) refill_canister = /obj/item/vending_refill/janidrobe diff --git a/code/game/objects/items/weapons/storage/garment.dm b/code/game/objects/items/weapons/storage/garment.dm index 47835a9a9c6..d747981ab26 100644 --- a/code/game/objects/items/weapons/storage/garment.dm +++ b/code/game/objects/items/weapons/storage/garment.dm @@ -134,7 +134,7 @@ new /obj/item/clothing/under/rank/engineering/chief_engineer(src) new /obj/item/clothing/under/rank/engineering/chief_engineer/skirt(src) new /obj/item/clothing/suit/mantle/chief_engineer(src) - new /obj/item/clothing/suit/storage/hazardvest(src) + new /obj/item/clothing/suit/storage/hazardvest/ce(src) new /obj/item/clothing/shoes/brown(src) new /obj/item/clothing/glasses/welding/superior(src) new /obj/item/clothing/glasses/meson/sunglasses(src) @@ -208,7 +208,7 @@ new /obj/item/clothing/head/hardhat/orange(src) new /obj/item/clothing/suit/qmcoat(src) new /obj/item/clothing/suit/mantle/qm(src) - new /obj/item/clothing/suit/storage/hazardvest(src) + new /obj/item/clothing/suit/storage/hazardvest/qm(src) new /obj/item/clothing/gloves/color/black(src) new /obj/item/tank/internals/emergency_oxygen/double(src) diff --git a/code/game/objects/structures/crates_lockers/closets/secure/engineering_lockers.dm b/code/game/objects/structures/crates_lockers/closets/secure/engineering_lockers.dm index 3d00876ed71..dfa221084bc 100644 --- a/code/game/objects/structures/crates_lockers/closets/secure/engineering_lockers.dm +++ b/code/game/objects/structures/crates_lockers/closets/secure/engineering_lockers.dm @@ -88,7 +88,7 @@ new /obj/item/radio/headset/headset_eng(src) new /obj/item/clothing/under/rank/engineering/engineer(src) new /obj/item/clothing/under/rank/engineering/engineer/skirt(src) - new /obj/item/clothing/suit/storage/hazardvest(src) + new /obj/item/clothing/suit/storage/hazardvest/staff(src) new /obj/item/clothing/mask/gas(src) new /obj/item/clothing/glasses/meson/engine(src) new /obj/item/cartridge/engineering(src) @@ -114,7 +114,7 @@ new /obj/item/extinguisher(src) new /obj/item/grenade/gas/oxygen(src) new /obj/item/grenade/gas/oxygen(src) - new /obj/item/clothing/suit/storage/hazardvest(src) + new /obj/item/clothing/suit/storage/hazardvest/staff(src) new /obj/item/clothing/mask/gas(src) new /obj/item/tank/internals/emergency_oxygen/engi(src) new /obj/item/holosign_creator/atmos(src) diff --git a/code/game/objects/structures/crates_lockers/closets/utility_closets.dm b/code/game/objects/structures/crates_lockers/closets/utility_closets.dm index d407c451fcc..500b4adb101 100644 --- a/code/game/objects/structures/crates_lockers/closets/utility_closets.dm +++ b/code/game/objects/structures/crates_lockers/closets/utility_closets.dm @@ -90,7 +90,7 @@ /obj/structure/closet/toolcloset/populate_contents() if(prob(40)) - new /obj/item/clothing/suit/storage/hazardvest(src) + new /obj/item/clothing/suit/storage/hazardvest/staff(src) if(prob(70)) new /obj/item/flashlight(src) if(prob(70)) diff --git a/code/modules/client/preference/loadout/loadout_hat.dm b/code/modules/client/preference/loadout/loadout_hat.dm index 5c2914f5252..caa9b3917cf 100644 --- a/code/modules/client/preference/loadout/loadout_hat.dm +++ b/code/modules/client/preference/loadout/loadout_hat.dm @@ -77,11 +77,6 @@ path = /obj/item/clothing/head/soft/sec allowed_roles = list("Head of Security", "Warden", "Security Officer") -/datum/gear/hat/deliverysoft - display_name = "Cap, delivery boy" - path = /obj/item/clothing/head/soft/deliverysoft - allowed_roles = list("Quartermaster", "Cargo Technician") - /datum/gear/hat/capjanigrey display_name = "Cap, janitor grey" path = /obj/item/clothing/head/soft/janitorgrey @@ -202,6 +197,11 @@ path = /obj/item/clothing/head/beret/hop allowed_roles = list("Head of Personnel") +/datum/gear/hat/beret_job/cargo + display_name = "Beret, cargo" + path = /obj/item/clothing/head/beret/cargo + allowed_roles = list("Quartermaster", "Cargo Technician") + /datum/gear/hat/beret_job/qm display_name = "Beret, quartermaster" path = /obj/item/clothing/head/beret/qm diff --git a/code/modules/client/preference/loadout/loadout_uniform.dm b/code/modules/client/preference/loadout/loadout_uniform.dm index abc10ea7ce3..a52d1637989 100644 --- a/code/modules/client/preference/loadout/loadout_uniform.dm +++ b/code/modules/client/preference/loadout/loadout_uniform.dm @@ -261,8 +261,8 @@ main_typepath = /datum/gear/uniform/cargo /datum/gear/uniform/cargo/delivery - display_name = "Uniform, delivery boy" - path = /obj/item/clothing/under/rank/cargo/deliveryboy + display_name = "Cargo uniform, delivery" + path = /obj/item/clothing/under/rank/cargo/tech/delivery allowed_roles = list("Quartermaster", "Cargo Technician") /datum/gear/uniform/sec diff --git a/code/modules/clothing/head/beret.dm b/code/modules/clothing/head/beret.dm index 0cf008e5d5e..d1e6b2e4563 100644 --- a/code/modules/clothing/head/beret.dm +++ b/code/modules/clothing/head/beret.dm @@ -156,6 +156,15 @@ "Drask" = 'icons/mob/clothing/species/drask/head/beret.dmi' ) +/obj/item/clothing/head/beret/cargo + name = "cargo beret" + desc = "A brown beret with a grey cargo insignia emblazoned on it. Haul crates with style." + icon_state = "beret_cargo" + sprite_sheets = list( + "Vox" = 'icons/mob/clothing/species/vox/head/beret.dmi', + "Drask" = 'icons/mob/clothing/species/drask/head/beret.dmi' + ) + /obj/item/clothing/head/beret/expedition name = "expedition beret" desc = "A brown beret with a blue Nanotrasen insignia emblazoned on it. Not much good for space protection, but stylish all the same." diff --git a/code/modules/clothing/head/soft_caps.dm b/code/modules/clothing/head/soft_caps.dm index d8388767e59..73613a83967 100644 --- a/code/modules/clothing/head/soft_caps.dm +++ b/code/modules/clothing/head/soft_caps.dm @@ -100,32 +100,17 @@ /obj/item/clothing/head/soft/cargo name = "cargo cap" - desc = "It's a baseball hat in a tasteless yellow colour." + desc = "It's a brown baseball hat with a grey cargo technician shield." icon_state = "cargosoft" item_color = "cargo" dog_fashion = /datum/dog_fashion/head/cargo_tech -/obj/item/clothing/head/soft/deliverysoft - name = "delivery boy cap" - desc = "It's a baseball hat that is part of the delivery boy uniform." - icon_state = "deliverysoft" - item_color = "delivery" - dog_fashion = /datum/dog_fashion/head/softcap - sprite_sheets = list( - "Vox" = 'icons/mob/clothing/species/vox/head/softcap.dmi', - "Drask" = 'icons/mob/clothing/species/drask/head/softcap.dmi', - "Grey" = 'icons/mob/clothing/species/grey/head/softcap.dmi' - ) - /obj/item/clothing/head/soft/expedition name = "expedition cap" desc = "It's a baseball hat in the brown and blue markings of the expedition team." icon_state = "expeditionsoft" item_color = "expedition" armor = list(MELEE = 25, BULLET = 20, LASER = 20, ENERGY = 5, BOMB = 0, RAD = 0, FIRE = 10, ACID = 50) - sprite_sheets = list( - "Vox" = 'icons/mob/clothing/species/vox/head/softcap.dmi' - ) /obj/item/clothing/head/soft/janitorgrey name = "grey janitor's cap" diff --git a/code/modules/clothing/suits/job_suits.dm b/code/modules/clothing/suits/job_suits.dm index 710a654d5cd..f18c22133f2 100644 --- a/code/modules/clothing/suits/job_suits.dm +++ b/code/modules/clothing/suits/job_suits.dm @@ -194,20 +194,43 @@ "Grey" = 'icons/mob/clothing/species/grey/suit.dmi', ) -//Engineering +//Hazard vests /obj/item/clothing/suit/storage/hazardvest name = "hazard vest" - desc = "A high-visibility vest used in work zones." - icon_state = "hazard" - item_state = "hazard" + desc = "A high-visibility vest used in work zones. Designed for general use." + icon = 'icons/obj/clothing/suits/utility.dmi' + icon_state = "hazard_base" + item_state = 'icons/mob/clothing/suits/utility.dmi' + icon_override = 'icons/mob/clothing/suits/utility.dmi' blood_overlay_type = "armor" allowed = list (/obj/item/flashlight, /obj/item/t_scanner, /obj/item/tank/internals/emergency_oxygen, /obj/item/rcd, /obj/item/rpd) resistance_flags = NONE sprite_sheets = list( - "Vox" = 'icons/mob/clothing/species/vox/suit.dmi' + "Vox" = 'icons/mob/clothing/species/vox/suits/utility.dmi', + "Kidan" = 'icons/mob/clothing/species/kidan/suits/utility.dmi', + "Drask" = 'icons/mob/clothing/species/drask/suits/utility.dmi', + "Grey" = 'icons/mob/clothing/species/grey/suits/utility.dmi' ) +/obj/item/clothing/suit/storage/hazardvest/staff + name = "staff hazard vest" + desc = "A high-visibilty vest used in work zones. Designed to easily identify station staff from visitors." + icon_state = "hazard_staff" + allowed = list(/obj/item/flashlight, /obj/item/t_scanner, /obj/item/tank/internals/emergency_oxygen, /obj/item/paper, /obj/item/clipboard, /obj/item/analyzer, /obj/item/screwdriver, /obj/item/radio, /obj/item/wrench, /obj/item/weldingtool, /obj/item/crowbar, /obj/item/wirecutters, /obj/item/rcd, /obj/item/rpd, /obj/item/rcs, /obj/item/destTagger) + +/obj/item/clothing/suit/storage/hazardvest/qm + name = "warehouse supervisor hazard vest" + desc = "A high-visibilty vest used in work zones. Designed to easily identify the supply supervisor." + icon_state = "hazard_qm" + allowed = list(/obj/item/flashlight, /obj/item/t_scanner, /obj/item/tank/internals/emergency_oxygen, /obj/item/paper, /obj/item/clipboard, /obj/item/analyzer, /obj/item/screwdriver, /obj/item/radio, /obj/item/wrench, /obj/item/weldingtool, /obj/item/crowbar, /obj/item/wirecutters, /obj/item/rcs, /obj/item/destTagger, /obj/item/melee/baton, /obj/item/flashlight/seclite, /obj/item/melee/classic_baton/telescopic, /obj/item/melee/knuckleduster) + +/obj/item/clothing/suit/storage/hazardvest/ce + name = "foreman hazard vest" + desc = "A high-visibility vest used in work zones. Designed to easily identify the engineering supervisor." + icon_state = "hazard_ce" + allowed = list(/obj/item/flashlight, /obj/item/t_scanner, /obj/item/tank/internals/emergency_oxygen, /obj/item/paper, /obj/item/clipboard, /obj/item/analyzer, /obj/item/screwdriver, /obj/item/radio, /obj/item/wrench, /obj/item/weldingtool, /obj/item/crowbar, /obj/item/wirecutters, /obj/item/rcd, /obj/item/rpd, /obj/item/destTagger, /obj/item/melee/baton, /obj/item/flashlight/seclite, /obj/item/melee/classic_baton/telescopic) + //Internal Affairs /obj/item/clothing/suit/storage/iaa desc = "A snappy dress jacket." diff --git a/code/modules/clothing/under/accessories/armband.dm b/code/modules/clothing/under/accessories/armband.dm index b8cc45dbe75..739b23e9605 100644 --- a/code/modules/clothing/under/accessories/armband.dm +++ b/code/modules/clothing/under/accessories/armband.dm @@ -19,7 +19,7 @@ /obj/item/clothing/accessory/armband/cargo name = "cargo armband" - desc = "An armband, worn by the crew to display which department they're assigned to. This one is brown." + desc = "An armband, worn by the crew to display which department they're assigned to. This one is brown with a black strip." icon_state = "cargo" item_color = "cargo" diff --git a/code/modules/clothing/under/jobs/cargo.dm b/code/modules/clothing/under/jobs/cargo.dm index 95e73e589d8..c77a1deba89 100644 --- a/code/modules/clothing/under/jobs/cargo.dm +++ b/code/modules/clothing/under/jobs/cargo.dm @@ -45,25 +45,33 @@ item_state = "qm_whimsy" item_color = "qm_whimsy" -/obj/item/clothing/under/rank/cargo/deliveryboy - name = "delivery boy uniform" - desc = "It's a jumpsuit worn by the cargo delivery boy." - icon_state = "delivery" - item_state = "lb_suit" - item_color = "delivery" - /obj/item/clothing/under/rank/cargo/tech name = "cargo technician's jumpsuit" - desc = "Shooooorts! They're comfy and easy to wear!" - icon_state = "cargotech" - item_state = "lb_suit" + desc = "A standard issue jumpsuit for cargo technicians. Snazzy!" + icon_state = "cargo" + item_state = "cargo" item_color = "cargo" /obj/item/clothing/under/rank/cargo/tech/skirt name = "cargo technician's jumpskirt" - desc = "Skirrrrrts! They're comfy and easy to wear!" - icon_state = "cargof" - item_color = "cargof" + desc = "A standard issue jumpskirt for cargo technicians. Jazzy!" + icon_state = "cargo_skirt" + item_state = "cargo_skirt" + item_color = "cargo_skirt" + +/obj/item/clothing/under/rank/cargo/tech/overalls + name = "cargo technician's overalls" + desc = "Protective overalls to keep spills from the warehouse off your legs." + icon_state = "cargo_overalls" + item_state = "cargo_overalls" + item_color = "cargo_overalls" + +/obj/item/clothing/under/rank/cargo/tech/delivery + name = "delivery uniform" + desc = "It's a jumpsuit worn by the cargo delivery crew." + icon_state = "delivery" + item_state = "delivery" + item_color = "delivery" /obj/item/clothing/under/rank/cargo/miner name = "shaft miner's jumpsuit" diff --git a/code/modules/supply/supply_packs/pack_engineering.dm b/code/modules/supply/supply_packs/pack_engineering.dm index f75fbf64f1e..90def379851 100644 --- a/code/modules/supply/supply_packs/pack_engineering.dm +++ b/code/modules/supply/supply_packs/pack_engineering.dm @@ -61,9 +61,9 @@ contains = list(/obj/item/storage/belt/utility, /obj/item/storage/belt/utility, /obj/item/storage/belt/utility, - /obj/item/clothing/suit/storage/hazardvest, - /obj/item/clothing/suit/storage/hazardvest, - /obj/item/clothing/suit/storage/hazardvest, + /obj/item/clothing/suit/storage/hazardvest/staff, + /obj/item/clothing/suit/storage/hazardvest/staff, + /obj/item/clothing/suit/storage/hazardvest/staff, /obj/item/clothing/head/welding, /obj/item/clothing/head/welding, /obj/item/clothing/head/welding, diff --git a/icons/mob/clothing/head/beret.dmi b/icons/mob/clothing/head/beret.dmi index 70b98484b47..21e09de429d 100644 Binary files a/icons/mob/clothing/head/beret.dmi and b/icons/mob/clothing/head/beret.dmi differ diff --git a/icons/mob/clothing/head/softcap.dmi b/icons/mob/clothing/head/softcap.dmi index 679d6da4602..3501b959151 100644 Binary files a/icons/mob/clothing/head/softcap.dmi and b/icons/mob/clothing/head/softcap.dmi differ diff --git a/icons/mob/clothing/species/drask/head/beret.dmi b/icons/mob/clothing/species/drask/head/beret.dmi index 2103275d92c..c0d8b6a4eeb 100644 Binary files a/icons/mob/clothing/species/drask/head/beret.dmi and b/icons/mob/clothing/species/drask/head/beret.dmi differ diff --git a/icons/mob/clothing/species/drask/head/softcap.dmi b/icons/mob/clothing/species/drask/head/softcap.dmi deleted file mode 100644 index 80b30836107..00000000000 Binary files a/icons/mob/clothing/species/drask/head/softcap.dmi and /dev/null differ diff --git a/icons/mob/clothing/species/drask/suit.dmi b/icons/mob/clothing/species/drask/suit.dmi index a386bd8186c..c5928bfa9e3 100644 Binary files a/icons/mob/clothing/species/drask/suit.dmi and b/icons/mob/clothing/species/drask/suit.dmi differ diff --git a/icons/mob/clothing/species/drask/suits/utility.dmi b/icons/mob/clothing/species/drask/suits/utility.dmi new file mode 100644 index 00000000000..f662b77ffc0 Binary files /dev/null and b/icons/mob/clothing/species/drask/suits/utility.dmi differ diff --git a/icons/mob/clothing/species/drask/under/cargo.dmi b/icons/mob/clothing/species/drask/under/cargo.dmi index 79a977b93ac..94e368af873 100644 Binary files a/icons/mob/clothing/species/drask/under/cargo.dmi and b/icons/mob/clothing/species/drask/under/cargo.dmi differ diff --git a/icons/mob/clothing/species/grey/head/softcap.dmi b/icons/mob/clothing/species/grey/head/softcap.dmi deleted file mode 100644 index d895bae150b..00000000000 Binary files a/icons/mob/clothing/species/grey/head/softcap.dmi and /dev/null differ diff --git a/icons/mob/clothing/species/grey/suit.dmi b/icons/mob/clothing/species/grey/suit.dmi index 541c0b645cd..4a2fcea2947 100644 Binary files a/icons/mob/clothing/species/grey/suit.dmi and b/icons/mob/clothing/species/grey/suit.dmi differ diff --git a/icons/mob/clothing/species/grey/suits/utility.dmi b/icons/mob/clothing/species/grey/suits/utility.dmi new file mode 100644 index 00000000000..3efc41e43d4 Binary files /dev/null and b/icons/mob/clothing/species/grey/suits/utility.dmi differ diff --git a/icons/mob/clothing/species/grey/under/cargo.dmi b/icons/mob/clothing/species/grey/under/cargo.dmi index 3c1dd10876b..8c1a4baca8f 100644 Binary files a/icons/mob/clothing/species/grey/under/cargo.dmi and b/icons/mob/clothing/species/grey/under/cargo.dmi differ diff --git a/icons/mob/clothing/species/kidan/suit.dmi b/icons/mob/clothing/species/kidan/suit.dmi index b13cac11f91..c0b462ec365 100644 Binary files a/icons/mob/clothing/species/kidan/suit.dmi and b/icons/mob/clothing/species/kidan/suit.dmi differ diff --git a/icons/mob/clothing/species/kidan/suits/utility.dmi b/icons/mob/clothing/species/kidan/suits/utility.dmi new file mode 100644 index 00000000000..89bed675b8f Binary files /dev/null and b/icons/mob/clothing/species/kidan/suits/utility.dmi differ diff --git a/icons/mob/clothing/species/kidan/under/cargo.dmi b/icons/mob/clothing/species/kidan/under/cargo.dmi index de0bba7d66c..8b8b7f9bd71 100644 Binary files a/icons/mob/clothing/species/kidan/under/cargo.dmi and b/icons/mob/clothing/species/kidan/under/cargo.dmi differ diff --git a/icons/mob/clothing/species/vox/head/beret.dmi b/icons/mob/clothing/species/vox/head/beret.dmi index f2544b868d1..2cbc4a60c40 100644 Binary files a/icons/mob/clothing/species/vox/head/beret.dmi and b/icons/mob/clothing/species/vox/head/beret.dmi differ diff --git a/icons/mob/clothing/species/vox/head/softcap.dmi b/icons/mob/clothing/species/vox/head/softcap.dmi index 0f9259e2735..3a206cd9102 100644 Binary files a/icons/mob/clothing/species/vox/head/softcap.dmi and b/icons/mob/clothing/species/vox/head/softcap.dmi differ diff --git a/icons/mob/clothing/species/vox/suit.dmi b/icons/mob/clothing/species/vox/suit.dmi index 71538568657..abb2f1fd9d9 100644 Binary files a/icons/mob/clothing/species/vox/suit.dmi and b/icons/mob/clothing/species/vox/suit.dmi differ diff --git a/icons/mob/clothing/species/vox/suits/utility.dmi b/icons/mob/clothing/species/vox/suits/utility.dmi new file mode 100644 index 00000000000..465865625a7 Binary files /dev/null and b/icons/mob/clothing/species/vox/suits/utility.dmi differ diff --git a/icons/mob/clothing/species/vox/under/cargo.dmi b/icons/mob/clothing/species/vox/under/cargo.dmi index 5d94ed9a428..2a1b3e5b6ac 100644 Binary files a/icons/mob/clothing/species/vox/under/cargo.dmi and b/icons/mob/clothing/species/vox/under/cargo.dmi differ diff --git a/icons/mob/clothing/suit.dmi b/icons/mob/clothing/suit.dmi index 4d0ccf481df..b6d7857a195 100644 Binary files a/icons/mob/clothing/suit.dmi and b/icons/mob/clothing/suit.dmi differ diff --git a/icons/mob/clothing/suits/utility.dmi b/icons/mob/clothing/suits/utility.dmi new file mode 100644 index 00000000000..624777707b5 Binary files /dev/null and b/icons/mob/clothing/suits/utility.dmi differ diff --git a/icons/mob/clothing/under/cargo.dmi b/icons/mob/clothing/under/cargo.dmi index 37b367cfc68..f133a2541e2 100644 Binary files a/icons/mob/clothing/under/cargo.dmi and b/icons/mob/clothing/under/cargo.dmi differ diff --git a/icons/mob/corgi_head.dmi b/icons/mob/corgi_head.dmi index 8aed2ec5802..60238309b40 100644 Binary files a/icons/mob/corgi_head.dmi and b/icons/mob/corgi_head.dmi differ diff --git a/icons/mob/ties.dmi b/icons/mob/ties.dmi index cf13a3e0510..9e75a84b8c2 100644 Binary files a/icons/mob/ties.dmi and b/icons/mob/ties.dmi differ diff --git a/icons/obj/clothing/head/beret.dmi b/icons/obj/clothing/head/beret.dmi index 35900a326ed..ffad0feca82 100644 Binary files a/icons/obj/clothing/head/beret.dmi and b/icons/obj/clothing/head/beret.dmi differ diff --git a/icons/obj/clothing/head/softcap.dmi b/icons/obj/clothing/head/softcap.dmi index 1a518b64445..a3e3d8d0983 100644 Binary files a/icons/obj/clothing/head/softcap.dmi and b/icons/obj/clothing/head/softcap.dmi differ diff --git a/icons/obj/clothing/suits.dmi b/icons/obj/clothing/suits.dmi index f1781a9e17a..dd7b86e0d1d 100644 Binary files a/icons/obj/clothing/suits.dmi and b/icons/obj/clothing/suits.dmi differ diff --git a/icons/obj/clothing/suits/utility.dmi b/icons/obj/clothing/suits/utility.dmi new file mode 100644 index 00000000000..44e915c5a9c Binary files /dev/null and b/icons/obj/clothing/suits/utility.dmi differ diff --git a/icons/obj/clothing/ties.dmi b/icons/obj/clothing/ties.dmi index 44b18e06c3f..67df0290cfe 100644 Binary files a/icons/obj/clothing/ties.dmi and b/icons/obj/clothing/ties.dmi differ diff --git a/icons/obj/clothing/ties_overlay.dmi b/icons/obj/clothing/ties_overlay.dmi index e4c15f3ae0d..0351b908a2f 100644 Binary files a/icons/obj/clothing/ties_overlay.dmi and b/icons/obj/clothing/ties_overlay.dmi differ diff --git a/icons/obj/clothing/under/cargo.dmi b/icons/obj/clothing/under/cargo.dmi index 7d4723fc3f1..7b6e9bb0bfc 100644 Binary files a/icons/obj/clothing/under/cargo.dmi and b/icons/obj/clothing/under/cargo.dmi differ diff --git a/icons/obj/vending.dmi b/icons/obj/vending.dmi index 12b2031f1d9..8c41c57685a 100755 Binary files a/icons/obj/vending.dmi and b/icons/obj/vending.dmi differ