cyberpresidentvanellope/Aurora.3
1
0
Fork 0
mirror of https://github.com/Aurorastation/Aurora.3.git synced 2026-08-23 13:05:44 +01:00
Code Issues Packages Projects Releases Wiki Activity

Overalls and Shorts Tweaks (#14987)

Browse Source
This commit is contained in:
SleepyGemmy
2023-02-02 15:01:19 -03:00
committed by GitHub
parent b43aafafc2
commit de47686ec0
46 changed files with 636 additions and 451 deletions
Download Patch File Download Diff File Expand all files Collapse all files
aurorastation.dme
+1
View File
@@ -1684,6 +1684,7 @@
#include "code\modules\clothing\suits\xeno\vaurca.dm"
#include "code\modules\clothing\under\color.dm"
#include "code\modules\clothing\under\miscellaneous.dm"
#include "code\modules\clothing\under\pants.dm"
#include "code\modules\clothing\under\shorts.dm"
#include "code\modules\clothing\under\skirts.dm"
#include "code\modules\clothing\under\syndicate.dm"
code/datums/outfits/event/outfit_killers.dm
+1 -1
View File
@@ -2,7 +2,7 @@
name = "Masked Killer"
uniform = /obj/item/clothing/under/overalls
suit = /obj/item/clothing/suit/apron
suit = /obj/item/clothing/accessory/apron/random
shoes = /obj/item/clothing/shoes/white
gloves = /obj/item/clothing/gloves/latex
mask = /obj/item/clothing/mask/surgical
code/datums/outfits/event/outfit_nanotrasen.dm
+1 -1
View File
@@ -308,7 +308,7 @@
name = "NTCC Odin Chef"
uniform = /obj/item/clothing/under/rank/chef
suit = /obj/item/clothing/suit/chef
suit = /obj/item/clothing/suit/chef_jacket
head = /obj/item/clothing/head/chefhat
shoes = /obj/item/clothing/shoes/laceup/all_species
headset = /obj/item/device/radio/headset/headset_service
code/datums/outfits/outfit_antag.dm
+5 -5
View File
@@ -189,7 +189,7 @@
allow_backbag_choice = FALSE
uniform = list(
/obj/item/clothing/under/serviceoveralls,
/obj/item/clothing/under/service_overalls,
/obj/item/clothing/under/det/zavod,
/obj/item/clothing/under/color/brown,
/obj/item/clothing/under/syndicate/tracksuit,
@@ -201,10 +201,10 @@
/obj/item/clothing/under/lance,
/obj/item/clothing/under/legion/pilot,
/obj/item/clothing/under/offworlder,
/obj/item/clothing/under/pants,
/obj/item/clothing/under/pants/jeans,
/obj/item/clothing/under/pants/camo,
/obj/item/clothing/under/pants/khaki,
/obj/item/clothing/under/pants/musthang,
/obj/item/clothing/under/pants/mustang,
/obj/item/clothing/under/rank/bartender,
/obj/item/clothing/under/rank/hangar_technician/heph,
/obj/item/clothing/under/rank/chef,
@@ -232,7 +232,7 @@
/obj/item/clothing/accessory/poncho/roles/cloak/cargo,
/obj/item/clothing/accessory/poncho/roles/cloak/mining,
/obj/item/clothing/accessory/poncho/roles/cloak/rd,
/obj/item/clothing/suit/apron/overalls/random,
/obj/item/clothing/accessory/overalls/random,
/obj/item/clothing/suit/captunic/capjacket,
/obj/item/clothing/suit/ianshirt,
/obj/item/clothing/suit/storage/toggle/fib,
@@ -520,7 +520,7 @@
allow_backbag_choice = FALSE
head = /obj/item/clothing/head/culthood/alt
uniform = /obj/item/clothing/under/serviceoveralls
uniform = /obj/item/clothing/under/service_overalls
suit = /obj/item/clothing/suit/cultrobes/alt
back = /obj/item/storage/backpack/cultpack
belt = /obj/item/book/tome
code/datums/trading/goods.dm
+1 -2
View File
@@ -132,7 +132,6 @@
/obj/item/clothing/under/lawyer = TRADER_BLACKLIST,
/obj/item/clothing/under/pj = TRADER_BLACKLIST,
/obj/item/clothing/under/rank = TRADER_BLACKLIST,
/obj/item/clothing/under/shorts = TRADER_BLACKLIST,
/obj/item/clothing/under/swimsuit = TRADER_BLACKLIST,
/obj/item/clothing/under/syndicate = TRADER_BLACKLIST_ALL,
/obj/item/clothing/under/tactical = TRADER_BLACKLIST,
@@ -143,7 +142,7 @@
/obj/item/clothing/suit/storage/hooded/wintercoat/fluff = TRADER_BLACKLIST_ALL,
/obj/item/clothing/suit/storage/toggle/labcoat = TRADER_ALL,
/obj/item/clothing/suit/storage/toggle/labcoat/fluff = TRADER_BLACKLIST_ALL,
/obj/item/clothing/suit/storage/toggle/varsity = TRADER_ALL,
/obj/item/clothing/suit/storage/toggle/varsity = TRADER_ALL,
/obj/item/clothing/suit/storage/toggle/track = TRADER_ALL,
/obj/item/clothing/suit/jacket/puffer = TRADER_ALL,
/obj/item/clothing/suit/storage/toggle/flannel = TRADER_ALL
code/game/jobs/faction/idris.dm
+1 -1
View File
@@ -123,7 +123,7 @@
name = "Chef - Idris"
uniform = /obj/item/clothing/under/rank/chef/idris
suit = /obj/item/clothing/suit/chef/idris
suit = /obj/item/clothing/suit/chef_jacket/idris
head = /obj/item/clothing/head/chefhat/idris
id = /obj/item/card/id/idris
code/game/jobs/job/civilian.dm
+1 -2
View File
@@ -72,7 +72,7 @@
jobtype = /datum/job/chef
uniform = /obj/item/clothing/under/rank/chef/nt
suit = /obj/item/clothing/suit/chef/nt
suit = /obj/item/clothing/suit/chef_jacket/nt
head = /obj/item/clothing/head/chefhat/nt
shoes = /obj/item/clothing/shoes/black
@@ -122,7 +122,6 @@
jobtype = /datum/job/hydro
uniform = /obj/item/clothing/under/rank/hydroponics
// suit = /obj/item/clothing/suit/apron
head = /obj/item/clothing/head/bandana/hydro/nt
shoes = /obj/item/clothing/shoes/black
suit_store = /obj/item/device/analyzer/plant_analyzer
code/game/machinery/vending_types.dm
+1 -1
View File
@@ -909,7 +909,7 @@
/obj/item/reagent_containers/food/drinks/drinkingglass/newglass/carafe = 3,
/obj/item/reagent_containers/food/drinks/pitcher = 3,
/obj/item/reagent_containers/food/drinks/drinkingglass/newglass/coffeecup = 6,
/obj/item/clothing/suit/chef/classic = 2,
/obj/item/clothing/accessory/apron/chef = 2,
/obj/item/material/kitchen/rollingpin = 2,
/obj/item/reagent_containers/cooking_container/oven = 5,
/obj/item/reagent_containers/cooking_container/fryer = 4,
code/game/objects/effects/landmarks.dm
+1 -1
View File
@@ -184,7 +184,7 @@
/obj/effect/landmark/costume/waiter/New()
new /obj/item/clothing/under/waiter(src.loc)
new /obj/item/clothing/head/rabbitears(src.loc)
new /obj/item/clothing/suit/apron(src.loc)
new /obj/item/clothing/accessory/apron/random(src.loc)
delete_me = 1
/obj/effect/landmark/costume/pirate/New()
code/game/objects/structures/crates_lockers/closets/fitness.dm
+5 -5
View File
@@ -6,11 +6,11 @@
/obj/structure/closet/athletic_mixed/fill()
new /obj/item/towel/random(src)
new /obj/item/towel/random(src)
new /obj/item/clothing/under/shorts/grey(src)
new /obj/item/clothing/under/shorts/black(src)
new /obj/item/clothing/under/shorts/red(src)
new /obj/item/clothing/under/shorts/blue(src)
new /obj/item/clothing/under/shorts/green(src)
new /obj/item/clothing/under/shorts/athletic/grey(src)
new /obj/item/clothing/under/shorts/athletic/black(src)
new /obj/item/clothing/under/shorts/athletic/red(src)
new /obj/item/clothing/under/shorts/athletic/blue(src)
new /obj/item/clothing/under/shorts/athletic/green(src)
new /obj/item/clothing/under/swimsuit/red(src)
new /obj/item/clothing/under/swimsuit/black(src)
new /obj/item/clothing/under/swimsuit/blue(src)
code/game/objects/structures/crates_lockers/closets/secure/hydroponics.dm
+4 -4
View File
@@ -7,9 +7,9 @@
..()
switch(rand(1,2))
if(1)
new /obj/item/clothing/suit/apron(src)
new /obj/item/clothing/accessory/apron/blue(src)
if(2)
new /obj/item/clothing/suit/apron/overalls/blue(src)
new /obj/item/clothing/accessory/overalls/blue(src)
new /obj/item/storage/bag/plants(src)
new /obj/item/clothing/under/rank/hydroponics(src)
new /obj/item/device/analyzer/plant_analyzer(src)
@@ -30,9 +30,9 @@
..()
switch(rand(1,2))
if(1)
new /obj/item/clothing/suit/apron(src)
new /obj/item/clothing/accessory/apron/blue(src)
if(2)
new /obj/item/clothing/suit/apron/overalls/blue(src)
new /obj/item/clothing/accessory/overalls/blue(src)
new /obj/item/clothing/under/rank/scientist/botany(src)
new /obj/item/storage/bag/plants(src)
new /obj/item/clothing/under/rank/scientist(src)
code/game/objects/structures/trash_pile.dm
+1 -1
View File
@@ -132,7 +132,7 @@
/obj/item/clothing/gloves/botanic_leather = 3,
/obj/item/clothing/head/hardhat/red = 3,
/obj/item/clothing/mask/gas = 3,
/obj/item/clothing/suit/apron = 3,
/obj/item/clothing/accessory/apron/random = 3,
/obj/item/clothing/suit/storage/toggle/bomber = 3,
/obj/item/clothing/suit/storage/toggle/brown_jacket = 3,
/obj/item/clothing/suit/storage/hooded/wintercoat/hoodie = 3,
code/modules/awaymissions/corpse.dm
+1 -1
View File
@@ -131,7 +131,7 @@
/obj/effect/landmark/corpse/chef
name = "Chef"
corpseuniform = /obj/item/clothing/under/rank/chef
corpsesuit = /obj/item/clothing/suit/chef/classic
corpsesuit = /obj/item/clothing/accessory/apron/chef
corpseshoes = /obj/item/clothing/shoes/black
corpsehelmet = /obj/item/clothing/head/chefhat
corpseback = /obj/item/storage/backpack
code/modules/client/preference_setup/loadout/loadout_accessories.dm
+6 -6
View File
@@ -174,18 +174,18 @@
cost = 2
flags = GEAR_HAS_NAME_SELECTION | GEAR_HAS_DESC_SELECTION | GEAR_HAS_COLOR_SELECTION
/datum/gear/accessory/overalls_mining
display_name = "overalls, mining"
path = /obj/item/clothing/accessory/storage/overalls/mining
allowed_roles = list("Shaft Miner", "Xenoarchaeologist")
cost = 2
/datum/gear/accessory/overalls_engineer
display_name = "overalls, engineering"
path = /obj/item/clothing/accessory/storage/overalls/engineer
allowed_roles = list("Engineer", "Atmospheric Technician", "Chief Engineer", "Engineering Apprentice")
cost = 2
/datum/gear/accessory/overalls_mining
display_name = "overalls, mining"
path = /obj/item/clothing/accessory/storage/overalls/mining
allowed_roles = list("Shaft Miner", "Xenoarchaeologist")
cost = 2
/datum/gear/accessory/sweater
display_name = "sweater selection"
path = /obj/item/clothing/accessory/sweater
code/modules/client/preference_setup/loadout/loadout_factions.dm
+1 -1
View File
@@ -436,7 +436,7 @@
/datum/gear/faction/zenghu_apron
display_name = "zeng-hu vinyl apron"
path = /obj/item/clothing/suit/apron/surgery/zeng
path = /obj/item/clothing/accessory/apron/surgery/zeng
slot = slot_wear_suit
faction = "Zeng-Hu Pharmaceuticals"
code/modules/client/preference_setup/loadout/loadout_suit.dm
+36 -19
View File
@@ -1,17 +1,11 @@
// Suit slot
/datum/gear/suit
display_name = "apron, botanist"
path = /obj/item/clothing/suit/apron
display_name = "san colette bridge crew jacket"
path = /obj/item/clothing/suit/storage/toggle/brown_jacket/scc/sancol
slot = slot_wear_suit
sort_category = "Suits and Overwear"
cost = 1
/datum/gear/suit/colorapron
display_name = "apron, multipurpose"
path = /obj/item/clothing/suit/apron/colored
slot = slot_wear_suit
flags = GEAR_HAS_NAME_SELECTION | GEAR_HAS_DESC_SELECTION | GEAR_HAS_COLOR_SELECTION
datum/gear/suit/colorvest
display_name = "colorable vest"
path = /obj/item/clothing/suit/storage/toggle/brown_jacket/sleeveless/colorable
@@ -58,10 +52,6 @@ datum/gear/suit/colorvest
gear_tweaks += new /datum/gear_tweak/path(jackets)
/datum/gear/suit/sancolette
display_name = "san colette bridge crew jacket"
path = /obj/item/clothing/suit/storage/toggle/brown_jacket/scc/sancol
/datum/gear/suit/hazard_vest
display_name = "hazard vest selection"
path = /obj/item/clothing/suit/storage/hazardvest
@@ -103,15 +93,9 @@ datum/gear/suit/colorvest
path = /obj/item/clothing/suit/storage/toggle/labcoat
flags = GEAR_HAS_NAME_SELECTION | GEAR_HAS_DESC_SELECTION | GEAR_HAS_COLOR_SELECTION
/datum/gear/suit/overalls
display_name = "overalls"
path = /obj/item/clothing/suit/apron/overalls
cost = 1
flags = GEAR_HAS_NAME_SELECTION | GEAR_HAS_DESC_SELECTION | GEAR_HAS_COLOR_SELECTION
/datum/gear/suit/surgeryapron
display_name = "surgical apron"
path = /obj/item/clothing/suit/apron/surgery
path = /obj/item/clothing/accessory/apron/surgery
cost = 1
allowed_roles = list("Scientist", "Chief Medical Officer", "Physician", "Surgeon", "Pharmacist", "First Responder", "Medical Intern", "Xenobiologist", "Research Director", "Investigator")
@@ -452,3 +436,36 @@ datum/gear/suit/colorvest
gadpathur_coat["gadpathurian leather coat"] = /obj/item/clothing/suit/storage/toggle/trench/gadpathur/leather
gadpathur_coat["thermal coat"] = /obj/item/clothing/suit/storage/toggle/leather_jacket/gadpathur
gear_tweaks += new /datum/gear_tweak/path(gadpathur_coat)
// Apron
/datum/gear/suit/apron_colourable
display_name = "apron (colourable)"
path = /obj/item/clothing/accessory/apron
flags = GEAR_HAS_NAME_SELECTION | GEAR_HAS_DESC_SELECTION | GEAR_HAS_COLOR_SELECTION
// Overalls Selection
/datum/gear/suit/overalls
display_name = "overalls selection (colourable)"
path = /obj/item/clothing/accessory/overalls
flags = GEAR_HAS_NAME_SELECTION | GEAR_HAS_DESC_SELECTION | GEAR_HAS_COLOR_SELECTION
/datum/gear/suit/overalls/New()
..()
var/list/overalls = list()
// Overalls
overalls["overalls"] = /obj/item/clothing/accessory/overalls
overalls["overalls, high back"] = /obj/item/clothing/accessory/overalls/high_back
overalls["overalls, x-shaped back"] = /obj/item/clothing/accessory/overalls/x_shaped_back
// Overall Shorts
overalls["overall shorts"] = /obj/item/clothing/accessory/overalls/shorts
overalls["overall shorts, high back"] = /obj/item/clothing/accessory/overalls/shorts/high_back
overalls["overall shorts, x-shaped back"] = /obj/item/clothing/accessory/overalls/shorts/x_shaped_back
// Overall Skirts
overalls["overall skirt"] = /obj/item/clothing/accessory/overalls/skirt
overalls["overall skirt, high back"] = /obj/item/clothing/accessory/overalls/skirt/high_back
overalls["overall skirt, x-shaped back"] = /obj/item/clothing/accessory/overalls/skirt/x_shaped_back
gear_tweaks += new /datum/gear_tweak/path(overalls)
code/modules/client/preference_setup/loadout/loadout_uniform.dm
+34 -27
View File
@@ -159,16 +159,16 @@
gear_tweaks += new /datum/gear_tweak/path(bridgecrew)
/datum/gear/uniform/pants
display_name = "pants selection"
description = "A selection of pants."
display_name = "pants and shorts selection"
description = "A selection of pants and shorts."
path = /obj/item/clothing/under/pants
/datum/gear/uniform/pants/New()
..()
var/list/pants = list()
pants["jeans"] = /obj/item/clothing/under/pants
pants["jeans"] = /obj/item/clothing/under/pants/jeans
pants["classic jeans"] = /obj/item/clothing/under/pants/classic
pants["must hang jeans"] = /obj/item/clothing/under/pants/musthang
pants["must hang jeans"] = /obj/item/clothing/under/pants/mustang
pants["black jeans"] = /obj/item/clothing/under/pants/jeansblack
pants["young folks jeans"] = /obj/item/clothing/under/pants/youngfolksjeans
pants["white pants"] = /obj/item/clothing/under/pants/white
@@ -186,31 +186,38 @@
pants["designer jeans"] = /obj/item/clothing/under/pants/designer
pants["ripped jeans"] = /obj/item/clothing/under/pants/ripped
pants["black ripped jeans"] = /obj/item/clothing/under/pants/blackripped
pants["athletic shorts, black"] = /obj/item/clothing/under/shorts
pants["athletic shorts, red"] = /obj/item/clothing/under/shorts/red
pants["athletic shorts, green"] = /obj/item/clothing/under/shorts/green
pants["athletic shorts, black"] = /obj/item/clothing/under/shorts/black
pants["athletic shorts, grey"] = /obj/item/clothing/under/shorts/grey
pants["Stellar Corporate Conglomerate shorts"] = /obj/item/clothing/under/shorts/scc
pants["jean shorts"] = /obj/item/clothing/under/shorts/jeans
pants["jean short shorts"] = /obj/item/clothing/under/shorts/jeans/female
pants["classic jeans shorts"] = /obj/item/clothing/under/shorts/jeans/classic
pants["classic jeans shorts shorts"] = /obj/item/clothing/under/shorts/jeans/classic/female
pants["mustang jeans shorts"] = /obj/item/clothing/under/shorts/jeans/mustang
pants["mustang jeans shorts shorts"] = /obj/item/clothing/under/shorts/jeans/mustang/female
pants["young folks jeans shorts"] = /obj/item/clothing/under/shorts/jeans/youngfolks
pants["young folks jeans shorts shorts"] = /obj/item/clothing/under/shorts/jeans/youngfolks/female
pants["black jeans shorts"] = /obj/item/clothing/under/shorts/jeans/black
pants["black jeans shorts shorts"] = /obj/item/clothing/under/shorts/jeans/black/female
pants["grey jeans shorts"] = /obj/item/clothing/under/shorts/jeans/grey
pants["grey jeans shorts shorts"] = /obj/item/clothing/under/shorts/jeans/grey/female
// Athletic Shorts
pants["black athletic shorts"] = /obj/item/clothing/under/shorts/athletic/black
pants["red athletic shorts"] = /obj/item/clothing/under/shorts/athletic/red
pants["green athletic shorts"] = /obj/item/clothing/under/shorts/athletic/green
pants["grey athletic shorts"] = /obj/item/clothing/under/shorts/athletic/grey
pants["SCC-branded athletic shorts"] = /obj/item/clothing/under/shorts/athletic/scc
// Shorts
pants["black shorts"] = /obj/item/clothing/under/shorts/black
pants["black short shorts"] = /obj/item/clothing/under/shorts/black/short
pants["khaki shorts"] = /obj/item/clothing/under/shorts/khaki
pants["khaki shorts shorts"] = /obj/item/clothing/under/shorts/khaki/female
pants["khaki short shorts"] = /obj/item/clothing/under/shorts/khaki/short
// Jeans Shorts
pants["jeans shorts"] = /obj/item/clothing/under/shorts/jeans
pants["jeans short shorts"] = /obj/item/clothing/under/shorts/jeans/short
pants["classic jeans shorts"] = /obj/item/clothing/under/shorts/jeans/classic
pants["classic jeans short shorts"] = /obj/item/clothing/under/shorts/jeans/classic/short
pants["mustang jeans shorts"] = /obj/item/clothing/under/shorts/jeans/mustang
pants["mustang jeans short shorts"] = /obj/item/clothing/under/shorts/jeans/mustang/short
pants["young folks jeans shorts"] = /obj/item/clothing/under/shorts/jeans/youngfolks
pants["young folks jeans short shorts"] = /obj/item/clothing/under/shorts/jeans/youngfolks/short
pants["black jeans shorts"] = /obj/item/clothing/under/shorts/jeans/black
pants["black jeans short shorts"] = /obj/item/clothing/under/shorts/jeans/black/short
pants["grey jeans shorts"] = /obj/item/clothing/under/shorts/jeans/grey
pants["grey jeans short shorts"] = /obj/item/clothing/under/shorts/jeans/grey/short
gear_tweaks += new /datum/gear_tweak/path(pants)
/datum/gear/uniform/colorpants
display_name = "pants selection (recolorable)"
description = "A selection of recolourable pants."
display_name = "pants and shorts selection (recolourable)"
description = "A selection of recolourable pants and shorts."
path = /obj/item/clothing/under/pants/dress
flags = GEAR_HAS_NAME_SELECTION | GEAR_HAS_DESC_SELECTION | GEAR_HAS_COLOR_SELECTION
@@ -221,8 +228,8 @@
colorpants["dress pants, with belt"] = /obj/item/clothing/under/pants/dress/belt
colorpants["striped pants"] = /obj/item/clothing/under/pants/striped
colorpants["tailored jeans"] = /obj/item/clothing/under/pants/tailoredjeans
colorpants["mustang jeans"] = /obj/item/clothing/under/pants/musthangcolour
colorpants["shorts"] = /obj/item/clothing/under/shorts/color
colorpants["mustang jeans"] = /obj/item/clothing/under/pants/mustang/colourable
colorpants["athletic shorts"] = /obj/item/clothing/under/shorts/athletic/colourable
colorpants["flared pants"] = /obj/item/clothing/under/pants/flared
gear_tweaks += new /datum/gear_tweak/path(colorpants)
code/modules/clothing/suits/jobs.dm
+13 -68
View File
@@ -1,54 +1,6 @@
/*
* Job related
*/
//Botonist
/obj/item/clothing/suit/apron
name = "botanist apron"
desc = "A basic blue apron meant for botanists."
icon_state = "blueapron"
item_state = "blueapron"
blood_overlay_type = "armor"
body_parts_covered = 0
no_overheat = TRUE
allowed = list (/obj/item/reagent_containers/spray/plantbgone,/obj/item/device/analyzer/plant_analyzer,/obj/item/seeds,/obj/item/reagent_containers/glass/fertilizer,/obj/item/material/minihoe)
body_parts_covered = UPPER_TORSO|LOWER_TORSO|LEGS
obj/item/clothing/suit/apron/colored
name = "multipurpose apron"
desc = "A multipurpose apron that comes in many colors."
icon_state = "apron"
item_state = "apron"
allowed = list (/obj/item/reagent_containers/food/drinks/shaker,/obj/item/material/kitchen/utensil, /obj/item/reagent_containers/food/condiment/, /obj/item/reagent_containers/food/drinks/bottle/)
/obj/item/clothing/suit/apron/overalls
name = "coveralls"
desc = "A set of denim overalls."
icon_state = "overalls"
item_state = "overalls"
/obj/item/clothing/suit/apron/overalls/random/Initialize()
. = ..()
color = get_random_colour(lower = 150)
obj/item/clothing/suit/apron/overalls/blue
color = "#3429d1"
/obj/item/clothing/suit/apron/surgery
name = "surgical apron"
desc = "To keep their blood off while you knife them."
icon_state = "surgeon"
item_state = "surgeon"
allowed = list(/obj/item/stack/medical, /obj/item/reagent_containers/dropper, /obj/item/reagent_containers/hypospray, /obj/item/reagent_containers/syringe, \
/obj/item/device/healthanalyzer, /obj/item/device/flashlight, /obj/item/device/radio, /obj/item/tank/emergency_oxygen, /obj/item/device/breath_analyzer, /obj/item/reagent_containers/blood)
/obj/item/clothing/suit/apron/surgery/zeng
name = "zeng-hu vinyl apron"
desc = "A key design element in the labwear was utility and compatibility with the Zeng-Hu positronic chassis workers that are ubiquitous throughout the corporation. As a result \
they are breathable yet non-porous, allowing for ample airflow while retaining the cleanroom standards expected of a medical and scientific uniform."
icon_state = "zeng_apron"
item_state = "zeng_apron"
//Chaplain
/obj/item/clothing/suit/chaplain_hoodie
name = "chaplain hoodie"
@@ -68,38 +20,31 @@ obj/item/clothing/suit/apron/overalls/blue
flags_inv = HIDESHOES|HIDEJUMPSUIT
allowed = list(/obj/item/tank/emergency_oxygen,/obj/item/storage/bible,/obj/item/nullrod,/obj/item/reagent_containers/food/drinks/bottle/holywater)
//Chef
/obj/item/clothing/suit/chef
name = "chef's apron"
desc = "An apron used by a high class chef."
/********** Chef/Cook Start **********/
// Chef Jacket
/obj/item/clothing/suit/chef_jacket
name = "chef jacket"
desc = "A jacket typically used by chefs when cooking."
icon_state = "chef"
item_state = "chef"
gas_transfer_coefficient = 0.90
permeability_coefficient = 0.50
body_parts_covered = UPPER_TORSO|LOWER_TORSO|ARMS
allowed = list (/obj/item/material/knife)
allowed = list(
/obj/item/material/knife
)
/obj/item/clothing/suit/chef/nt
// NanoTrasen Chef Jacket
/obj/item/clothing/suit/chef_jacket/nt
icon = 'icons/obj/item/clothing/department_uniforms/service.dmi'
contained_sprite = TRUE
icon_state = "nt_chef_jacket"
item_state = "nt_chef_jacket"
/obj/item/clothing/suit/chef/idris
// Idris Chef Jacket
/obj/item/clothing/suit/chef_jacket/idris
icon = 'icons/obj/item/clothing/department_uniforms/service.dmi'
contained_sprite = TRUE
icon_state = "idris_chef_jacket"
item_state = "idris_chef_jacket"
//Chef
/obj/item/clothing/suit/chef/classic
name = "classic chef's apron"
desc = "A basic, dull, white chef's apron."
icon_state = "apronchef"
item_state = "apronchef"
blood_overlay_type = "armor"
body_parts_covered = 0
no_overheat = TRUE
/********** Chef/Cook End **********/
//Security
/obj/item/clothing/suit/storage/security
code/modules/clothing/under/accessories/accessory.dm
+157
View File
@@ -1072,3 +1072,160 @@
/obj/item/clothing/accessory/goon_coif/get_mask_examine_text(var/mob/user)
return "on [user.get_pronoun("his")] head"
/********** Aprons Start **********/
// Apron
/obj/item/clothing/accessory/apron
name = "apron"
desc = "An apron."
icon = 'icons/obj/item/clothing/accessory/aprons.dmi'
icon_state = "apron"
item_state = "apron"
contained_sprite = TRUE
slot_flags = SLOT_OCLOTHING | SLOT_TIE
body_parts_covered = UPPER_TORSO | LOWER_TORSO
no_overheat = TRUE
allowed = list(
/obj/item/reagent_containers/food/drinks/shaker,
/obj/item/material/kitchen/utensil,
/obj/item/reagent_containers/food/condiment,
/obj/item/reagent_containers/food/drinks/bottle
)
// Random Colour Apron
/obj/item/clothing/accessory/apron/random/Initialize() // Random colour.
. = ..()
color = get_random_colour(lower = 150)
// Hydroponics Apron
/obj/item/clothing/accessory/apron/blue // Used for hydroponics.
color = "#3429d1"
allowed = list(
/obj/item/reagent_containers/spray/plantbgone,
/obj/item/device/analyzer/plant_analyzer,
/obj/item/seeds,
/obj/item/reagent_containers/glass/fertilizer,
/obj/item/material/minihoe
)
// Surgical Apron
/obj/item/clothing/accessory/apron/surgery
name = "surgical apron"
desc = "A surgical apron."
icon_state = "apron_surgeon"
item_state = "apron_surgeon"
allowed = list(
/obj/item/stack/medical,
/obj/item/reagent_containers/dropper,
/obj/item/reagent_containers/hypospray,
/obj/item/reagent_containers/syringe,
/obj/item/device/healthanalyzer,
/obj/item/device/flashlight,
/obj/item/device/radio,
/obj/item/tank/emergency_oxygen,
/obj/item/device/breath_analyzer,
/obj/item/reagent_containers/blood
)
// Zeng-Hu Surgical Apron
/obj/item/clothing/accessory/apron/surgery/zeng
name = "zeng-hu vinyl apron"
desc = "A key design element in the labwear was utility and compatibility with the Zeng-Hu positronic chassis workers that are ubiquitous throughout the corporation. \
As a result they are breathable yet non-porous, allowing for ample airflow while retaining the cleanroom standards expected of a medical and scientific uniform."
icon_state = "apron_surgeon_zeng"
item_state = "apron_surgeon_zeng"
// Chef Apron
/obj/item/clothing/accessory/apron/chef
name = "chef apron"
desc = "A basic, dull, white chef apron."
icon_state = "apron_chef"
item_state = "apron_chef"
allowed = list(
/obj/item/reagent_containers/food/drinks/shaker,
/obj/item/material/kitchen/utensil,
/obj/item/reagent_containers/food/condiment,
/obj/item/reagent_containers/food/drinks/bottle,
/obj/item/material/knife
)
/********** Aprons End **********/
/********** Overalls Start **********/
// Overalls
/obj/item/clothing/accessory/overalls
name = "overalls"
desc = "A set of denim overalls."
icon = 'icons/obj/item/clothing/accessory/overalls.dmi'
icon_state = "overalls"
item_state = "overalls"
contained_sprite = TRUE
slot_flags = SLOT_OCLOTHING | SLOT_TIE
body_parts_covered = UPPER_TORSO | LOWER_TORSO | LEGS
// Random Colour Overalls
/obj/item/clothing/accessory/overalls/random/Initialize() // Random colour.
. = ..()
color = get_random_colour(lower = 150)
// Hydroponics Overalls
/obj/item/clothing/accessory/overalls/blue // Used for hydroponics.
color = "#3429d1"
// High Back Overalls
/obj/item/clothing/accessory/overalls/high_back
name = "high back overalls"
desc = "A set of denim overalls with a high back."
icon_state = "overalls_high"
item_state = "overalls_high"
// X-shaped Back Overalls
/obj/item/clothing/accessory/overalls/x_shaped_back
name = "\improper X-shaped back overalls"
desc = "A set of denim overalls with a high back."
icon_state = "overalls_x"
item_state = "overalls_x"
// Overall Shorts
/obj/item/clothing/accessory/overalls/shorts
name = "overall shorts"
desc = "A set of denim overall shorts."
icon_state = "overall_shorts"
item_state = "overall_shorts"
body_parts_covered = UPPER_TORSO | LOWER_TORSO
// High Back Overall Shorts
/obj/item/clothing/accessory/overalls/shorts/high_back
name = "high back overall shorts"
desc = "A set of denim overall shorts with a high back."
icon_state = "overall_shorts_high"
item_state = "overall_shorts_high"
// X-shaped Back Overall Shorts
/obj/item/clothing/accessory/overalls/shorts/x_shaped_back
name = "\improper X-shaped back overall shorts"
desc = "A set of denim overall shorts with a high back."
icon_state = "overall_shorts_x"
item_state = "overall_shorts_x"
// Overall Skirt
/obj/item/clothing/accessory/overalls/skirt
name = "overall skirt"
desc = "A denim overall skirt."
icon_state = "overall_skirt"
item_state = "overall_skirt"
body_parts_covered = UPPER_TORSO | LOWER_TORSO
// High Back Overall Skirt
/obj/item/clothing/accessory/overalls/skirt/high_back
name = "high back overall skirt"
desc = "A denim overall skirt with a high back."
icon_state = "overall_skirt_high"
item_state = "overall_skirt_high"
// X-shaped Back Overall Skirt
/obj/item/clothing/accessory/overalls/skirt/x_shaped_back
name = "\improper X-shaped back overall skirt"
desc = "A denim overall skirt with a high back."
icon_state = "overall_skirt_x"
item_state = "overall_skirt_x"
/********** Overalls End **********/
code/modules/clothing/under/miscellaneous.dm
+1 -1
View File
@@ -387,7 +387,7 @@
item_state = "lb_suit"
worn_state = "tan_suit"
/obj/item/clothing/under/serviceoveralls
/obj/item/clothing/under/service_overalls
name = "workman outfit"
desc = "The very image of a working man. Not that you're probably doing work."
icon_state = "mechanic"
code/modules/clothing/under/pants.dm
+180
View File
@@ -0,0 +1,180 @@
//
// Pants
//
// Pants Parent Item
/obj/item/clothing/under/pants
name = "pants parent item"
desc = DESC_PARENT
icon = 'icons/obj/item/clothing/under/pants.dmi'
contained_sprite = TRUE
body_parts_covered = LOWER_TORSO | LEGS
/********** Pants Start **********/
// Pants
/obj/item/clothing/under/pants/white
name = "white pants"
desc = "Plain boring white pants."
icon_state = "whitepants"
item_state = "whitepants"
/obj/item/clothing/under/pants/black
name = "black pants"
desc = "A pair of plain black pants."
icon_state = "blackpants"
item_state = "blackpants"
/obj/item/clothing/under/pants/red
name = "red pants"
desc = "Bright red pants."
icon_state = "redpants"
item_state = "redpants"
/obj/item/clothing/under/pants/tan
name = "tan pants"
desc = "Some tan pants. You look like a white collar worker with these on."
icon_state = "tanpants"
item_state = "tanpants"
/obj/item/clothing/under/pants/khaki
name = "tan pants"
desc = "A pair of dust beige khaki pants."
icon_state = "khaki"
item_state = "khaki"
/obj/item/clothing/under/pants/camo
name = "camouflage pants"
desc = "A pair of woodland camouflage pants. Probably not the best choice for a space station."
icon_state = "camopants"
item_state = "camopants"
/obj/item/clothing/under/pants/dress
name = "dress pants"
desc = "A pair of suit trousers. The rest of the outfit can't have gone far."
icon_state = "dresspants"
item_state = "dresspants"
/obj/item/clothing/under/pants/dress/belt
name = "dress pants"
desc = "A pair of suit trousers. Comes with a belt, to secure your burdens."
icon_state = "dresspants_belt"
item_state = "dresspants_belt"
/obj/item/clothing/under/pants/striped
name = "striped pants"
desc = "A pair of striped pants. Typically seen among privateers."
icon_state = "stripedpants"
item_state = "stripedpants"
/obj/item/clothing/under/pants/tacticool
name = "tacticool pants"
desc = "A pair of rugged camo pants. Pairs well with canned rations and an SKS."
icon_state = "tacticoolpants"
item_state = "tacticoolpants"
/obj/item/clothing/under/pants/flared
name = "flared pants"
desc = "The peak of Biesellite fashion, these pants are flared at the ankle."
icon_state = "flaredpants"
item_state = "flaredpants"
contained_sprite = TRUE
/********** Pants End **********/
/********** Jeans Start **********/
// Jeans
/obj/item/clothing/under/pants/jeans
name = "jeans"
desc = "A nondescript pair of tough blue jeans."
icon_state = "jeans"
item_state = "jeans"
/obj/item/clothing/under/pants/classic
name = "classic jeans"
desc = "A pair of classic jeans."
icon_state = "jeansclassic"
item_state = "jeansclassic"
/obj/item/clothing/under/pants/mustang
name = "mustang jeans"
desc = "Made in the finest space jeans factory this side of Tau Ceti."
icon_state = "jeansmustang"
item_state = "jeansmustang"
/obj/item/clothing/under/pants/mustang/colourable
name = "mustang jeans"
desc = "Made in the finest space jeans factory this side of Tau Ceti."
icon_state = "mustangcolour"
item_state = "mustangcolour"
build_from_parts = TRUE
worn_overlay = "belt"
/obj/item/clothing/under/pants/jeansblack
name = "black jeans"
desc = "A pair of black jeans."
icon_state = "jeansblack"
item_state = "jeansblack"
/obj/item/clothing/under/pants/youngfolksjeans
name = "young folks jeans"
desc = "For those tired of boring old jeans."
icon_state = "jeansyoungfolks"
item_state = "jeansyoungfolks"
/obj/item/clothing/under/pants/designer
name = "designer jeans"
desc = "Dark denim jeans carefully distressed to perfection. They're not as rugged as they look."
icon_state = "designer_jeans"
item_state = "designer_jeans"
/obj/item/clothing/under/pants/tailoredjeans
name = "tailored jeans"
desc = "Close fitting denim jeans carefully distressed to perfection. They're not as rugged as they look."
icon_state = "tailored_jeans"
item_state = "tailored_jeans"
build_from_parts = TRUE
worn_overlay = "belt"
/obj/item/clothing/under/pants/ripped
name = "ripped jeans"
desc = "A pair of ripped denim jeans. Probably sold for more than they're worth."
icon_state = "jeansripped"
item_state = "jeansripped"
body_parts_covered = LOWER_TORSO
/obj/item/clothing/under/pants/blackripped
name = "black ripped jeans"
desc = "A pair of ripped black jeans. The brown belt is an interesting touch."
icon_state = "jeansblackripped"
item_state = "jeansblackripped"
body_parts_covered = LOWER_TORSO
/********** Jeans End **********/
/********** Track Pants Start **********/
// Track Pants
/obj/item/clothing/under/pants/track
name = "track pants"
desc = "Track pants, perfect for squatting."
icon = 'icons/obj/tracksuit.dmi'
icon_state = "trackpants"
item_state = "trackpants"
/obj/item/clothing/under/pants/track/blue
name = "blue track pants"
icon_state = "trackpantsblue"
item_state = "trackpantsblue"
/obj/item/clothing/under/pants/track/green
name = "green track pants"
icon_state = "trackpantsgreen"
item_state = "trackpantsgreen"
/obj/item/clothing/under/pants/track/white
name = "white track pants"
icon_state = "trackpantswhite"
item_state = "trackpantswhite"
/obj/item/clothing/under/pants/track/red
name = "red track pants"
icon_state = "trackpantsred"
item_state = "trackpantsred"
/********** Track Pants End **********/
code/modules/clothing/under/shorts.dm
+119 -248
View File
@@ -1,279 +1,150 @@
//
// Shorts
//
// Shorts Parent Item
/obj/item/clothing/under/shorts
name = "athletic shorts"
desc = "95% Polyester, 5% Spandex!"
gender = PLURAL
name = "shorts parent item"
desc = DESC_PARENT
body_parts_covered = LOWER_TORSO
icon = 'icons/obj/item/clothing/under/shorts.dmi'
contained_sprite = TRUE
/obj/item/clothing/under/shorts/red
name = "red athletic shorts"
icon_state = "redshorts"
item_state = "redshorts"
/obj/item/clothing/under/shorts/green
name = "green athletic shorts"
icon_state = "greenshorts"
item_state = "greenshorts"
/obj/item/clothing/under/shorts/blue
name = "blue athletic shorts"
icon_state = "blueshorts"
item_state = "blueshorts"
/********** Shorts Start **********/
// Shorts
/obj/item/clothing/under/shorts/black
name = "black athletic shorts"
icon_state = "blackshorts"
item_state = "blackshorts"
name = "black shorts"
desc = "For that island getaway. It's five o'clock somewhere, right?"
icon_state = "shorts_black"
item_state = "shorts_black"
/obj/item/clothing/under/shorts/grey
name = "grey athletic shorts"
icon_state = "greyshorts"
item_state = "greyshorts"
/obj/item/clothing/under/shorts/color
icon_state = "colshorts"
item_state = "colshorts"
/obj/item/clothing/under/shorts/scc
name = "Stellar Corporate Conglomerate shorts"
desc = "Shorts displaying the wearer's pride in their assigned corporate entity."
desc_extended = "The Stellar Corporate Conglomerate, also known as Chainlink, is a joint alliance between the NanoTrasen Corporation, Hephaestus Industries, Idris Incorporated, Zeng-Hu Pharmaceuticals and Zavodskoi Interstellar to exercise an undisputed economic dominance over the Orion Spur."
icon_state = "sccshorts"
item_state = "sccshorts"
/obj/item/clothing/under/shorts/jeans
name = "jeans shorts"
desc = "Some jeans! Just in short form!"
icon_state = "jeans_shorts"
item_state = "jeans_shorts"
/obj/item/clothing/under/shorts/jeans/female
name = "jeans short shorts"
icon_state = "jeans_shorts_f"
item_state = "jeans_shorts_f"
/obj/item/clothing/under/shorts/jeans/classic
name = "classic jeans shorts"
icon_state = "jeansclassic_shorts"
item_state = "jeansclassic_shorts"
/obj/item/clothing/under/shorts/jeans/classic/female
name = "classic jeans short shorts"
icon_state = "jeansclassic_shorts_f"
item_state = "jeansclassic_shorts_f"
/obj/item/clothing/under/shorts/jeans/mustang
name = "mustang jeans shorts"
icon_state = "jeansmustang_shorts"
item_state = "jeansmustang_shorts"
/obj/item/clothing/under/shorts/jeans/mustang/female
name = "mustang jeans short shorts"
icon_state = "jeansmustang_shorts_f"
item_state = "jeansmustang_shorts_f"
/obj/item/clothing/under/shorts/jeans/youngfolks
name = "young folks jeans shorts"
icon_state = "jeansyoungfolks_shorts"
item_state = "jeansyoungfolks_shorts"
/obj/item/clothing/under/shorts/jeans/youngfolks/female
name = "young folks jeans short shorts"
icon_state = "jeansyoungfolks_shorts_f"
item_state = "jeansyoungfolks_shorts_f"
/obj/item/clothing/under/shorts/jeans/black
name = "black jeans shorts"
icon_state = "blackpants_shorts"
item_state = "blackpants_shorts"
/obj/item/clothing/under/shorts/jeans/black/female
name = "black jeans short shorts"
icon_state = "black_shorts_f"
item_state = "black_shorts_f"
/obj/item/clothing/under/shorts/jeans/grey
name = "grey jeans shorts"
icon_state = "greypants_shorts"
item_state = "greypants_shorts"
/obj/item/clothing/under/shorts/jeans/grey/female
name = "grey jeans short shorts"
icon_state = "grey_shorts_f"
item_state = "grey_shorts_f"
/obj/item/clothing/under/shorts/black/short
name = "black short shorts"
icon_state = "shorts_s_black"
item_state = "shorts_s_black"
/obj/item/clothing/under/shorts/khaki
name = "khaki shorts"
desc = "For that island getaway. It's five o'clock somewhere, right?"
icon_state = "tanpants_shorts"
item_state = "tanpants_shorts"
icon_state = "shorts_khaki"
item_state = "shorts_khaki"
/obj/item/clothing/under/shorts/khaki/female
/obj/item/clothing/under/shorts/khaki/short
name = "khaki short shorts"
icon_state = "khaki_shorts_f"
item_state = "khaki_shorts_f"
icon_state = "shorts_s_khaki"
item_state = "shorts_s_khaki"
/********** Shorts End **********/
//pants
/********** Jeans Shorts Start **********/
// Jeans Shorts
/obj/item/clothing/under/shorts/jeans
name = "jeans shorts"
desc = "Some jeans! Just in short form!"
icon_state = "shorts_jeans"
item_state = "shorts_jeans"
/obj/item/clothing/under/pants
name = "jeans"
desc = "A nondescript pair of tough blue jeans."
icon = 'icons/obj/item/clothing/under/pants.dmi'
icon_state = "jeans"
item_state = "jeans"
contained_sprite = TRUE
gender = PLURAL
body_parts_covered = LOWER_TORSO|LEGS
/obj/item/clothing/under/shorts/jeans/short
name = "jeans short shorts"
icon_state = "shorts_s_jeans"
item_state = "shorts_s_jeans"
/obj/item/clothing/under/pants/track
name = "track pants"
desc = "Track pants, perfect for squatting."
icon = 'icons/obj/tracksuit.dmi'
icon_state = "trackpants"
item_state = "trackpants"
contained_sprite = TRUE
/obj/item/clothing/under/shorts/jeans/classic
name = "classic jeans shorts"
icon_state = "shorts_jeans_classic"
item_state = "shorts_jeans_classic"
/obj/item/clothing/under/pants/track/blue
name = "blue track pants"
icon_state = "trackpantsblue"
item_state = "trackpantsblue"
/obj/item/clothing/under/shorts/jeans/classic/short
name = "classic jeans short shorts"
icon_state = "shorts_s_jeans_classic"
item_state = "shorts_s_jeans_classic"
/obj/item/clothing/under/pants/track/green
name = "green track pants"
icon_state = "trackpantsgreen"
item_state = "trackpantsgreen"
/obj/item/clothing/under/shorts/jeans/mustang
name = "mustang jeans shorts"
icon_state = "shorts_jeans_mustang"
item_state = "shorts_jeans_mustang"
/obj/item/clothing/under/pants/track/white
name = "white track pants"
icon_state = "trackpantswhite"
item_state = "trackpantswhite"
/obj/item/clothing/under/shorts/jeans/mustang/short
name = "mustang jeans short shorts"
icon_state = "shorts_s_jeans_mustang"
item_state = "shorts_s_jeans_mustang"
/obj/item/clothing/under/pants/track/red
name = "red track pants"
icon_state = "trackpantsred"
item_state = "trackpantsred"
/obj/item/clothing/under/shorts/jeans/youngfolks
name = "young folks jeans shorts"
icon_state = "shorts_jeans_youngfolk"
item_state = "shorts_jeans_youngfolk"
/obj/item/clothing/under/pants/classic
name = "classic jeans"
desc = "A pair of classic jeans."
icon_state = "jeansclassic"
item_state = "jeansclassic"
/obj/item/clothing/under/shorts/jeans/youngfolks/short
name = "young folks jeans short shorts"
icon_state = "shorts_s_jeans_youngfolk"
item_state = "shorts_s_jeans_youngfolk"
/obj/item/clothing/under/pants/musthang
name = "must hang jeans"
desc = "Made in the finest space jeans factory this side of Tau Ceti."
icon_state = "jeansmustang"
item_state = "jeansmustang"
/obj/item/clothing/under/shorts/jeans/black
name = "black jeans shorts"
icon_state = "shorts_jeans_black"
item_state = "shorts_jeans_black"
/obj/item/clothing/under/pants/musthangcolour
name = "must hang jeans"
desc = "Made in the finest space jeans factory this side of Tau Ceti."
icon_state = "mustangcolour"
item_state = "mustangcolour"
build_from_parts = TRUE
worn_overlay = "belt"
/obj/item/clothing/under/shorts/jeans/black/short
name = "black jeans short shorts"
icon_state = "shorts_s_jeans_black"
item_state = "shorts_s_jeans_black"
/obj/item/clothing/under/pants/jeansblack
name = "black jeans"
desc = "A pair of black jeans."
icon_state = "jeansblack"
item_state = "jeansblack"
/obj/item/clothing/under/shorts/jeans/grey
name = "grey jeans shorts"
icon_state = "shorts_jeans_grey"
item_state = "shorts_jeans_grey"
/obj/item/clothing/under/pants/youngfolksjeans
name = "young folks jeans"
desc = "For those tired of boring old jeans."
icon_state = "jeansyoungfolks"
item_state = "jeansyoungfolks"
/obj/item/clothing/under/shorts/jeans/grey/short
name = "grey jeans short shorts"
icon_state = "shorts_s_jeans_grey"
item_state = "shorts_s_jeans_grey"
/********** Jeans Shorts End **********/
/obj/item/clothing/under/pants/white
name = "white pants"
desc = "Plain boring white pants."
icon_state = "whitepants"
item_state = "whitepants"
/********** Athletic Shorts Start **********/
// Athletic Shorts
/obj/item/clothing/under/shorts/athletic
name = "athletic shorts parent item"
desc = DESC_PARENT
/obj/item/clothing/under/pants/black
name = "black pants"
desc = "A pair of plain black pants."
icon_state = "blackpants"
item_state = "blackpants"
/obj/item/clothing/under/shorts/athletic/colourable
name = "athletic shorts"
desc = "A pair of athletic shorts."
icon_state = "shorts_athletic_colourable"
item_state = "shorts_athletic_colourable"
/obj/item/clothing/under/pants/red
name = "red pants"
desc = "Bright red pants."
icon_state = "redpants"
item_state = "redpants"
/obj/item/clothing/under/shorts/athletic/black
name = "black athletic shorts"
desc = "A pair of black athletic shorts."
icon_state = "shorts_athletic_black"
item_state = "shorts_athletic_black"
/obj/item/clothing/under/pants/tan
name = "tan pants"
desc = "Some tan pants. You look like a white collar worker with these on."
icon_state = "tanpants"
item_state = "tanpants"
/obj/item/clothing/under/shorts/athletic/red
name = "red athletic shorts"
desc = "A pair of red athletic shorts."
icon_state = "shorts_athletic_red"
item_state = "shorts_athletic_red"
/obj/item/clothing/under/pants/khaki
name = "tan pants"
desc = "A pair of dust beige khaki pants."
icon_state = "khaki"
item_state = "khaki"
/obj/item/clothing/under/shorts/athletic/green
name = "green athletic shorts"
desc = "A pair of green athletic shorts."
icon_state = "shorts_athletic_green"
item_state = "shorts_athletic_green"
/obj/item/clothing/under/pants/camo
name = "camouflage pants"
desc = "A pair of woodland camouflage pants. Probably not the best choice for a space station."
icon_state = "camopants"
item_state = "camopants"
/obj/item/clothing/under/shorts/athletic/blue
name = "blue athletic shorts"
desc = "A pair of blue athletic shorts."
icon_state = "shorts_athletic_blue"
item_state = "shorts_athletic_blue"
/obj/item/clothing/under/pants/designer
name = "designer jeans"
desc = "Dark denim jeans carefully distressed to perfection. They're not as rugged as they look."
icon_state = "designer_jeans"
item_state = "designer_jeans"
/obj/item/clothing/under/shorts/athletic/grey
name = "grey athletic shorts"
desc = "A pair of grey athletic shorts."
icon_state = "shorts_athletic_grey"
item_state = "shorts_athletic_grey"
/obj/item/clothing/under/pants/tailoredjeans
name = "tailored jeans"
desc = "Close fitting denim jeans carefully distressed to perfection. They're not as rugged as they look."
icon_state = "tailored_jeans"
item_state = "tailored_jeans"
build_from_parts = TRUE
worn_overlay = "belt"
/obj/item/clothing/under/pants/dress
name = "dress pants"
desc = "A pair of suit trousers. The rest of the outfit can't have gone far."
icon_state = "dresspants"
item_state = "dresspants"
/obj/item/clothing/under/pants/dress/belt
name = "dress pants"
desc = "A pair of suit trousers. Comes with a belt, to secure your burdens."
icon_state = "dresspants_belt"
item_state = "dresspants_belt"
/obj/item/clothing/under/pants/striped
name = "striped pants"
desc = "A pair of striped pants. Typically seen among privateers."
icon_state = "stripedpants"
item_state = "stripedpants"
/obj/item/clothing/under/pants/tacticool
name = "tacticool pants"
desc = "A pair of rugged camo pants. Pairs well with canned rations and an SKS."
icon_state = "tacticoolpants"
item_state = "tacticoolpants"
/obj/item/clothing/under/pants/ripped
name = "ripped jeans"
desc = "A pair of ripped denim jeans. Probably sold for more than they're worth."
icon_state = "jeansripped"
item_state = "jeansripped"
body_parts_covered = LOWER_TORSO
/obj/item/clothing/under/pants/blackripped
name = "black ripped jeans"
desc = "A pair of ripped black jeans. The brown belt is an interesting touch."
icon_state = "jeansblackripped"
item_state = "jeansblackripped"
body_parts_covered = LOWER_TORSO
/obj/item/clothing/under/pants/flared
name = "flared pants"
desc = "The peak of Biesellite fashion, these pants are flared at the ankle."
icon_state = "flaredpants"
item_state = "flaredpants"
/obj/item/clothing/under/shorts/athletic/scc
name = "\improper Stellar Corporate Conglomerate athletic shorts"
desc = "Shorts displaying the wearer's pride in their assigned corporate entity."
desc_extended = "The Stellar Corporate Conglomerate, also known as the Chainlink, is a joint alliance between the NanoTrasen Corporation, Hephaestus Industries, Idris Incorporated, Zeng-Hu Pharmaceuticals, and Zavodskoi Interstellar to exercise an undisputed economic dominance over the Orion Spur."
icon_state = "shorts_athletic_scc"
item_state = "shorts_athletic_scc"
/********** Athletic Shorts End **********/
code/modules/mining/abandonedcrates.dm
+2 -2
View File
@@ -45,8 +45,8 @@
if(36 to 40)
new /obj/item/melee/baton(src)
if(41 to 45)
new /obj/item/clothing/under/shorts/red(src)
new /obj/item/clothing/under/shorts/blue(src)
new /obj/item/clothing/under/shorts/athletic/red(src)
new /obj/item/clothing/under/shorts/athletic/blue(src)
if(46 to 50)
new /obj/item/clothing/under/chameleon(src)
for(var/i = 0, i < 7, i++)
html/changelogs/overwear_to_accessory.yml
+9
View File
@@ -0,0 +1,9 @@
author: SleepyGemmy
delete-after: True
changes:
- rscadd: "Adds a high back and X-shaped back version of the overalls."
- rscadd: "Adds a shorts and skirt version of the overalls and its variants."
- tweak: "Turns the loadout overalls into an accessory to allow for layering and lets them be worn as both overwear and an accessory."
- tweak: "Turns the shorts into a contained sprite and cleans up the code."
icons/mob/suit.dmi
BIN
View File
Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 245 KiB

After

Width:  |  Height:  |  Size: 239 KiB

icons/mob/uniform.dmi
BIN
View File
Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 109 KiB

After

Width:  |  Height:  |  Size: 104 KiB

icons/obj/clothing/suits.dmi
BIN
View File
Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 86 KiB

After

Width:  |  Height:  |  Size: 83 KiB

icons/obj/clothing/uniforms.dmi
BIN
View File
Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 39 KiB

After

Width:  |  Height:  |  Size: 37 KiB

icons/obj/item/clothing/accessory/aprons.dmi
BIN
View File
Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 4.7 KiB

icons/obj/item/clothing/accessory/overalls.dmi
BIN
View File
Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 1.7 KiB

icons/obj/item/clothing/under/shorts.dmi
BIN
View File
Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 2.9 KiB

maps/aurora/aurora-1_centcomm.dmm
+1 -1
View File
@@ -28740,7 +28740,7 @@
/obj/item/clothing/head/surgery/pmc,
/obj/item/clothing/head/surgery/pmc,
/obj/item/clothing/head/surgery/pmc,
/obj/item/clothing/suit/apron/surgery,
/obj/item/clothing/accessory/apron/surgery,
/obj/item/bodybag,
/obj/item/bodybag,
/obj/item/bodybag,
maps/away/away_site/abandoned_mining/cursed.dmm
+1 -1
View File
@@ -3650,7 +3650,7 @@
/obj/item/clothing/accessory/storage/overalls,
/obj/item/clothing/accessory/storage/overalls,
/obj/item/clothing/accessory/storage/overalls,
/obj/item/clothing/under/serviceoveralls,
/obj/item/clothing/under/service_overalls,
/obj/item/clothing/under/rank/miner/heph,
/obj/item/clothing/under/rank/miner/heph,
/turf/simulated/floor/wood,
maps/away/away_site/civ_station/civilian_station.dmm
+2 -2
View File
@@ -336,11 +336,11 @@
/obj/item/clothing/under/pants/track{
pixel_x = 5
},
/obj/item/clothing/under/pants/musthang,
/obj/item/clothing/under/pants/mustang,
/obj/item/clothing/under/pants/classic{
pixel_x = -5
},
/obj/item/clothing/under/shorts/blue,
/obj/item/clothing/under/shorts/athletic/blue,
/obj/item/clothing/under/shorts/jeans/mustang{
pixel_x = -5;
pixel_y = 5
maps/away/away_site/romanovich/grand_romanovich.dmm
+2 -2
View File
@@ -3496,9 +3496,9 @@
"iN" = (
/obj/structure/closet/wardrobe,
/obj/item/clothing/head/chefhat,
/obj/item/clothing/suit/chef,
/obj/item/clothing/suit/chef_jacket,
/obj/item/clothing/under/rank/chef,
/obj/item/clothing/suit/chef/classic,
/obj/item/clothing/accessory/apron/chef,
/turf/simulated/floor/tiled/freezer,
/area/grand_romanovich)
"iO" = (
maps/away/away_site/shady/shady.dmm
+1 -1
View File
@@ -224,7 +224,7 @@
"df" = (
/obj/structure/closet/cabinet,
/obj/item/clothing/under/pants/camo,
/obj/item/clothing/under/pants/musthang,
/obj/item/clothing/under/pants/mustang,
/obj/item/clothing/under/pants,
/obj/item/clothing/under/pants/tacticool,
/obj/item/clothing/under/pants/track,
maps/away/away_site/space_bar/space_bar_ghostroles.dm
+1 -1
View File
@@ -74,7 +74,7 @@
name = "Space Bar Chef"
uniform = /obj/item/clothing/under/rank/chef/idris
suit = /obj/item/clothing/suit/chef/idris
suit = /obj/item/clothing/suit/chef_jacket/idris
head = /obj/item/clothing/head/chefhat/idris
shoes = /obj/item/clothing/shoes/brown
species_shoes = list(
maps/away/away_site/tajara/mining_jack/mining_jack_ghostroles.dm
+1 -1
View File
@@ -21,7 +21,7 @@
name = "Mining Jack Miner"
uniform = list(
/obj/item/clothing/under/serviceoveralls,
/obj/item/clothing/under/service_overalls,
/obj/item/clothing/under/tajaran/mechanic,
/obj/item/clothing/under/tajaran,
/obj/item/clothing/under/overalls
maps/away/away_site/tajara/scrapper/scrapper_ghostroles.dm
+1 -1
View File
@@ -21,7 +21,7 @@
name = "Scrapper"
uniform = list(
/obj/item/clothing/under/serviceoveralls,
/obj/item/clothing/under/service_overalls,
/obj/item/clothing/under/tajaran/mechanic,
/obj/item/clothing/under/tajaran,
/obj/item/clothing/under/overalls
maps/away/away_site/unathi_pirate/unathi_pirate_izharshan.dmm
+2 -2
View File
@@ -1532,10 +1532,10 @@
/obj/item/clothing/accessory/poncho/unathimantle/mountain{
color = "#ba650b"
},
/obj/item/clothing/suit/apron/colored{
/obj/item/clothing/accessory/apron{
color = "#b97a57"
},
/obj/item/clothing/suit/apron/colored{
/obj/item/clothing/accessory/apron{
color = "#b97a57"
},
/obj/item/clothing/accessory/poncho,
maps/away/ships/coc_ranger/coc_ship.dmm
+2 -2
View File
@@ -4053,8 +4053,8 @@
/obj/item/clothing/head/beret/colorable/random,
/obj/item/clothing/head/headbando/random,
/obj/item/clothing/head/headbando/random,
/obj/item/clothing/suit/apron/overalls/random,
/obj/item/clothing/suit/apron/overalls/random,
/obj/item/clothing/accessory/apron/random,
/obj/item/clothing/accessory/apron/random,
/obj/item/clothing/suit/storage/hooded/wintercoat/hoodie/random,
/obj/item/clothing/suit/storage/hooded/wintercoat/hoodie/random,
/obj/item/clothing/suit/storage/toggle/trench/colorable/random,
maps/away/ships/orion/orion_express_ship.dmm
+2 -2
View File
@@ -1096,7 +1096,7 @@
"ian" = (
/obj/structure/table/stone/marble,
/obj/effect/floor_decal/corner/black/diagonal,
/obj/item/clothing/suit/chef,
/obj/item/clothing/suit/chef_jacket,
/turf/simulated/floor/tiled/white,
/area/ship/orion_express_ship)
"ibp" = (
@@ -1749,7 +1749,7 @@
/obj/item/clothing/suit/storage/toggle/supply_dep_jacket,
/obj/item/clothing/suit/storage/toggle/bomber,
/obj/item/clothing/under/shorts/khaki,
/obj/item/clothing/under/shorts/khaki/female,
/obj/item/clothing/under/shorts/khaki/short,
/obj/item/clothing/shoes/workboots/dark,
/obj/item/clothing/shoes/workboots/toeless/dark,
/obj/item/clothing/gloves/brown,
maps/away/ships/skrell_smuggler/tirakqi_freighter.dmm
+1 -1
View File
@@ -1197,7 +1197,7 @@
/area/ship/tirakqi_freighter)
"kwe" = (
/obj/structure/table/skrell,
/obj/item/clothing/suit/chef/classic{
/obj/item/clothing/accessory/apron/chef{
pixel_y = -6
},
/obj/random/pizzabox,
maps/away/ships/skrell_smuggler/tirakqi_freighter_ghostroles.dm
+8 -8
View File
@@ -21,13 +21,13 @@
name = "Ti'Rakqi Qu'fup"
uniform = list(
/obj/item/clothing/under/serviceoveralls,
/obj/item/clothing/under/service_overalls,
/obj/item/clothing/under/color/brown,
/obj/item/clothing/under/syndicate/tracksuit,
/obj/item/clothing/under/pants,
/obj/item/clothing/under/pants/jeans,
/obj/item/clothing/under/pants/camo,
/obj/item/clothing/under/pants/khaki,
/obj/item/clothing/under/pants/musthang,
/obj/item/clothing/under/pants/mustang,
/obj/item/clothing/under/rank/miner,
/obj/item/clothing/under/suit_jacket/tan,
/obj/item/clothing/under/tactical,
@@ -38,7 +38,7 @@
/obj/item/clothing/suit/pirate,
/obj/item/clothing/suit/storage/toggle/bomber,
/obj/item/clothing/accessory/poncho,
/obj/item/clothing/suit/apron/overalls/random,
/obj/item/clothing/accessory/overalls/random,
/obj/item/clothing/suit/ianshirt,
/obj/item/clothing/suit/storage/hooded/wintercoat/hoodie/random,
/obj/item/clothing/suit/storage/hooded/wintercoat,
@@ -127,12 +127,12 @@
name = "Ti'Rakqi Qu'fup"
uniform = list(
/obj/item/clothing/under/serviceoveralls,
/obj/item/clothing/under/service_overalls,
/obj/item/clothing/under/captainformal,
/obj/item/clothing/under/pants,
/obj/item/clothing/under/pants/jeans,
/obj/item/clothing/under/pants/camo,
/obj/item/clothing/under/pants/khaki,
/obj/item/clothing/under/pants/musthang,
/obj/item/clothing/under/pants/mustang,
/obj/item/clothing/under/suit_jacket/tan,
/obj/item/clothing/under/tactical
)
@@ -187,7 +187,7 @@
/datum/outfit/admin/tirakqi_crew/engineer
name = "Ti'Rakqi Engineer"
uniform = /obj/item/clothing/under/serviceoveralls
uniform = /obj/item/clothing/under/service_overalls
suit = /obj/item/clothing/accessory/storage/overalls
belt = /obj/item/storage/belt/utility/full
gloves = /obj/item/clothing/gloves/yellow
maps/event/idris_cruise/idris_cruise-1.dmm
+28 -28
View File
@@ -1892,34 +1892,34 @@
/obj/machinery/light{
dir = 4
},
/obj/item/clothing/under/shorts/red,
/obj/item/clothing/under/shorts/red,
/obj/item/clothing/under/shorts/red,
/obj/item/clothing/under/shorts/red,
/obj/item/clothing/under/shorts/red,
/obj/item/clothing/under/shorts/red,
/obj/item/clothing/under/shorts/green,
/obj/item/clothing/under/shorts/green,
/obj/item/clothing/under/shorts/green,
/obj/item/clothing/under/shorts/green,
/obj/item/clothing/under/shorts/green,
/obj/item/clothing/under/shorts/green,
/obj/item/clothing/under/shorts/grey,
/obj/item/clothing/under/shorts/grey,
/obj/item/clothing/under/shorts/grey,
/obj/item/clothing/under/shorts/grey,
/obj/item/clothing/under/shorts/grey,
/obj/item/clothing/under/shorts/blue,
/obj/item/clothing/under/shorts/blue,
/obj/item/clothing/under/shorts/blue,
/obj/item/clothing/under/shorts/blue,
/obj/item/clothing/under/shorts/blue,
/obj/item/clothing/under/shorts/blue,
/obj/item/clothing/under/shorts/black,
/obj/item/clothing/under/shorts/black,
/obj/item/clothing/under/shorts/black,
/obj/item/clothing/under/shorts/black,
/obj/item/clothing/under/shorts/black,
/obj/item/clothing/under/shorts/athletic/red,
/obj/item/clothing/under/shorts/athletic/red,
/obj/item/clothing/under/shorts/athletic/red,
/obj/item/clothing/under/shorts/athletic/red,
/obj/item/clothing/under/shorts/athletic/red,
/obj/item/clothing/under/shorts/athletic/red,
/obj/item/clothing/under/shorts/athletic/green,
/obj/item/clothing/under/shorts/athletic/green,
/obj/item/clothing/under/shorts/athletic/green,
/obj/item/clothing/under/shorts/athletic/green,
/obj/item/clothing/under/shorts/athletic/green,
/obj/item/clothing/under/shorts/athletic/green,
/obj/item/clothing/under/shorts/athletic/grey,
/obj/item/clothing/under/shorts/athletic/grey,
/obj/item/clothing/under/shorts/athletic/grey,
/obj/item/clothing/under/shorts/athletic/grey,
/obj/item/clothing/under/shorts/athletic/grey,
/obj/item/clothing/under/shorts/athletic/blue,
/obj/item/clothing/under/shorts/athletic/blue,
/obj/item/clothing/under/shorts/athletic/blue,
/obj/item/clothing/under/shorts/athletic/blue,
/obj/item/clothing/under/shorts/athletic/blue,
/obj/item/clothing/under/shorts/athletic/blue,
/obj/item/clothing/under/shorts/athletic/black,
/obj/item/clothing/under/shorts/athletic/black,
/obj/item/clothing/under/shorts/athletic/black,
/obj/item/clothing/under/shorts/athletic/black,
/obj/item/clothing/under/shorts/athletic/black,
/turf/unsimulated/floor{
icon_state = "wood_birch"
},
maps/sccv_horizon/sccv_horizon-4_centcomm.dmm
+1 -1
View File
@@ -21529,7 +21529,7 @@
/obj/item/clothing/head/surgery/pmc,
/obj/item/clothing/head/surgery/pmc,
/obj/item/clothing/head/surgery/pmc,
/obj/item/clothing/suit/apron/surgery,
/obj/item/clothing/accessory/apron/surgery,
/obj/item/bodybag,
/obj/item/bodybag,
/obj/item/bodybag,