diff --git a/code/game/objects/items/weapons/storage/backpack.dm b/code/game/objects/items/weapons/storage/backpack.dm index d3c26d453c..5f3487a667 100644 --- a/code/game/objects/items/weapons/storage/backpack.dm +++ b/code/game/objects/items/weapons/storage/backpack.dm @@ -142,6 +142,58 @@ desc = "It's an orange backpack which was designed to hold beakers, pill bottles and bottles." icon_state = "chempack" +/obj/item/weapon/storage/backpack/dufflebag + name = "dufflebag" + desc = "A large dufflebag for holding extra things." + icon_state = "duffle" + item_state = "duffle" + slowdown = 1 + max_storage_space = 56 + storage_slots = 20 + +/obj/item/weapon/storage/backpack/dufflebag/syndie + name = "suspicious looking dufflebag" + desc = "A large dufflebag for holding extra tactical supplies." + icon_state = "duffle_syndie" + item_state = "duffle_syndiemed" + slowdown = 0 + +/obj/item/weapon/storage/backpack/dufflebag/syndie/med + name = "medical dufflebag" + desc = "A large dufflebag for holding extra tactical medical supplies." + icon_state = "duffle_syndiemed" + item_state = "duffle_syndiemed" + +/obj/item/weapon/storage/backpack/dufflebag/syndie/ammo + name = "ammunition dufflebag" + desc = "A large dufflebag for holding extra weapons ammunition and supplies." + icon_state = "duffle_syndieammo" + item_state = "duffle_syndieammo" + +/obj/item/weapon/storage/backpack/dufflebag/captain + name = "captain's dufflebag" + desc = "A large dufflebag for holding extra captainly goods." + icon_state = "duffle_captain" + item_state = "duffle_captain" + +/obj/item/weapon/storage/backpack/dufflebag/med + name = "medical dufflebag" + desc = "A large dufflebag for holding extra medical supplies." + icon_state = "duffle_med" + item_state = "duffle_med" + +/obj/item/weapon/storage/backpack/dufflebag/sec + name = "security dufflebag" + desc = "A large dufflebag for holding extra security supplies and ammunition." + icon_state = "duffle_sec" + item_state = "duffle_sec" + +/obj/item/weapon/storage/backpack/dufflebag/eng + name = "industrial dufflebag" + desc = "A large dufflebag for holding extra tools and supplies." + icon_state = "duffle_eng" + item_state = "duffle_eng" + /* * Satchel Types */ diff --git a/code/game/objects/structures/crates_lockers/closets/secure/cargo.dm b/code/game/objects/structures/crates_lockers/closets/secure/cargo.dm index c73d749736..57f87193f4 100644 --- a/code/game/objects/structures/crates_lockers/closets/secure/cargo.dm +++ b/code/game/objects/structures/crates_lockers/closets/secure/cargo.dm @@ -12,6 +12,9 @@ ..() new /obj/item/clothing/under/rank/cargotech(src) new /obj/item/clothing/under/rank/cargotech/skirt(src) + new /obj/item/clothing/under/rank/cargotech/jeans(src) + new /obj/item/clothing/under/rank/cargotech/jeans/female(src) + new /obj/item/clothing/suit/hooded/wintercoat/cargo(src) new /obj/item/clothing/shoes/black(src) new /obj/item/device/radio/headset/headset_cargo(src) new /obj/item/clothing/gloves/black(src) @@ -33,6 +36,8 @@ ..() new /obj/item/clothing/under/rank/cargo(src) new /obj/item/clothing/under/rank/cargo/skirt(src) + new /obj/item/clothing/under/rank/cargo/jeans(src) + new /obj/item/clothing/under/rank/cargo/jeans/female(src) new /obj/item/clothing/shoes/brown(src) new /obj/item/device/radio/headset/headset_cargo(src) new /obj/item/clothing/gloves/black(src) @@ -42,4 +47,5 @@ new /obj/item/clothing/mask/gas(src) new /obj/item/clothing/glasses/meson(src) new /obj/item/clothing/head/soft(src) + new /obj/item/clothing/suit/hooded/wintercoat/cargo(src) return diff --git a/code/game/objects/structures/crates_lockers/closets/secure/engineering.dm b/code/game/objects/structures/crates_lockers/closets/secure/engineering.dm index 6e52867bfd..a154da88bd 100644 --- a/code/game/objects/structures/crates_lockers/closets/secure/engineering.dm +++ b/code/game/objects/structures/crates_lockers/closets/secure/engineering.dm @@ -15,6 +15,10 @@ new /obj/item/weapon/storage/backpack/industrial(src) else new /obj/item/weapon/storage/backpack/satchel_eng(src) + if(prob(50)) + new /obj/item/weapon/storage/backpack/dufflebag/eng(src) + else + return if (prob(70)) new /obj/item/clothing/accessory/storage/brown_vest(src) else @@ -28,12 +32,14 @@ new /obj/item/clothing/shoes/brown(src) new /obj/item/weapon/cartridge/ce(src) new /obj/item/device/radio/headset/heads/ce(src) + new /obj/item/device/radio/headset/heads/ce/alt(src) new /obj/item/weapon/storage/toolbox/mechanical(src) new /obj/item/clothing/suit/storage/hazardvest(src) new /obj/item/clothing/mask/gas(src) new /obj/item/device/multitool(src) new /obj/item/device/flash(src) new /obj/item/taperoll/engineering(src) + new /obj/item/clothing/suit/hooded/wintercoat/engineering(src) return @@ -109,17 +115,23 @@ new /obj/item/weapon/storage/backpack/industrial(src) else new /obj/item/weapon/storage/backpack/satchel_eng(src) + if(prob(50)) + new /obj/item/weapon/storage/backpack/dufflebag/eng(src) + else + return if (prob(70)) new /obj/item/clothing/accessory/storage/brown_vest(src) else new /obj/item/clothing/accessory/storage/webbing(src) new /obj/item/weapon/storage/toolbox/mechanical(src) new /obj/item/device/radio/headset/headset_eng(src) + new /obj/item/device/radio/headset/headset_eng/alt(src) new /obj/item/clothing/suit/storage/hazardvest(src) new /obj/item/clothing/mask/gas(src) new /obj/item/clothing/glasses/meson(src) new /obj/item/weapon/cartridge/engineering(src) new /obj/item/taperoll/engineering(src) + new /obj/item/clothing/suit/hooded/wintercoat/engineering(src) return /obj/structure/closet/secure_closet/atmos_personal name = "technician's locker" @@ -138,6 +150,10 @@ new /obj/item/weapon/storage/backpack/industrial(src) else new /obj/item/weapon/storage/backpack/satchel_eng(src) + if(prob(50)) + new /obj/item/weapon/storage/backpack/dufflebag/eng(src) + else + return if (prob(70)) new /obj/item/clothing/accessory/storage/brown_vest(src) else @@ -146,8 +162,10 @@ new /obj/item/device/flashlight(src) new /obj/item/weapon/extinguisher(src) new /obj/item/device/radio/headset/headset_eng(src) + new /obj/item/device/radio/headset/headset_eng/alt(src) new /obj/item/clothing/suit/storage/hazardvest(src) new /obj/item/clothing/mask/gas(src) new /obj/item/weapon/cartridge/atmos(src) new /obj/item/taperoll/engineering(src) + new /obj/item/clothing/suit/hooded/wintercoat/engineering/atmos(src) return diff --git a/code/game/objects/structures/crates_lockers/closets/secure/medical.dm b/code/game/objects/structures/crates_lockers/closets/secure/medical.dm index d1ae3ac464..2d10a8f6b4 100644 --- a/code/game/objects/structures/crates_lockers/closets/secure/medical.dm +++ b/code/game/objects/structures/crates_lockers/closets/secure/medical.dm @@ -66,6 +66,10 @@ new /obj/item/weapon/storage/backpack/medic(src) else new /obj/item/weapon/storage/backpack/satchel_med(src) + if(prob(50)) + new /obj/item/weapon/storage/backpack/dufflebag/med(src) + else + return new /obj/item/clothing/under/rank/nursesuit (src) new /obj/item/clothing/head/nursehat (src) switch(pick("blue", "green", "purple")) @@ -96,6 +100,8 @@ new /obj/item/clothing/shoes/white(src) // new /obj/item/weapon/cartridge/medical(src) new /obj/item/device/radio/headset/headset_med(src) + new /obj/item/device/radio/headset/headset_med/alt(src) + new /obj/item/clothing/suit/hooded/wintercoat/medical(src) return @@ -116,6 +122,10 @@ new /obj/item/weapon/storage/backpack/medic(src) else new /obj/item/weapon/storage/backpack/satchel_med(src) + if(prob(50)) + new /obj/item/weapon/storage/backpack/dufflebag/med(src) + else + return new /obj/item/clothing/suit/bio_suit/cmo(src) new /obj/item/clothing/head/bio_hood/cmo(src) new /obj/item/clothing/shoes/white(src) @@ -137,8 +147,10 @@ new /obj/item/clothing/gloves/latex(src) new /obj/item/clothing/shoes/brown (src) new /obj/item/device/radio/headset/heads/cmo(src) + new /obj/item/device/radio/headset/heads/cmo/alt(src) new /obj/item/device/flash(src) new /obj/item/weapon/reagent_containers/hypospray(src) + new /obj/item/clothing/suit/hooded/wintercoat/medical(src) return diff --git a/code/game/objects/structures/crates_lockers/closets/secure/scientist.dm b/code/game/objects/structures/crates_lockers/closets/secure/scientist.dm index 0578b79356..15e1fd259e 100644 --- a/code/game/objects/structures/crates_lockers/closets/secure/scientist.dm +++ b/code/game/objects/structures/crates_lockers/closets/secure/scientist.dm @@ -45,6 +45,7 @@ new /obj/item/clothing/shoes/leather(src) new /obj/item/clothing/gloves/latex(src) new /obj/item/device/radio/headset/heads/rd(src) + new /obj/item/device/radio/headset/heads/rd/alt(src) new /obj/item/weapon/tank/air(src) new /obj/item/clothing/mask/gas(src) new /obj/item/device/flash(src) diff --git a/code/game/objects/structures/crates_lockers/closets/secure/security.dm b/code/game/objects/structures/crates_lockers/closets/secure/security.dm index 1bbc3dbc8a..07b7ce65ce 100644 --- a/code/game/objects/structures/crates_lockers/closets/secure/security.dm +++ b/code/game/objects/structures/crates_lockers/closets/secure/security.dm @@ -14,6 +14,10 @@ new /obj/item/weapon/storage/backpack/captain(src) else new /obj/item/weapon/storage/backpack/satchel_cap(src) + if(prob(50)) + new /obj/item/weapon/storage/backpack/dufflebag/captain(src) + else + return new /obj/item/clothing/suit/captunic(src) new /obj/item/clothing/suit/captunic/capjacket(src) new /obj/item/clothing/head/caphat/cap(src) @@ -23,6 +27,7 @@ new /obj/item/clothing/head/helmet/swat(src) new /obj/item/clothing/shoes/brown(src) new /obj/item/device/radio/headset/heads/captain(src) + new /obj/item/device/radio/headset/heads/captain/alt(src) new /obj/item/clothing/gloves/captain(src) new /obj/item/weapon/gun/energy/gun(src) new /obj/item/clothing/suit/armor/captain(src) @@ -30,6 +35,7 @@ new /obj/item/clothing/under/dress/dress_cap(src) new /obj/item/clothing/head/caphat/formal(src) new /obj/item/clothing/under/captainformal(src) + new /obj/item/clothing/suit/hooded/wintercoat/captain(src) return @@ -51,6 +57,7 @@ new /obj/item/clothing/head/helmet(src) new /obj/item/weapon/cartridge/hop(src) new /obj/item/device/radio/headset/heads/hop(src) + new /obj/item/device/radio/headset/heads/hop/alt(src) new /obj/item/weapon/storage/box/ids(src) new /obj/item/weapon/storage/box/ids( src ) new /obj/item/weapon/gun/energy/gun(src) @@ -103,6 +110,10 @@ new /obj/item/weapon/storage/backpack/security(src) else new /obj/item/weapon/storage/backpack/satchel_sec(src) + if(prob(50)) + new /obj/item/weapon/storage/backpack/dufflebag/sec(src) + else + return new /obj/item/clothing/head/HoS(src) new /obj/item/clothing/suit/storage/vest/hos(src) new /obj/item/clothing/under/rank/head_of_security/jensen(src) @@ -112,9 +123,11 @@ new /obj/item/clothing/head/HoS/dermal(src) new /obj/item/weapon/cartridge/hos(src) new /obj/item/device/radio/headset/heads/hos(src) + new /obj/item/device/radio/headset/heads/hos/alt(src) new /obj/item/clothing/glasses/sunglasses/sechud(src) new /obj/item/taperoll/police(src) new /obj/item/weapon/shield/riot(src) + new /obj/item/weapon/shield/riot/tele(src) new /obj/item/weapon/storage/box/flashbangs(src) new /obj/item/weapon/storage/belt/security(src) new /obj/item/device/flash(src) @@ -123,6 +136,7 @@ new /obj/item/clothing/accessory/holster/waist(src) new /obj/item/weapon/melee/telebaton(src) new /obj/item/clothing/head/beret/sec/corporate/hos(src) + new /obj/item/clothing/suit/hooded/wintercoat/security(src) return @@ -144,13 +158,19 @@ new /obj/item/weapon/storage/backpack/security(src) else new /obj/item/weapon/storage/backpack/satchel_sec(src) + if(prob(50)) + new /obj/item/weapon/storage/backpack/dufflebag/sec(src) + else + return new /obj/item/clothing/suit/storage/vest/warden(src) new /obj/item/clothing/under/rank/warden(src) new /obj/item/clothing/under/rank/warden/corp(src) new /obj/item/clothing/suit/armor/vest/warden(src) + new /obj/item/clothing/suit/armor/vest/warden/alt(src) new /obj/item/clothing/head/warden(src) new /obj/item/weapon/cartridge/security(src) new /obj/item/device/radio/headset/headset_sec(src) + new /obj/item/device/radio/headset/headset_sec/alt(src) new /obj/item/clothing/glasses/sunglasses/sechud(src) new /obj/item/taperoll/police(src) new /obj/item/weapon/storage/box/flashbangs(src) @@ -160,6 +180,7 @@ new /obj/item/weapon/gun/energy/gun(src) new /obj/item/weapon/storage/box/holobadge(src) new /obj/item/clothing/head/beret/sec/corporate/warden(src) + new /obj/item/clothing/suit/hooded/wintercoat/security(src) return @@ -180,10 +201,15 @@ new /obj/item/weapon/storage/backpack/security(src) else new /obj/item/weapon/storage/backpack/satchel_sec(src) + if(prob(50)) + new /obj/item/weapon/storage/backpack/dufflebag/sec(src) + else + return new /obj/item/clothing/suit/storage/vest/officer(src) new /obj/item/clothing/head/helmet(src) // new /obj/item/weapon/cartridge/security(src) new /obj/item/device/radio/headset/headset_sec(src) + new /obj/item/device/radio/headset/headset_sec/alt(src) new /obj/item/weapon/storage/belt/security(src) new /obj/item/device/flash(src) new /obj/item/weapon/reagent_containers/spray/pepper(src) diff --git a/code/game/objects/structures/crates_lockers/closets/wardrobe.dm b/code/game/objects/structures/crates_lockers/closets/wardrobe.dm index 5f09f5168b..6f23f4d054 100644 --- a/code/game/objects/structures/crates_lockers/closets/wardrobe.dm +++ b/code/game/objects/structures/crates_lockers/closets/wardrobe.dm @@ -29,6 +29,12 @@ new /obj/item/clothing/head/beret/sec/corporate/officer(src) new /obj/item/clothing/head/beret/sec/corporate/officer(src) new /obj/item/clothing/head/beret/sec/corporate/officer(src) + new /obj/item/clothing/mask/bandana/red(src) + new /obj/item/clothing/mask/bandana/red(src) + new /obj/item/clothing/mask/bandana/red(src) + new /obj/item/clothing/suit/hooded/wintercoat/security(src) + new /obj/item/clothing/suit/hooded/wintercoat/security(src) + new /obj/item/clothing/suit/hooded/wintercoat/security(src) return @@ -66,6 +72,9 @@ new /obj/item/clothing/head/soft/black(src) new /obj/item/clothing/head/soft/black(src) new /obj/item/clothing/head/soft/black(src) + new /obj/item/clothing/mask/bandana(src) + new /obj/item/clothing/mask/bandana(src) + new /obj/item/clothing/mask/bandana(src) return @@ -104,6 +113,9 @@ new /obj/item/clothing/shoes/black(src) new /obj/item/clothing/shoes/black(src) new /obj/item/clothing/shoes/black(src) + new /obj/item/clothing/mask/bandana/green(src) + new /obj/item/clothing/mask/bandana/green(src) + new /obj/item/clothing/mask/bandana/green(src) return /obj/structure/closet/wardrobe/xenos @@ -118,6 +130,10 @@ new /obj/item/clothing/shoes/sandal(src) new /obj/item/clothing/shoes/sandal(src) new /obj/item/clothing/shoes/sandal(src) + new /obj/item/clothing/shoes/winterboots(src) + new /obj/item/clothing/shoes/winterboots(src) + new /obj/item/clothing/suit/hooded/wintercoat(src) + new /obj/item/clothing/suit/hooded/wintercoat(src) return @@ -151,6 +167,9 @@ new /obj/item/clothing/shoes/orange(src) new /obj/item/clothing/shoes/orange(src) new /obj/item/clothing/shoes/orange(src) + new /obj/item/clothing/mask/bandana/gold(src) + new /obj/item/clothing/mask/bandana/gold(src) + new /obj/item/clothing/mask/bandana/gold(src) return @@ -176,10 +195,14 @@ new /obj/item/clothing/head/beret/engineering(src) new /obj/item/clothing/head/beret/engineering(src) new /obj/item/clothing/head/beret/engineering(src) + new /obj/item/clothing/mask/bandana/gold(src) + new /obj/item/clothing/mask/bandana/gold(src) + new /obj/item/clothing/mask/bandana/gold(src) + new /obj/item/clothing/suit/hooded/wintercoat/engineering/atmos(src) + new /obj/item/clothing/suit/hooded/wintercoat/engineering/atmos(src) + new /obj/item/clothing/suit/hooded/wintercoat/engineering/atmos(src) return - - /obj/structure/closet/wardrobe/engineering_yellow name = "engineering wardrobe" icon_state = "yellow" @@ -202,6 +225,12 @@ new /obj/item/clothing/head/beret/engineering(src) new /obj/item/clothing/head/beret/engineering(src) new /obj/item/clothing/head/beret/engineering(src) + new /obj/item/clothing/mask/bandana/gold(src) + new /obj/item/clothing/mask/bandana/gold(src) + new /obj/item/clothing/mask/bandana/gold(src) + new /obj/item/clothing/suit/hooded/wintercoat/engineering(src) + new /obj/item/clothing/suit/hooded/wintercoat/engineering(src) + new /obj/item/clothing/suit/hooded/wintercoat/engineering(src) return @@ -260,6 +289,7 @@ new /obj/item/clothing/shoes/slippers(src) new /obj/item/clothing/shoes/slippers(src) new /obj/item/clothing/shoes/slippers(src) + new /obj/item/clothing/suit/hooded/wintercoat/science(src) return /obj/structure/closet/wardrobe/toxins_white/New() @@ -375,6 +405,8 @@ new /obj/item/clothing/suit/storage/toggle/labcoat(src) new /obj/item/clothing/mask/surgical(src) new /obj/item/clothing/mask/surgical(src) + new /obj/item/clothing/suit/hooded/wintercoat/medical(src) + new /obj/item/clothing/suit/hooded/wintercoat/medical(src) return @@ -419,6 +451,19 @@ new /obj/item/clothing/shoes/purple(src) new /obj/item/clothing/shoes/red(src) new /obj/item/clothing/shoes/leather(src) + new /obj/item/clothing/under/pants/classicjeans(src) + new /obj/item/clothing/under/pants/mustangjeans(src) + new /obj/item/clothing/under/pants/blackjeans(src) + new /obj/item/clothing/under/pants/youngfolksjeans(src) + new /obj/item/clothing/under/pants/white(src) + new /obj/item/clothing/under/pants/red(src) + new /obj/item/clothing/under/pants/black(src) + new /obj/item/clothing/under/pants/tan(src) + new /obj/item/clothing/under/pants/track(src) + new /obj/item/clothing/under/pants/jeans(src) + new /obj/item/clothing/under/pants/khaki(src) + new /obj/item/clothing/mask/bandana/blue(src) + new /obj/item/clothing/mask/bandana/blue(src) return /obj/structure/closet/wardrobe/tactical @@ -434,9 +479,17 @@ new /obj/item/clothing/head/helmet/tactical(src) new /obj/item/clothing/mask/balaclava/tactical(src) new /obj/item/clothing/glasses/sunglasses/sechud/tactical(src) - new /obj/item/weapon/storage/belt/security/tactical(src) + if(prob(25)) + new /obj/item/weapon/storage/belt/security/tactical/bandolier(src) + else + new /obj/item/weapon/storage/belt/security/tactical(src) + if(prob(10)) + new /obj/item/clothing/mask/bandana/skull(src) + else + return new /obj/item/clothing/shoes/jackboots(src) new /obj/item/clothing/gloves/black(src) + new /obj/item/clothing/under/pants/camo(src) return /obj/structure/closet/wardrobe/ert @@ -454,6 +507,8 @@ new /obj/item/clothing/glasses/sunglasses(src) new /obj/item/clothing/shoes/swat(src) new /obj/item/clothing/gloves/swat(src) + new /obj/item/clothing/mask/bandana/skull(src) + new /obj/item/clothing/mask/bandana/skull(src) return /obj/structure/closet/wardrobe/suit diff --git a/code/modules/client/preferences_gear.dm b/code/modules/client/preferences_gear.dm index 32b59a5d5a..a02efde67c 100644 --- a/code/modules/client/preferences_gear.dm +++ b/code/modules/client/preferences_gear.dm @@ -356,6 +356,30 @@ var/global/list/gear_datums = list() // Mask +/datum/gear/bubandana + display_name = "bandana, blue" + path = /obj/item/clothing/mask/bandana/blue + cost = 1 + slot = slot_wear_mask + +/datum/gear/gobandana + display_name = "bandana, gold" + path = /obj/item/clothing/mask/bandana/gold + cost = 1 + slot = slot_wear_mask + +/datum/gear/grbandana + display_name = "bandana, green 2" + path = /obj/item/clothing/mask/bandana/green + cost = 1 + slot = slot_wear_mask + +/datum/gear/rbandana + display_name = "bandana, red" + path = /obj/item/clothing/mask/bandana/red + cost = 1 + slot = slot_wear_mask + /datum/gear/sterilemask display_name = "sterile mask" path = /obj/item/clothing/mask/surgical @@ -424,12 +448,161 @@ var/global/list/gear_datums = list() slot = slot_w_uniform cost = 1 -/datum/gear/roboticist_skirt - display_name = "skirt, roboticist" - path = /obj/item/clothing/under/rank/roboticist/skirt +/datum/gear/skirt_ce + display_name = "skirt, ce" + path = /obj/item/clothing/under/rank/chief_engineer/skirt + slot = slot_w_uniform + cost = 1 + +/datum/gear/skirt_atmos + display_name = "skirt, atmos" + path = /obj/item/clothing/under/rank/atmospheric_technician/skirt + slot = slot_w_uniform + cost = 1 + +/datum/gear/skirt_eng + display_name = "skirt, engineer" + path = /obj/item/clothing/under/rank/engineer/skirt + slot = slot_w_uniform + cost = 1 + +/datum/gear/skirt_cmo + display_name = "skirt, cmo" + path = /obj/item/clothing/under/rank/chief_medical_officer + slot = slot_w_uniform + cost = 1 + +/datum/gear/skirt_chem + display_name = "skirt, chemist" + path = /obj/item/clothing/under/rank/chemist/skirt + slot = slot_w_uniform + cost = 1 + +/datum/gear/skirt_viro + display_name = "skirt, virologist" + path = /obj/item/clothing/under/rank/virologist/skirt + slot = slot_w_uniform + cost = 1 + +/datum/gear/skirt_med + display_name = "skirt, medical" + path = /obj/item/clothing/under/rank/medical/skirt + slot = slot_w_uniform + cost = 1 + +/datum/gear/skirt_sci + display_name = "skirt, scientist" + path = /obj/item/clothing/under/rank/scientist/skirt + slot = slot_w_uniform + cost = 1 + +/datum/gear/skirt_qm + display_name = "skirt, QM" + path = /obj/item/clothing/under/rank/cargo/skirt + slot = slot_w_uniform + cost = 1 + +/datum/gear/jeans_qm + display_name = "jeans, QM" + path = /obj/item/clothing/under/rank/cargo/jeans + slot = slot_w_uniform + cost = 1 + +/datum/gear/jeans_qmf + display_name = "female jeans, QM" + path = /obj/item/clothing/under/rank/cargo/jeans/female + slot = slot_w_uniform + cost = 1 + +/datum/gear/skirt_cargo + display_name = "skirt, cargo" + path = /obj/item/clothing/under/rank/cargotech/skirt + slot = slot_w_uniform + cost = 1 + +/datum/gear/jeans_cargo + display_name = "jeans, cargo" + path = /obj/item/clothing/under/rank/cargotech/jeans + slot = slot_w_uniform + cost = 1 + +/datum/gear/jeans_cargof + display_name = "female jeans, cargo" + path = /obj/item/clothing/under/rank/cargotech/jeans/female + slot = slot_w_uniform + cost = 1 + +/datum/gear/classicjeans + display_name = "pants, classic jeans" + path = /obj/item/clothing/under/pants/classicjeans + slot = slot_w_uniform + cost = 1 + +/datum/gear/mustangjeans + display_name = "pants, mustang jeans" + path = /obj/item/clothing/under/pants/mustangjeans + slot = slot_w_uniform + cost = 1 + +/datum/gear/blackjeans + display_name = "pants, black jeans" + path = /obj/item/clothing/under/pants/blackjeans + slot = slot_w_uniform + cost = 1 + +/datum/gear/youngfolksjeans + display_name = "pants, young folks jeans" + path = /obj/item/clothing/under/pants/youngfolksjeans + slot = slot_w_uniform + cost = 1 + +/datum/gear/white + display_name = "pants, white" + path = /obj/item/clothing/under/pants/white + slot = slot_w_uniform + cost = 1 + +/datum/gear/red + display_name = "pants, red" + path = /obj/item/clothing/under/pants/red + slot = slot_w_uniform + cost = 1 + +/datum/gear/black + display_name = "pants, black" + path = /obj/item/clothing/under/pants/black + slot = slot_w_uniform + cost = 1 + +/datum/gear/tan + display_name = "pants, tan" + path = /obj/item/clothing/under/pants/tan + slot = slot_w_uniform + cost = 1 + +/datum/gear/track + display_name = "pants, track" + path = /obj/item/clothing/under/pants/track + slot = slot_w_uniform + cost = 1 + +/datum/gear/jeans + display_name = "pants, jeans" + path = /obj/item/clothing/under/pants/jeans + slot = slot_w_uniform + cost = 1 + +/datum/gear/khaki + display_name = "pants, khaki" + path = /obj/item/clothing/under/pants/khaki + slot = slot_w_uniform + cost = 1 + +/datum/gear/camo + display_name = "pants, camo" + path = /obj/item/clothing/under/pants/camo slot = slot_w_uniform cost = 1 - allowed_roles = list("Roboticist") /datum/gear/amishsuit display_name = "suit, amish" @@ -716,6 +889,12 @@ var/global/list/gear_datums = list() cost = 1 allowed_roles = list("Captain", "Head of Personnel", "Security Officer", "Warden", "Head of Security", "Detective") +/datum/gear/tie_black + display_name = "tie, black" + path = /obj/item/clothing/accessory/black + slot = slot_tie + cost = 1 + /datum/gear/tie_blue display_name = "tie, blue" path = /obj/item/clothing/accessory/blue @@ -734,6 +913,95 @@ var/global/list/gear_datums = list() slot = slot_tie cost = 1 +/datum/gear/scarf + display_name = "scarf" + path = /obj/item/clothing/accessory/scarf + slot = slot_tie + cost = 1 + +/datum/gear/scarf_red + display_name = "scarf, red" + path = /obj/item/clothing/accessory/scarf/red + slot = slot_tie + cost = 1 + +/datum/gear/scarf_green + display_name = "scarf, green" + path = /obj/item/clothing/accessory/scarf/green + slot = slot_tie + cost = 1 + +/datum/gear/scarf_darkblue + display_name = "scarf, dark blue" + path = /obj/item/clothing/accessory/scarf/darkblue + slot = slot_tie + cost = 1 + +/datum/gear/scarf_purple + display_name = "scarf, purple" + path = /obj/item/clothing/accessory/scarf/purple + slot = slot_tie + cost = 1 + +/datum/gear/scarf_yellow + display_name = "scarf, yellow" + path = /obj/item/clothing/accessory/scarf/yellow + slot = slot_tie + cost = 1 + +/datum/gear/scarf_orange + display_name = "scarf, orange" + slot = slot_tie + cost = 1 + +/datum/gear/scarf_lightblue + display_name = "scarf, light blue" + path = /obj/item/clothing/accessory/scarf/lightblue + slot = slot_tie + cost = 1 + +/datum/gear/scarf_white + display_name = "scarf, white" + path = /obj/item/clothing/accessory/scarf/white + slot = slot_tie + cost = 1 + +/datum/gear/scarf_black + display_name = "scarf, black" + path = /obj/item/clothing/accessory/scarf/black + slot = slot_tie + cost = 1 + +/datum/gear/scarf_zebra + display_name = "scarf, zebra" + path = /obj/item/clothing/accessory/scarf/zebra + slot = slot_tie + cost = 1 + +/datum/gear/scarf_christmas + display_name = "scarf, christmas" + path = /obj/item/clothing/accessory/scarf/christmas + slot = slot_tie + cost = 1 + +/datum/gear/scarf_stripedredscarf + display_name = "scarf, striped red" + path = /obj/item/clothing/accessory/stripedredscarf + slot = slot_tie + cost = 1 + +/datum/gear/scarf_stripedgreenscarf + display_name = "scarf, striped green" + path = /obj/item/clothing/accessory/stripedgreenscarf + slot = slot_tie + cost = 1 + +/datum/gear/scarf_stripedbluescarf + display_name = "scarf, striped blue" + path = /obj/item/clothing/accessory/stripedbluescarf + slot = slot_tie + cost = 1 + /datum/gear/brown_vest display_name = "webbing, engineering" path = /obj/item/clothing/accessory/storage/brown_vest @@ -762,18 +1030,48 @@ var/global/list/gear_datums = list() cost = 1 slot = slot_wear_suit +/datum/gear/leather_coat + display_name = "leather coat" + path = /obj/item/clothing/suit/leathercoat/alt + cost = 2 + slot = slot_wear_suit + +/datum/gear/puffer_coat + display_name = "puffer coat" + path = /obj/item/clothing/suit/jacket/puffer + cost = 2 + slot = slot_wear_suit + +/datum/gear/puffer_vest + display_name = "puffer vest" + path = /obj/item/clothing/suit/jacket/puffer/vest + cost = 2 + slot = slot_wear_suit + /datum/gear/bomber display_name = "bomber jacket" path = /obj/item/clothing/suit/storage/toggle/bomber cost = 2 slot = slot_wear_suit +/datum/gear/bomber_alt + display_name = "bomber jacket 2" + path = /obj/item/clothing/suit/storage/bomber/alt + cost = 2 + slot = slot_wear_suit + /datum/gear/leather_jacket display_name = "leather jacket, black" path = /obj/item/clothing/suit/storage/leather_jacket cost = 2 slot = slot_wear_suit +/datum/gear/leather_jacket_alt + display_name = "leather jacket 2, black" + path = /obj/item/clothing/suit/storage/leather_jacket/alt + cost = 2 + slot = slot_wear_suit + /datum/gear/leather_jacket_nt display_name = "leather jacket, corporate, black" path = /obj/item/clothing/suit/storage/leather_jacket/nanotrasen @@ -792,6 +1090,12 @@ var/global/list/gear_datums = list() cost = 2 slot = slot_wear_suit +/datum/gear/mil + display_name = "military jacket" + path = /obj/item/clothing/suit/jacket/miljacket + cost = 2 + slot = slot_wear_suit + /datum/gear/hazard_vest display_name = "hazard vest" path = /obj/item/clothing/suit/storage/hazardvest @@ -804,6 +1108,36 @@ var/global/list/gear_datums = list() cost = 2 slot = slot_wear_suit +/datum/gear/hoodie/red + display_name = "hoodie, red" + path = /obj/item/clothing/suit/storage/toggle/hoodie/red + cost = 2 + slot = slot_wear_suit + +/datum/gear/hoodie/blue + display_name = "hoodie, blue" + path = /obj/item/clothing/suit/storage/toggle/hoodie/blue + cost = 2 + slot = slot_wear_suit + +/datum/gear/hoodie/yellow + display_name = "hoodie, yellow" + path = /obj/item/clothing/suit/storage/toggle/hoodie/yellow + cost = 2 + slot = slot_wear_suit + +/datum/gear/hoodie/green + display_name = "hoodie, green" + path = /obj/item/clothing/suit/storage/toggle/hoodie/green + cost = 2 + slot = slot_wear_suit + +/datum/gear/hoodie/orange + display_name = "hoodie, orange" + path = /obj/item/clothing/suit/storage/toggle/hoodie/orange + cost = 2 + slot = slot_wear_suit + /datum/gear/hoodie/black display_name = "hoodie, black" path = /obj/item/clothing/suit/storage/toggle/hoodie/black @@ -846,12 +1180,30 @@ var/global/list/gear_datums = list() cost = 2 slot = slot_wear_suit +/datum/gear/pinklabcoat + display_name = "labcoat, pink" + path = /obj/item/clothing/suit/storage/toggle/labcoat/pink + cost = 2 + slot = slot_wear_suit + /datum/gear/redlabcoat display_name = "labcoat, red" path = /obj/item/clothing/suit/storage/toggle/labcoat/red cost = 2 slot = slot_wear_suit +/datum/gear/yellowlabcoat + display_name = "labcoat, yellow" + path = /obj/item/clothing/suit/storage/toggle/labcoat/yellow + cost = 2 + slot = slot_wear_suit + +/datum/gear/emtlabcoat + display_name = "labcoat, emt" + path = /obj/item/clothing/suit/storage/toggle/labcoat/emt + cost = 2 + slot = slot_wear_suit + /datum/gear/overalls display_name = "overalls" path = /obj/item/clothing/suit/apron/overalls diff --git a/code/modules/clothing/under/accessories/accessory.dm b/code/modules/clothing/under/accessories/accessory.dm index bdc9f33a2e..0b68c75c34 100644 --- a/code/modules/clothing/under/accessories/accessory.dm +++ b/code/modules/clothing/under/accessories/accessory.dm @@ -72,6 +72,10 @@ name = "red tie" icon_state = "redtie" +/obj/item/clothing/accessory/black + name = "black tie" + icon_state = "blacktie" + /obj/item/clothing/accessory/horrible name = "horrible tie" desc = "A neosilk clip-on tie. This one is disgusting." diff --git a/code/modules/clothing/under/jobs/civilian.dm b/code/modules/clothing/under/jobs/civilian.dm index 340a035356..a67d1e7b35 100644 --- a/code/modules/clothing/under/jobs/civilian.dm +++ b/code/modules/clothing/under/jobs/civilian.dm @@ -30,6 +30,18 @@ worn_state = "qmf" body_parts_covered = UPPER_TORSO|LOWER_TORSO|ARMS +/obj/item/clothing/under/rank/cargo/jeans + name = "quartermaster's jumpjeans" + desc = "Jeeeaaans! They're comfy!" + icon_state = "qmj" + worn_state = "qmj" + +/obj/item/clothing/under/rank/cargo/jeans/female + name = "quartermaster's jumpjeans" + desc = "Jeeeaaans! They're comfy!" + icon_state = "qmjf" + worn_state = "qmjf" + /obj/item/clothing/under/rank/cargotech name = "cargo technician's jumpsuit" desc = "Shooooorts! They're comfy and easy to wear!" @@ -44,6 +56,18 @@ icon_state = "cargof" worn_state = "cargof" +/obj/item/clothing/under/rank/cargotech/jeans + name = "cargo technician's jumpjeans" + desc = "Jeeeaaans! They're comfy!" + icon_state = "cargoj" + worn_state = "cargoj" + +/obj/item/clothing/under/rank/cargotech/jeans/female + name = "cargo technician's jumpjeans" + desc = "Jeeeaaans! They're comfy!" + icon_state = "cargojf" + worn_state = "cargojf" + /obj/item/clothing/under/rank/chaplain desc = "It's a black jumpsuit, often worn by religious folk." diff --git a/icons/mob/human_face.dmi b/icons/mob/human_face.dmi index 7c40185265..909b21297c 100644 Binary files a/icons/mob/human_face.dmi and b/icons/mob/human_face.dmi differ diff --git a/icons/mob/uniform.dmi b/icons/mob/uniform.dmi index 717e1e7dec..43efcd2f90 100644 Binary files a/icons/mob/uniform.dmi and b/icons/mob/uniform.dmi differ diff --git a/icons/obj/clothing/uniforms.dmi b/icons/obj/clothing/uniforms.dmi index 61f5578f6b..b333967132 100644 Binary files a/icons/obj/clothing/uniforms.dmi and b/icons/obj/clothing/uniforms.dmi differ