cyberpresidentvanellope/Polaris
1
0
Fork 0
mirror of https://github.com/PolarisSS13/Polaris.git synced 2026-01-06 07:22:42 +00:00
Code Issues Packages Projects Releases Wiki Activity

Basic Uniform Polish: Cargo

Browse Source
This commit is contained in:
Cerebulon
2022-11-06 02:58:15 +00:00
parent 24068ba2eb
commit 70d3e185ed
21 changed files with 84 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
code/datums/outfits/jobs/cargo.dm
View File

@@ -1,11 +1,11 @@
/decl/hierarchy/outfit/job/cargo
l_ear = /obj/item/radio/headset/headset_cargo
hierarchy_type = /decl/hierarchy/outfit/job/cargo
shoes = /obj/item/clothing/shoes/boots/workboots
/decl/hierarchy/outfit/job/cargo/qm
name = OUTFIT_JOB_NAME("Cargo")
uniform = /obj/item/clothing/under/rank/cargo
shoes = /obj/item/clothing/shoes/brown
glasses = /obj/item/clothing/glasses/sunglasses
l_hand = /obj/item/clipboard
id_type = /obj/item/card/id/cargo/head
@@ -19,7 +19,7 @@
/decl/hierarchy/outfit/job/cargo/mining
name = OUTFIT_JOB_NAME("Shaft miner")
uniform = /obj/item/clothing/under/rank/miner
uniform = /obj/item/clothing/under/rank/miner{ starting_accessories=list(/obj/item/clothing/accessory/storage/overalls) }
l_ear = /obj/item/radio/headset/headset_mine
backpack = /obj/item/storage/backpack/industrial
satchel_one = /obj/item/storage/backpack/satchel/eng

13
code/game/objects/structures/crates_lockers/closets/secure/cargo.dm
View File

@@ -5,15 +5,12 @@
starts_with = list(
/obj/item/clothing/under/rank/cargotech,
/obj/item/clothing/under/rank/cargotech/skirt,
/obj/item/clothing/under/rank/cargotech/jeans,
/obj/item/clothing/under/rank/cargotech/jeans/female,
/obj/item/clothing/suit/storage/hooded/wintercoat/cargo,
/obj/item/clothing/shoes/boots/winter/supply,
/obj/item/clothing/shoes/black,
/obj/item/radio/headset/headset_cargo,
/obj/item/radio/headset/headset_cargo/alt,
/obj/item/clothing/gloves/black,
/obj/item/clothing/gloves/duty,
/obj/item/clothing/gloves/fingerless,
/obj/item/clothing/head/soft)
@@ -33,13 +30,10 @@
starts_with = list(
/obj/item/clothing/under/rank/cargo,
/obj/item/clothing/under/rank/cargo/skirt,
/obj/item/clothing/under/rank/cargo/jeans,
/obj/item/clothing/under/rank/cargo/jeans/female,
/obj/item/clothing/shoes/brown,
/obj/item/radio/headset/headset_cargo,
/obj/item/radio/headset/headset_cargo/alt,
/obj/item/clothing/gloves/black,
/obj/item/clothing/gloves/duty,
/obj/item/clothing/gloves/fingerless,
/obj/item/clothing/suit/fire,
/obj/item/tank/emergency/oxygen,
@@ -67,7 +61,8 @@
starts_with = list(
/obj/item/radio/headset/headset_mine,
/obj/item/clothing/under/rank/miner,
/obj/item/clothing/gloves/black,
/obj/item/clothing/accessory/storage/overalls,
/obj/item/clothing/gloves/duty,
/obj/item/clothing/shoes/black,
/obj/item/analyzer,
/obj/item/storage/bag/ore,

12
code/modules/client/preference_setup/loadout/loadout_accessories.dm
View File

@@ -181,6 +181,18 @@
pouchtype["drop pouches, white"] = /obj/item/clothing/accessory/storage/white_drop_pouches
gear_tweaks += new/datum/gear_tweak/path(pouchtype)
/datum/gear/accessory/overalls
display_name = "utility overalls selection (Engineering, Cargo)"
path = /obj/item/clothing/accessory/storage/overalls
allowed_roles = list("Station Engineer", "Atmospheric Technician", "Chief Engineer", "Cargo Technician", "Quartermaster", "Shaft Miner")
/datum/gear/accessory/overalls/New()
..()
var/overalltype = list()
overalltype["overalls, high-vis stripe"] = /obj/item/clothing/accessory/storage/overalls
overalltype["overalls, brown"] = /obj/item/clothing/accessory/storage/overalls/engineer
gear_tweaks += new/datum/gear_tweak/path(overalltype)
/datum/gear/accessory/fannypack
display_name = "fannypack selection"
cost = 2

12
code/modules/client/preference_setup/loadout/loadout_shoes.dm
View File

@@ -19,13 +19,17 @@
gear_tweaks += new/datum/gear_tweak/path(sortAssoc(jacks))
/datum/gear/shoes/workboots
display_name = "workboots"
display_name = "workboots selection"
path = /obj/item/clothing/shoes/boots/workboots
cost = 2
/datum/gear/shoes/workboots/toeless
display_name = "workboots, toe-less"
path = /obj/item/clothing/shoes/boots/workboots/toeless
/datum/gear/shoes/workboots/New()
..()
var/list/works = list()
for(var/work in typesof(/obj/item/clothing/shoes/boots/workboots))
var/obj/item/clothing/shoes/boots/workboots/work_type = work
works[initial(work_type.name)] = work_type
gear_tweaks += new/datum/gear_tweak/path(sortAssoc(works))
/datum/gear/shoes/colored
display_name = "shoes, colored selection"

47
code/modules/client/preference_setup/loadout/loadout_uniform.dm
View File

@@ -145,8 +145,6 @@
skirttype["skirt, virologist"] = /obj/item/clothing/under/rank/virologist/skirt
skirttype["skirt, medical"] = /obj/item/clothing/under/rank/medical/skirt
skirttype["skirt, scientist"] = /obj/item/clothing/under/rank/scientist/skirt
skirttype["skirt, cargo"] = /obj/item/clothing/under/rank/cargotech/skirt
skirttype["skirt, quartermaster"] = /obj/item/clothing/under/rank/cargotech/skirt
gear_tweaks += new/datum/gear_tweak/path(skirttype)
/datum/gear/uniform/job_turtle
@@ -163,25 +161,38 @@
turtletype["turtleneck, medical"] = /obj/item/clothing/under/rank/medical/turtleneck
gear_tweaks += new/datum/gear_tweak/path(turtletype)
/datum/gear/uniform/jeans_qm
display_name = "jeans, QM"
/datum/gear/uniform/uniform_cargo
display_name = "uniform, cargo selection"
description = "A selection of standard uniforms for cargo department employees."
path = /obj/item/clothing/under/rank/cargotech/jeans
allowed_roles = list("Quartermaster", "Shaft Miner", "Cargo Technician")
/datum/gear/uniform/uniform_cargo/New()
..()
var/cargotype = list()
cargotype["cargo uniform, shorts"] = /obj/item/clothing/under/rank/cargotech/shorts
cargotype["cargo uniform, jeans"] = /obj/item/clothing/under/rank/cargotech/jeans
cargotype["cargo uniform, feminine jeans"] = /obj/item/clothing/under/rank/cargotech/jeans/female
cargotype["cargo uniform, skirt"] = /obj/item/clothing/under/rank/cargotech/skirt
gear_tweaks += new/datum/gear_tweak/path(cargotype)
/datum/gear/uniform/uniform_qm
display_name = "uniform, quartermaster selection"
description = "A selection of standard uniforms for the quartermaster."
path = /obj/item/clothing/under/rank/cargo/jeans
allowed_roles = list("Quartermaster")
/datum/gear/uniform/jeans_qmf
display_name = "jeans, feminine QM"
path = /obj/item/clothing/under/rank/cargo/jeans/female
allowed_roles = list("Quartermaster")
/datum/gear/uniform/uniform_qm/New()
..()
var/qmtype = list()
qmtype["quartermaster uniform, jeans"] = /obj/item/clothing/under/rank/cargo/jeans
qmtype["quartermaster uniform, feminine jeans"] = /obj/item/clothing/under/rank/cargo/jeans/female
qmtype["quartermaster uniform, skirt"] = /obj/item/clothing/under/rank/cargo/skirt
gear_tweaks += new/datum/gear_tweak/path(qmtype)
/datum/gear/uniform/jeans_cargo
display_name = "jeans, cargo"
path = /obj/item/clothing/under/rank/cargotech/jeans
allowed_roles = list("Quartermaster","Cargo Technician")
/datum/gear/uniform/jeans_cargof
display_name = "jeans, feminine cargo"
path = /obj/item/clothing/under/rank/cargotech/jeans/female
allowed_roles = list("Quartermaster","Cargo Technician")
/datum/gear/uniform/old_miner
display_name = "overalls, purple shirt"
path = /obj/item/clothing/under/rank/miner/old
/datum/gear/uniform/suit_lawyer
display_name = "suit, one-piece selection"
@@ -468,7 +479,7 @@
path = /obj/item/clothing/under/circuitry
/datum/gear/uniform/sleekoverall
display_name = "sleek overalls"
display_name = "overalls, sleek"
path = /obj/item/clothing/under/overalls/sleek
/datum/gear/uniform/sarired

14
code/modules/clothing/shoes/boots.dm
View File

@@ -77,10 +77,22 @@
/obj/item/clothing/shoes/boots/workboots/toeless
name = "toe-less workboots"
desc = "A pair of toeless work boots designed for use in industrial settings. Modified for species whose toes have claws."
icon_state = "workbootstoeless"
icon_state = "workboots_toeless"
item_state_slots = list(slot_r_hand_str = "workboots", slot_l_hand_str = "workboots")
species_restricted = null
/obj/item/clothing/shoes/boots/workboots/dark
icon_state = "workboots_dark"
/obj/item/clothing/shoes/boots/workboots/grey
icon_state = "workboots_grey"
/obj/item/clothing/shoes/boots/workboots/toeless/dark
icon_state = "workboots_dark_toeless"
/obj/item/clothing/shoes/boots/workboots/toeless/grey
icon_state = "workboots_grey_toeless"
/obj/item/clothing/shoes/boots/winter
name = "winter boots"
desc = "Boots lined with 'synthetic' animal fur."

7
code/modules/clothing/under/accessories/storage.dm
View File

@@ -105,12 +105,13 @@
new /obj/item/material/knife/machete/hatchet/unathiknife(hold)
/obj/item/clothing/accessory/storage/overalls
name = "overalls"
desc = "Heavy-duty overalls for use on the work site, with plenty of convenient pockets to boot."
name = "dark overalls"
desc = "Heavy-duty overalls with reflective strips for use on the work site, with plenty of convenient pockets to boot."
icon_state = "mining_overalls"
/obj/item/clothing/accessory/storage/overalls/engineer
name = "engineer's overalls"
name = "brown overalls"
desc = "Heavy-duty overalls for use on the work site, with plenty of convenient pockets to boot."
icon_state = "engineering_overalls"
/obj/item/clothing/accessory/storage/overalls/chief

14
code/modules/clothing/under/jobs/civilian.dm
View File

@@ -48,11 +48,16 @@
/obj/item/clothing/under/rank/cargotech
name = "cargo technician's jumpsuit"
desc = "Shooooorts! They're comfy and easy to wear!"
desc = "Practical high-visibility workwear for lugging crates at the crack of dawn."
icon_state = "cargo"
body_parts_covered = UPPER_TORSO|LOWER_TORSO|ARMS
rolled_sleeves = 0
/obj/item/clothing/under/rank/cargotech/shorts
name = "cargo technician's shorts"
desc = "Shooooorts! They're comfy and easy to wear!"
icon_state = "cargoshorts"
/obj/item/clothing/under/rank/cargotech/jeans
name = "cargo technician's jumpjeans"
desc = "Jeeeaaans! They're comfy!"
@@ -311,7 +316,12 @@
icon_state = "mime"
/obj/item/clothing/under/rank/miner
desc = "It's a snappy jumpsuit with a sturdy set of overalls. It is very dirty."
name = "shaft miner's jumpsuit"
desc = "A branded high-vis jumpsuit for toiling in the mines. Somehow it's dirty already."
icon_state = "miner"
rolled_sleeves = 0
/obj/item/clothing/under/rank/miner/old
name = "miner's jumpsuit"
desc = "It's a snappy purple shirt with a sturdy set of overalls. Very retro."
icon_state = "miner_old"