cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-13 19:52:40 +00:00
Code Issues Packages Projects Releases Wiki Activity

Brings some variety and color to back to closets

Browse Source
This commit is contained in:
Heroman
2020-06-07 06:45:22 +10:00
parent 499b9b51f4
commit 273f7540b6
16 changed files with 351 additions and 83 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
code/__defines/color.dm
View File

@@ -82,6 +82,15 @@
#define COLOR_ASTEROID_ROCK "#735555" #define COLOR_ASTEROID_ROCK "#735555"
#define COLOR_NULLGLASS "#ff6088" #define COLOR_NULLGLASS "#ff6088"
#define COLOR_DIAMOND "#d8d4ea" #define COLOR_DIAMOND "#d8d4ea"
#define COLOR_LIGHT_PINK "#ffbaf9"
#define COLOR_LIGHT_RED "#ff4f4f"
#define COLOR_PALE_MAROON "#6e2121"
#define COLOR_LIGHT_GREEN "#00cf00"
#define COLOR_SALAD_GREEN "#67e067"
#define COLOR_DARK_GOLD "#ab9029"
#define COLOR_DARK_TEAL "#2db5b5"
#define COLOR_LIGHT_VIOLET "#e7bfff"
#define COLOR_SAN_MARINO_BLUE "#4b75ab"
#define PIPE_COLOR_GREY "#808080" #define PIPE_COLOR_GREY "#808080"
#define PIPE_COLOR_RED "#ff0000" #define PIPE_COLOR_RED "#ff0000"

279
code/game/objects/structures/crates_lockers/_closets_appearance_definitions.dm
View File

@@ -100,6 +100,12 @@
"inset" = COLOR_GRAY "inset" = COLOR_GRAY
) )
/decl/closet_appearance/thunderdomered
color = COLOR_LIGHT_RED
/decl/closet_appearance/thunderdomegreen
color = COLOR_LIGHT_GREEN
/decl/closet_appearance/tactical/alt /decl/closet_appearance/tactical/alt
color = COLOR_PALE_BTL_GREEN color = COLOR_PALE_BTL_GREEN
@@ -109,22 +115,34 @@
"stripe_w" = COLOR_GRAY "stripe_w" = COLOR_GRAY
) )
/decl/closet_appearance/wardrobe/blue
extra_decals = list(
"stripe_horizontal" = COLOR_TEAL,
"stripe_w" = COLOR_OFF_WHITE
)
/decl/closet_appearance/wardrobe/purple
extra_decals = list(
"stripe_horizontal" = COLOR_VIOLET,
"stripe_w" = COLOR_OFF_WHITE
)
/decl/closet_appearance/wardrobe/mixed /decl/closet_appearance/wardrobe/mixed
extra_decals = list( extra_decals = list(
"stripe_horizontal_upper" = COLOR_PURPLE_GRAY, "stripe_horizontal_upper" = COLOR_VIOLET,
"stripe_horizontal_lower" = COLOR_PALE_RED_GRAY, "stripe_horizontal_lower" = COLOR_PALE_PINK,
"stripe_w" = COLOR_OFF_WHITE "stripe_w" = COLOR_OFF_WHITE
) )
/decl/closet_appearance/wardrobe/orange /decl/closet_appearance/wardrobe/orange
extra_decals = list( extra_decals = list(
"stripe_horizontal" = COLOR_PALE_ORANGE, "stripe_horizontal" = COLOR_ORANGE,
"stripe_w" = COLOR_OFF_WHITE "stripe_w" = COLOR_OFF_WHITE
) )
/decl/closet_appearance/wardrobe/green /decl/closet_appearance/wardrobe/green
extra_decals = list( extra_decals = list(
"stripe_horizontal" = COLOR_GREEN_GRAY, "stripe_horizontal" = COLOR_GREEN,
"stripe_w" = COLOR_OFF_WHITE "stripe_w" = COLOR_OFF_WHITE
) )
@@ -136,7 +154,7 @@
/decl/closet_appearance/wardrobe/pink /decl/closet_appearance/wardrobe/pink
extra_decals = list( extra_decals = list(
"stripe_horizontal" = COLOR_PALE_PINK, "stripe_horizontal" = COLOR_LIGHT_PINK,
"stripe_w" = COLOR_OFF_WHITE "stripe_w" = COLOR_OFF_WHITE
) )
@@ -148,13 +166,13 @@
/decl/closet_appearance/wardrobe/yellow /decl/closet_appearance/wardrobe/yellow
extra_decals = list( extra_decals = list(
"stripe_horizontal" = COLOR_PALE_YELLOW, "stripe_horizontal" = COLOR_YELLOW,
"stripe_w" = COLOR_OFF_WHITE "stripe_w" = COLOR_OFF_WHITE
) )
/decl/closet_appearance/wardrobe/red /decl/closet_appearance/wardrobe/red
extra_decals = list( extra_decals = list(
"stripe_horizontal" = COLOR_RED_GRAY, "stripe_horizontal" = COLOR_LIGHT_RED,
"stripe_w" = COLOR_OFF_WHITE "stripe_w" = COLOR_OFF_WHITE
) )
@@ -164,6 +182,111 @@
"stripe_w" = COLOR_OFF_WHITE, "stripe_w" = COLOR_OFF_WHITE,
) )
/decl/closet_appearance/wardrobe/suit
extra_decals = list(
"stripe_horizontal_upper" = COLOR_OFF_WHITE,
"stripe_horizontal_lower" = COLOR_GRAY,
"stripe_w" = COLOR_OFF_WHITE
)
/decl/closet_appearance/wardrobe/janitor
extra_decals = list(
"stripe_horizontal" = COLOR_PURPLE,
"stripe_w" = COLOR_OFF_WHITE
)
/decl/closet_appearance/wardrobe/medical
color = COLOR_OFF_WHITE
/decl/closet_appearance/wardrobe/medical/patient
extra_decals = list(
"stripe_horizontal" = COLOR_GRAY,
"stripe_w" = COLOR_OFF_WHITE,
)
/decl/closet_appearance/wardrobe/medical/white
extra_decals = list(
"stripe_horizontal" = COLOR_OFF_WHITE,
"stripe_w" = COLOR_OFF_WHITE,
)
/decl/closet_appearance/wardrobe/medical/chemistry
extra_decals = list(
"stripe_horizontal_upper" = COLOR_OFF_WHITE,
"stripe_horizontal_lower" = COLOR_ORANGE,
"stripe_w" = COLOR_OFF_WHITE,
)
/decl/closet_appearance/wardrobe/medical/genetics
extra_decals = list(
"stripe_horizontal_upper" = COLOR_OFF_WHITE,
"stripe_horizontal_lower" = COLOR_BABY_BLUE,
"stripe_w" = COLOR_OFF_WHITE,
)
/decl/closet_appearance/wardrobe/medical/virology
extra_decals = list(
"stripe_horizontal_upper" = COLOR_OFF_WHITE,
"stripe_horizontal_lower" = COLOR_LIME,
"stripe_w" = COLOR_OFF_WHITE,
)
/decl/closet_appearance/wardrobe/robotics
color = COLOR_OFF_WHITE
extra_decals = list(
"stripe_horizontal_upper" = COLOR_GRAY20,
"stripe_horizontal_lower" = COLOR_PALE_MAROON,
"stripe_w" = COLOR_OFF_WHITE
)
/decl/closet_appearance/wardrobe/science
color = COLOR_OFF_WHITE
extra_decals = list(
"stripe_horizontal" = COLOR_PURPLE,
"stripe_w" = COLOR_OFF_WHITE
)
/decl/closet_appearance/wardrobe/pjs
extra_decals = list(
"stripe_horizontal" = COLOR_OFF_WHITE,
)
/decl/closet_appearance/wardrobe/white
extra_decals = list(
"stripe_horizontal" = COLOR_OFF_WHITE,
"stripe_w" = COLOR_OFF_WHITE,
)
/decl/closet_appearance/wardrobe/engineer
extra_decals = list(
"stripe_horizontal" = COLOR_PALE_ORANGE,
"stripe_w" = COLOR_OFF_WHITE,
)
/decl/closet_appearance/wardrobe/engineer/atmos
extra_decals = list(
"stripe_horizontal_upper" = COLOR_PALE_ORANGE,
"stripe_horizontal_lower" = COLOR_TEAL,
"stripe_w" = COLOR_OFF_WHITE,
)
/decl/closet_appearance/wardrobe/chapel
extra_decals = list(
"stripe_horizontal_upper" = COLOR_PALE_YELLOW,
"stripe_horizontal_lower" = COLOR_GRAY20,
"stripe_w" = COLOR_OFF_WHITE,
)
/decl/closet_appearance/wardrobe/xenos
extra_decals = list(
"stripe_horizontal_upper" = COLOR_GREEN,
"stripe_horizontal_lower" = COLOR_GOLD,
"stripe_w" = COLOR_OFF_WHITE
)
/decl/closet_appearance/ert
color = COLOR_RED_GRAY
/decl/closet_appearance/bio /decl/closet_appearance/bio
color = COLOR_PALE_ORANGE color = COLOR_PALE_ORANGE
decals = list( decals = list(
@@ -180,9 +303,15 @@
"biohazard" = COLOR_OFF_WHITE "biohazard" = COLOR_OFF_WHITE
) )
/decl/closet_appearance/bio/medical
extra_decals = list(
"lower_half_solid" = COLOR_PALE_BLUE_GRAY,
"biohazard" = COLOR_OFF_WHITE
)
/decl/closet_appearance/bio/science /decl/closet_appearance/bio/science
extra_decals = list( extra_decals = list(
"lower_half_solid" = COLOR_PALE_YELLOW, "lower_half_solid" = COLOR_PALE_PINK,
"biohazard" = COLOR_OFF_WHITE "biohazard" = COLOR_OFF_WHITE
) )
@@ -211,6 +340,9 @@
/decl/closet_appearance/secure_closet /decl/closet_appearance/secure_closet
can_lock = TRUE can_lock = TRUE
/decl/closet_appearance/secure_closet/patient
color = COLOR_OFF_WHITE
/decl/closet_appearance/secure_closet/engineering /decl/closet_appearance/secure_closet/engineering
can_lock = TRUE can_lock = TRUE
color = COLOR_YELLOW_GRAY color = COLOR_YELLOW_GRAY
@@ -235,9 +367,9 @@
/decl/closet_appearance/secure_closet/engineering/atmos /decl/closet_appearance/secure_closet/engineering/atmos
extra_decals = list( extra_decals = list(
"stripe_vertical_right_partial" = COLOR_CYAN_BLUE, "stripe_vertical_right_partial" = COLOR_DARK_TEAL,
"stripe_vertical_mid_partial" = COLOR_CYAN_BLUE, "stripe_vertical_mid_partial" = COLOR_DARK_TEAL,
"atmos" = COLOR_CYAN_BLUE "atmos" = COLOR_DARK_TEAL
) )
/decl/closet_appearance/secure_closet/engineering/welding /decl/closet_appearance/secure_closet/engineering/welding
@@ -259,6 +391,12 @@
"vertical_stripe_simple" = COLOR_BEASTY_BROWN "vertical_stripe_simple" = COLOR_BEASTY_BROWN
) )
/decl/closet_appearance/secure_closet/engineering/tools/xenoarch
extra_decals = list(
"pick" = COLOR_BEASTY_BROWN,
"vertical_stripe_simple" = COLOR_BEASTY_BROWN
)
/decl/closet_appearance/secure_closet/engineering/tools/radiation /decl/closet_appearance/secure_closet/engineering/tools/radiation
extra_decals = list( extra_decals = list(
"l2" = COLOR_BEASTY_BROWN, "l2" = COLOR_BEASTY_BROWN,
@@ -268,9 +406,9 @@
/decl/closet_appearance/secure_closet/engineering/ce /decl/closet_appearance/secure_closet/engineering/ce
color = COLOR_OFF_WHITE color = COLOR_OFF_WHITE
extra_decals = list( extra_decals = list(
"stripe_vertical_right_partial" = COLOR_CLOSET_GOLD, "stripe_vertical_right_partial" = COLOR_DARK_GOLD,
"stripe_vertical_mid_partial" = COLOR_CLOSET_GOLD, "stripe_vertical_mid_partial" = COLOR_DARK_GOLD,
"eng_narrow" = COLOR_CLOSET_GOLD "eng_narrow" = COLOR_DARK_GOLD
) )
/decl/closet_appearance/secure_closet/mining /decl/closet_appearance/secure_closet/mining
@@ -299,16 +437,16 @@
"upper_holes" "upper_holes"
) )
extra_decals = list( extra_decals = list(
"stripe_vertical_left_partial" = COLOR_CLOSET_GOLD, "stripe_vertical_left_partial" = COLOR_GOLD,
"stripe_vertical_right_partial" = COLOR_CLOSET_GOLD, "stripe_vertical_right_partial" = COLOR_GOLD,
"captain" = COLOR_CLOSET_GOLD "captain" = COLOR_GOLD
) )
/decl/closet_appearance/secure_closet/command/hop /decl/closet_appearance/secure_closet/command/hop
color = COLOR_PALE_BLUE_GRAY color = COLOR_PALE_BLUE_GRAY
extra_decals = list( extra_decals = list(
"stripe_vertical_mid_partial" = COLOR_CLOSET_GOLD, "stripe_vertical_mid_partial" = COLOR_GOLD,
"hop" = COLOR_CLOSET_GOLD "hop" = COLOR_GOLD
) )
/decl/closet_appearance/secure_closet/cmo /decl/closet_appearance/secure_closet/cmo
@@ -318,9 +456,9 @@
"lower_side_vent" "lower_side_vent"
) )
extra_decals = list( extra_decals = list(
"medcircle" = COLOR_CLOSET_GOLD, "medcircle" = COLOR_GOLD,
"stripe_vertical_right_partial" = COLOR_CLOSET_GOLD, "stripe_vertical_right_partial" = COLOR_GOLD,
"stripe_vertical_mid_partial" = COLOR_CLOSET_GOLD "stripe_vertical_mid_partial" = COLOR_GOLD
) )
/decl/closet_appearance/secure_closet/medical /decl/closet_appearance/secure_closet/medical
@@ -349,6 +487,32 @@
"stripe_vertical_mid_partial" = COLOR_BLUE_GRAY "stripe_vertical_mid_partial" = COLOR_BLUE_GRAY
) )
/decl/closet_appearance/secure_closet/medical/chemistry
extra_decals = list(
"medcircle" = COLOR_ORANGE,
"stripe_vertical_right_partial" = COLOR_ORANGE,
"stripe_vertical_mid_partial" = COLOR_ORANGE
)
/decl/closet_appearance/secure_closet/medical/paramedic
decals = list(
"lower_holes"
)
extra_decals = list(
"medical" = COLOR_BLUE_GRAY,
"stripe_vertical_mid_full" = COLOR_BLUE_GRAY
)
/decl/closet_appearance/secure_closet/medical/doctor
decals = list(
"lower_holes"
)
extra_decals = list(
"medical" = COLOR_BLUE_GRAY,
"stripe_vertical_right_full" = COLOR_BLUE_GRAY,
"stripe_vertical_left_full" = COLOR_BLUE_GRAY
)
/decl/closet_appearance/secure_closet/cargo /decl/closet_appearance/secure_closet/cargo
color = COLOR_WARM_YELLOW color = COLOR_WARM_YELLOW
decals = list( decals = list(
@@ -356,16 +520,28 @@
"lower_side_vent" "lower_side_vent"
) )
extra_decals = list( extra_decals = list(
"cargo" = COLOR_GRAY40, "cargo" = COLOR_BEASTY_BROWN,
"stripe_vertical_left_partial" = COLOR_GRAY40, "stripe_vertical_left_partial" = COLOR_BEASTY_BROWN,
"stripe_vertical_mid_partial" = COLOR_GRAY40 "stripe_vertical_mid_partial" = COLOR_BEASTY_BROWN
) )
/decl/closet_appearance/secure_closet/cargo/qm /decl/closet_appearance/secure_closet/cargo/qm
extra_decals = list( extra_decals = list(
"cargo" = COLOR_BEASTY_BROWN, "cargo" = COLOR_SILVER,
"stripe_vertical_left_partial" = COLOR_BEASTY_BROWN, "stripe_vertical_left_partial" = COLOR_SILVER,
"stripe_vertical_mid_partial" = COLOR_BEASTY_BROWN "stripe_vertical_mid_partial" = COLOR_SILVER
)
/decl/closet_appearance/secure_closet/courtroom
decals = list(
"lower_holes",
"upper_holes"
)
/decl/closet_appearance/secure_closet/brig
color = COLOR_DARK_ORANGE
extra_decals = list(
"inset" = COLOR_GRAY40
) )
/decl/closet_appearance/secure_closet/security /decl/closet_appearance/secure_closet/security
@@ -389,8 +565,8 @@
extra_decals = list( extra_decals = list(
"stripe_vertical_left_full" = COLOR_WARM_YELLOW, "stripe_vertical_left_full" = COLOR_WARM_YELLOW,
"stripe_vertical_right_full" = COLOR_WARM_YELLOW, "stripe_vertical_right_full" = COLOR_WARM_YELLOW,
"stripe_vertical_mid_full" = COLOR_CLOSET_GOLD, "stripe_vertical_mid_full" = COLOR_GOLD,
"security" = COLOR_CLOSET_GOLD "security" = COLOR_GOLD
) )
/decl/closet_appearance/bomb /decl/closet_appearance/bomb
@@ -399,12 +575,12 @@
"l4" = COLOR_OFF_WHITE "l4" = COLOR_OFF_WHITE
) )
extra_decals = list( extra_decals = list(
"lower_half_solid" = COLOR_GREEN_GRAY "lower_half_solid" = COLOR_PALE_PINK
) )
/decl/closet_appearance/bomb/security /decl/closet_appearance/bomb/security
extra_decals = list( extra_decals = list(
"lower_half_solid" = COLOR_WARM_YELLOW "lower_half_solid" = COLOR_RED_GRAY
) )
/decl/closet_appearance/oxygen /decl/closet_appearance/oxygen
@@ -417,7 +593,7 @@
) )
/decl/closet_appearance/oxygen/fire /decl/closet_appearance/oxygen/fire
color = COLOR_RED_GRAY color = COLOR_RED_LIGHT
extra_decals = list( extra_decals = list(
"extinguisher" = COLOR_OFF_WHITE, "extinguisher" = COLOR_OFF_WHITE,
"vertical_stripe_simple" = COLOR_OFF_WHITE, "vertical_stripe_simple" = COLOR_OFF_WHITE,
@@ -444,22 +620,29 @@
"security" = COLOR_CLOSET_GOLD "security" = COLOR_CLOSET_GOLD
) )
/decl/closet_appearance/secure_closet/expedition/science /decl/closet_appearance/secure_closet/science
color = COLOR_OFF_WHITE
decals = list(
"lower_holes"
)
extra_decals = list( extra_decals = list(
"stripe_vertical_mid_full" = COLOR_PURPLE, "stripe_vertical_mid_full" = COLOR_PURPLE,
"research" = COLOR_PURPLE "research" = COLOR_PURPLE
) )
/decl/closet_appearance/secure_closet/rd /decl/closet_appearance/secure_closet/science/xenoarch
color = COLOR_BOTTLE_GREEN extra_decals = list(
decals = list( "stripe_vertical_left_full" = COLOR_PURPLE,
"lower_holes" "stripe_vertical_right_full" = COLOR_PURPLE,
"research" = COLOR_PURPLE
) )
/decl/closet_appearance/secure_closet/science/rd
extra_decals = list( extra_decals = list(
"stripe_vertical_mid_full" = COLOR_GOLD, "stripe_vertical_mid_full" = COLOR_GOLD,
"stripe_vertical_left_full" = COLOR_PURPLE, "stripe_vertical_left_full" = COLOR_PURPLE,
"stripe_vertical_right_full" = COLOR_PURPLE, "stripe_vertical_right_full" = COLOR_PURPLE,
"research" = COLOR_GOLD "research" = COLOR_PURPLE
) )
/decl/closet_appearance/secure_closet/corporate /decl/closet_appearance/secure_closet/corporate
@@ -473,15 +656,22 @@
) )
/decl/closet_appearance/secure_closet/hydroponics /decl/closet_appearance/secure_closet/hydroponics
color = COLOR_GREEN_GRAY color = COLOR_SALAD_GREEN
decals = list( decals = list(
"lower_side_vent", "lower_side_vent",
"upper_side_vent" "upper_side_vent"
) )
extra_decals = list( extra_decals = list(
"stripe_vertical_right_partial" = COLOR_DARK_GREEN_GRAY, "stripe_vertical_right_partial" = COLOR_GREEN,
"stripe_vertical_mid_partial" = COLOR_DARK_GREEN_GRAY, "stripe_vertical_mid_partial" = COLOR_GREEN,
"hydro" = COLOR_DARK_GREEN_GRAY "hydro" = COLOR_GREEN
)
/decl/closet_appearance/secure_closet/hydroponics/xenoflora
extra_decals = list(
"stripe_vertical_right_partial" = COLOR_PURPLE,
"stripe_vertical_mid_partial" = COLOR_PURPLE,
"hydro" = COLOR_PURPLE
) )
/decl/closet_appearance/secure_closet/chaplain /decl/closet_appearance/secure_closet/chaplain
@@ -666,6 +856,7 @@
extra_decals = null extra_decals = null
/decl/closet_appearance/wall/emergency /decl/closet_appearance/wall/emergency
color = COLOR_LIGHT_CYAN
decals = null decals = null
extra_decals = list( extra_decals = list(
"glass" = COLOR_WHITE "glass" = COLOR_WHITE
@@ -689,7 +880,7 @@
) )
/decl/closet_appearance/wall/hydrant /decl/closet_appearance/wall/hydrant
color = COLOR_NT_RED color = COLOR_RED_LIGHT
decals = null decals = null
extra_decals = list( extra_decals = list(
"stripes" = COLOR_OFF_WHITE, "stripes" = COLOR_OFF_WHITE,

60
code/game/objects/structures/crates_lockers/_closets_appearance_definitions_vr.dm
View File

@@ -36,3 +36,63 @@
extra_decals = list( extra_decals = list(
"stripes_horizontal" = COLOR_GOLD "stripes_horizontal" = COLOR_GOLD
) )
/decl/closet_appearance/secure_closet/nanotrasen
color = COLOR_BOTTLE_GREEN
decals = list(
"lower_holes"
)
/decl/closet_appearance/secure_closet/nanotrasen/security
extra_decals = list(
"stripe_vertical_mid_full" = COLOR_NAVY_BLUE,
"nanotrasen" = COLOR_GOLD
)
/decl/closet_appearance/secure_closet/nanotrasen/warden
extra_decals = list(
"stripe_vertical_left_full" = COLOR_NAVY_BLUE,
"stripe_vertical_right_full" = COLOR_NAVY_BLUE,
"nanotrasen" = COLOR_GOLD
)
/decl/closet_appearance/secure_closet/nanotrasen/commander
extra_decals = list(
"stripe_vertical_left_full" = COLOR_NAVY_BLUE,
"stripe_vertical_mid_full" = COLOR_GOLD,
"stripe_vertical_right_full" = COLOR_NAVY_BLUE,
"nanotrasen" = COLOR_GOLD
)
/decl/closet_appearance/secure_closet/expedition
color = COLOR_LIGHT_VIOLET
decals = list(
"lower_holes"
)
/decl/closet_appearance/secure_closet/expedition/pilot
extra_decals = list(
"stripe_vertical_mid_full" = COLOR_DARK_ORANGE,
"exped" = COLOR_DARK_ORANGE
)
/decl/closet_appearance/secure_closet/expedition/sar
extra_decals = list(
"stripe_vertical_mid_full" = COLOR_SAN_MARINO_BLUE,
"exped" = COLOR_SAN_MARINO_BLUE
)
/decl/closet_appearance/secure_closet/expedition/explorer
extra_decals = list(
"stripe_vertical_left_full" = COLOR_PURPLE,
"stripe_vertical_right_full" = COLOR_PURPLE,
"exped" = COLOR_PURPLE
)
/decl/closet_appearance/secure_closet/expedition/pathfinder
extra_decals = list(
"stripe_vertical_left_full" = COLOR_PURPLE,
"stripe_vertical_mid_full" = COLOR_GRAY40,
"stripe_vertical_right_full" = COLOR_PURPLE,
"exped" = COLOR_GRAY40
)

4
code/game/objects/structures/crates_lockers/closets/fitness.dm
View File

@@ -23,6 +23,7 @@
/obj/structure/closet/boxinggloves /obj/structure/closet/boxinggloves
name = "boxing gloves" name = "boxing gloves"
desc = "It's a storage unit for gloves for use in the boxing ring." desc = "It's a storage unit for gloves for use in the boxing ring."
closet_appearance = /decl/closet_appearance/wardrobe/mixed
starts_with = list( starts_with = list(
/obj/item/clothing/gloves/boxing/blue, /obj/item/clothing/gloves/boxing/blue,
@@ -33,6 +34,7 @@
/obj/structure/closet/masks /obj/structure/closet/masks
name = "mask closet" name = "mask closet"
desc = "IT'S A STORAGE UNIT FOR FIGHTER MASKS OLE!" desc = "IT'S A STORAGE UNIT FOR FIGHTER MASKS OLE!"
closet_appearance = /decl/closet_appearance/wardrobe/mixed
starts_with = list( starts_with = list(
/obj/item/clothing/mask/luchador, /obj/item/clothing/mask/luchador,
@@ -53,7 +55,7 @@
/obj/structure/closet/lasertag/blue /obj/structure/closet/lasertag/blue
name = "blue laser tag equipment" name = "blue laser tag equipment"
desc = "It's a storage unit for laser tag equipment." desc = "It's a storage unit for laser tag equipment."
closet_appearance = /decl/closet_appearance/wardrobe closet_appearance = /decl/closet_appearance/wardrobe/blue
starts_with = list( starts_with = list(
/obj/item/weapon/gun/energy/lasertag/blue = 5, /obj/item/weapon/gun/energy/lasertag/blue = 5,

4
code/game/objects/structures/crates_lockers/closets/gimmick.dm
View File

@@ -43,7 +43,7 @@
/obj/structure/closet/thunderdome /obj/structure/closet/thunderdome
name = "\improper Thunderdome closet" name = "\improper Thunderdome closet"
desc = "Everything you need!" desc = "Everything you need!"
closet_appearance = /decl/closet_appearance/tactical/alt closet_appearance = /decl/closet_appearance/thunderdomered
anchored = 1 anchored = 1
/obj/structure/closet/thunderdome/tdred /obj/structure/closet/thunderdome/tdred
@@ -59,7 +59,7 @@
/obj/structure/closet/thunderdome/tdgreen /obj/structure/closet/thunderdome/tdgreen
name = "green-team Thunderdome closet" name = "green-team Thunderdome closet"
closet_appearance = /decl/closet_appearance/tactical closet_appearance = /decl/closet_appearance/thunderdomegreen
starts_with = list( starts_with = list(
/obj/item/clothing/suit/armor/tdome/green = 3, /obj/item/clothing/suit/armor/tdome/green = 3,

8
code/game/objects/structures/crates_lockers/closets/job_closets.dm
View File

@@ -11,7 +11,7 @@
/obj/structure/closet/gmcloset /obj/structure/closet/gmcloset
name = "formal closet" name = "formal closet"
desc = "It's a storage unit for formal clothing." desc = "It's a storage unit for formal clothing."
closet_appearance = /decl/closet_appearance/wardrobe/black closet_appearance = /decl/closet_appearance/wardrobe/suit
starts_with = list( starts_with = list(
/obj/item/clothing/head/that = 2, /obj/item/clothing/head/that = 2,
@@ -36,7 +36,7 @@
/obj/structure/closet/chefcloset /obj/structure/closet/chefcloset
name = "chef's closet" name = "chef's closet"
desc = "It's a storage unit for foodservice garments." desc = "It's a storage unit for foodservice garments."
closet_appearance = /decl/closet_appearance/wardrobe/black closet_appearance = /decl/closet_appearance/wardrobe/white
starts_with = list( starts_with = list(
/obj/item/clothing/under/sundress, /obj/item/clothing/under/sundress,
@@ -53,7 +53,7 @@
/obj/structure/closet/jcloset /obj/structure/closet/jcloset
name = "custodial closet" name = "custodial closet"
desc = "It's a storage unit for janitorial clothes and gear." desc = "It's a storage unit for janitorial clothes and gear."
closet_appearance = /decl/closet_appearance/wardrobe/mixed closet_appearance = /decl/closet_appearance/wardrobe/janitor
starts_with = list( starts_with = list(
/obj/item/clothing/under/rank/janitor, /obj/item/clothing/under/rank/janitor,
@@ -76,7 +76,7 @@
/obj/structure/closet/lawcloset /obj/structure/closet/lawcloset
name = "legal closet" name = "legal closet"
desc = "It's a storage unit for courtroom apparel and items." desc = "It's a storage unit for courtroom apparel and items."
closet_appearance = /decl/closet_appearance/wardrobe closet_appearance = /decl/closet_appearance/wardrobe/suit
starts_with = list( starts_with = list(
/obj/item/clothing/under/lawyer/female = 2, /obj/item/clothing/under/lawyer/female = 2,

2
code/game/objects/structures/crates_lockers/closets/l3closet.dm
View File

@@ -53,7 +53,7 @@
/obj/structure/closet/l3closet/medical /obj/structure/closet/l3closet/medical
closet_appearance = /decl/closet_appearance/bio/science closet_appearance = /decl/closet_appearance/bio/medical
starts_with = list( starts_with = list(
/obj/item/clothing/suit/bio_suit/general = 3, /obj/item/clothing/suit/bio_suit/general = 3,

8
code/game/objects/structures/crates_lockers/closets/misc_vr.dm
View File

@@ -38,7 +38,7 @@
/obj/structure/closet/secure_closet/explorer /obj/structure/closet/secure_closet/explorer
name = "explorer locker" name = "explorer locker"
req_access = list(access_explorer) req_access = list(access_explorer)
closet_appearance = /decl/closet_appearance/secure_closet/exploration closet_appearance = /decl/closet_appearance/secure_closet/expedition/explorer
starts_with = list( starts_with = list(
/obj/item/clothing/under/explorer, /obj/item/clothing/under/explorer,
@@ -76,7 +76,7 @@
name = "field medic locker" name = "field medic locker"
desc = "Supplies for a wilderness first responder." desc = "Supplies for a wilderness first responder."
req_access = list(access_medical_equip) req_access = list(access_medical_equip)
closet_appearance = /decl/closet_appearance/secure_closet/medical closet_appearance = /decl/closet_appearance/secure_closet/expedition/sar
starts_with = list( starts_with = list(
/obj/item/weapon/storage/backpack/dufflebag/emt, /obj/item/weapon/storage/backpack/dufflebag/emt,
@@ -117,7 +117,7 @@
/obj/structure/closet/secure_closet/pilot /obj/structure/closet/secure_closet/pilot
name = "pilot locker" name = "pilot locker"
req_access = list(access_pilot) req_access = list(access_pilot)
closet_appearance = /decl/closet_appearance/secure_closet/exploration/pilot closet_appearance = /decl/closet_appearance/secure_closet/expedition/pilot
starts_with = list( starts_with = list(
/obj/item/weapon/storage/backpack/parachute, /obj/item/weapon/storage/backpack/parachute,
@@ -153,7 +153,7 @@
/obj/structure/closet/secure_closet/pathfinder /obj/structure/closet/secure_closet/pathfinder
name = "pathfinder locker" name = "pathfinder locker"
req_access = list(access_gateway) req_access = list(access_gateway)
closet_appearance = /decl/closet_appearance/secure_closet/exploration/pathfinder closet_appearance = /decl/closet_appearance/secure_closet/expedition/pathfinder
starts_with = list( starts_with = list(
/obj/item/clothing/under/explorer, /obj/item/clothing/under/explorer,

2
code/game/objects/structures/crates_lockers/closets/secure/hydroponics.dm
View File

@@ -27,7 +27,7 @@
/obj/structure/closet/secure_closet/hydroponics/sci /obj/structure/closet/secure_closet/hydroponics/sci
name = "xenoflorist's locker" name = "xenoflorist's locker"
req_access = list(access_xenobiology) req_access = list(access_xenobiology)
closet_appearance = /decl/closet_appearance/secure_closet/hydroponics closet_appearance = /decl/closet_appearance/secure_closet/hydroponics/xenoflora
/obj/structure/closet/secure_closet/hydroponics/sci/Initialize() /obj/structure/closet/secure_closet/hydroponics/sci/Initialize()
starts_with += /obj/item/clothing/head/bio_hood/scientist starts_with += /obj/item/clothing/head/bio_hood/scientist

11
code/game/objects/structures/crates_lockers/closets/secure/medical.dm
View File

@@ -2,7 +2,7 @@
name = "medicine closet" name = "medicine closet"
desc = "Filled with medical junk." desc = "Filled with medical junk."
req_access = list(access_medical) req_access = list(access_medical)
closet_appearance = /decl/closet_appearance/secure_closet/medical closet_appearance = /decl/closet_appearance/secure_closet/medical/alt
starts_with = list( starts_with = list(
/obj/item/weapon/storage/box/autoinjectors, /obj/item/weapon/storage/box/autoinjectors,
@@ -17,6 +17,7 @@
name = "anesthetics closet" name = "anesthetics closet"
desc = "Used to knock people out." desc = "Used to knock people out."
req_access = list(access_surgery) req_access = list(access_surgery)
closet_appearance = /decl/closet_appearance/secure_closet/medical
starts_with = list( starts_with = list(
/obj/item/weapon/tank/anesthetic = 3, /obj/item/weapon/tank/anesthetic = 3,
@@ -26,7 +27,7 @@
/obj/structure/closet/secure_closet/medical3 /obj/structure/closet/secure_closet/medical3
name = "medical doctor's locker" name = "medical doctor's locker"
req_access = list(access_medical_equip) req_access = list(access_medical_equip)
closet_appearance = /decl/closet_appearance/secure_closet/medical/alt closet_appearance = /decl/closet_appearance/secure_closet/medical/doctor
starts_with = list( starts_with = list(
/obj/item/clothing/under/rank/medical, /obj/item/clothing/under/rank/medical,
@@ -90,7 +91,7 @@
name = "paramedic locker" name = "paramedic locker"
desc = "Supplies for a first responder." desc = "Supplies for a first responder."
req_access = list(access_medical_equip) req_access = list(access_medical_equip)
closet_appearance = /decl/closet_appearance/secure_closet/medical closet_appearance = /decl/closet_appearance/secure_closet/medical/paramedic
starts_with = list( starts_with = list(
/obj/item/weapon/storage/backpack/dufflebag/emt, /obj/item/weapon/storage/backpack/dufflebag/emt,
@@ -183,7 +184,7 @@
name = "chemical closet" name = "chemical closet"
desc = "Store dangerous chemicals in here." desc = "Store dangerous chemicals in here."
req_access = list(access_chemistry) req_access = list(access_chemistry)
closet_appearance = /decl/closet_appearance/secure_closet/medical closet_appearance = /decl/closet_appearance/secure_closet/medical/chemistry
starts_with = list( starts_with = list(
/obj/item/weapon/storage/box/pillbottles = 2, /obj/item/weapon/storage/box/pillbottles = 2,
@@ -200,7 +201,7 @@
name = "psychiatric closet" name = "psychiatric closet"
desc = "Store psychology tools and medicines in here." desc = "Store psychology tools and medicines in here."
req_access = list(access_psychiatrist) req_access = list(access_psychiatrist)
closet_appearance = /decl/closet_appearance/secure_closet/medical/alt closet_appearance = /decl/closet_appearance/cabinet/secure
starts_with = list( starts_with = list(
/obj/item/clothing/under/rank/psych, /obj/item/clothing/under/rank/psych,

1
code/game/objects/structures/crates_lockers/closets/secure/personal.dm
View File

@@ -20,6 +20,7 @@
/obj/structure/closet/secure_closet/personal/patient /obj/structure/closet/secure_closet/personal/patient
name = "patient's closet" name = "patient's closet"
closet_appearance = /decl/closet_appearance/secure_closet/patient
starts_with = list( starts_with = list(
/obj/item/clothing/under/medigown, /obj/item/clothing/under/medigown,

7
code/game/objects/structures/crates_lockers/closets/secure/scientist.dm
View File

@@ -1,7 +1,7 @@
/obj/structure/closet/secure_closet/scientist /obj/structure/closet/secure_closet/scientist
name = "scientist's locker" name = "scientist's locker"
req_access = list(access_tox_storage) req_access = list(access_tox_storage)
closet_appearance = /decl/closet_appearance/secure_closet/expedition/science closet_appearance = /decl/closet_appearance/secure_closet/science
starts_with = list( starts_with = list(
/obj/item/clothing/under/rank/scientist, /obj/item/clothing/under/rank/scientist,
@@ -24,7 +24,7 @@
/obj/structure/closet/secure_closet/RD /obj/structure/closet/secure_closet/RD
name = "research director's locker" name = "research director's locker"
req_access = list(access_rd) req_access = list(access_rd)
closet_appearance = /decl/closet_appearance/secure_closet/rd closet_appearance = /decl/closet_appearance/secure_closet/science/rd
starts_with = list( starts_with = list(
/obj/item/clothing/suit/bio_suit/scientist, /obj/item/clothing/suit/bio_suit/scientist,
@@ -49,7 +49,7 @@
/obj/structure/closet/secure_closet/xenoarchaeologist /obj/structure/closet/secure_closet/xenoarchaeologist
name = "Xenoarchaeologist Locker" name = "Xenoarchaeologist Locker"
req_access = list(access_tox_storage) req_access = list(access_tox_storage)
closet_appearance = /decl/closet_appearance/secure_closet/expedition/science closet_appearance = /decl/closet_appearance/secure_closet/science/xenoarch
starts_with = list( starts_with = list(
/obj/item/clothing/under/rank/scientist, /obj/item/clothing/under/rank/scientist,
@@ -63,6 +63,7 @@
/obj/structure/closet/excavation /obj/structure/closet/excavation
name = "Excavation tools" name = "Excavation tools"
closet_appearance = /decl/closet_appearance/secure_closet/engineering/tools/xenoarch
starts_with = list( starts_with = list(
/obj/item/weapon/storage/belt/archaeology, /obj/item/weapon/storage/belt/archaeology,

3
code/game/objects/structures/crates_lockers/closets/secure/security.dm
View File

@@ -246,6 +246,7 @@
/obj/structure/closet/secure_closet/injection /obj/structure/closet/secure_closet/injection
name = "lethal injections locker" name = "lethal injections locker"
req_access = list(access_captain) req_access = list(access_captain)
closet_appearance = /decl/closet_appearance/secure_closet/courtroom
starts_with = list( starts_with = list(
/obj/item/weapon/reagent_containers/syringe/ld50_syringe/choral = 2) /obj/item/weapon/reagent_containers/syringe/ld50_syringe/choral = 2)
@@ -255,6 +256,7 @@ GLOBAL_LIST_BOILERPLATE(all_brig_closets, /obj/structure/closet/secure_closet/br
/obj/structure/closet/secure_closet/brig /obj/structure/closet/secure_closet/brig
name = "brig locker" name = "brig locker"
req_access = list(access_brig) req_access = list(access_brig)
closet_appearance = /decl/closet_appearance/secure_closet/brig
anchored = 1 anchored = 1
var/id = null var/id = null
@@ -277,6 +279,7 @@ GLOBAL_LIST_BOILERPLATE(all_brig_closets, /obj/structure/closet/secure_closet/br
/obj/structure/closet/secure_closet/courtroom /obj/structure/closet/secure_closet/courtroom
name = "courtroom locker" name = "courtroom locker"
req_access = list(access_lawyer) req_access = list(access_lawyer)
closet_appearance = /decl/closet_appearance/secure_closet/courtroom
starts_with = list( starts_with = list(
/obj/item/clothing/shoes/brown, /obj/item/clothing/shoes/brown,

6
code/game/objects/structures/crates_lockers/closets/secure/security_vr.dm
View File

@@ -50,8 +50,8 @@
//Custom NT Security Lockers, Only found at central command //Custom NT Security Lockers, Only found at central command
/obj/structure/closet/secure_closet/nanotrasen_security /obj/structure/closet/secure_closet/nanotrasen_security
name = "NanoTrasen security officer's locker" name = "NanoTrasen security officer's locker"
icon = 'icons/obj/closet_vr.dmi'
req_access = list(access_brig) req_access = list(access_brig)
closet_appearance = /decl/closet_appearance/secure_closet/nanotrasen/security
storage_capacity = 3.5 * MOB_MEDIUM storage_capacity = 3.5 * MOB_MEDIUM
starts_with = list( starts_with = list(
@@ -91,8 +91,8 @@
/obj/structure/closet/secure_closet/nanotrasen_commander /obj/structure/closet/secure_closet/nanotrasen_commander
name = "NanoTrasen commander's locker" name = "NanoTrasen commander's locker"
icon = 'icons/obj/closet_vr.dmi'
req_access = list(access_brig) req_access = list(access_brig)
closet_appearance = /decl/closet_appearance/secure_closet/nanotrasen/commander
storage_capacity = 3.5 * MOB_MEDIUM storage_capacity = 3.5 * MOB_MEDIUM
starts_with = list( starts_with = list(
@@ -140,8 +140,8 @@
/obj/structure/closet/secure_closet/nanotrasen_warden /obj/structure/closet/secure_closet/nanotrasen_warden
name = "NanoTrasen warden's locker" name = "NanoTrasen warden's locker"
icon = 'icons/obj/closet_vr.dmi'
req_access = list(access_brig) req_access = list(access_brig)
closet_appearance = /decl/closet_appearance/secure_closet/nanotrasen/warden
storage_capacity = 3.5 * MOB_MEDIUM storage_capacity = 3.5 * MOB_MEDIUM
starts_with = list( starts_with = list(

28
code/game/objects/structures/crates_lockers/closets/wardrobe.dm
View File

@@ -82,7 +82,7 @@
/obj/structure/closet/wardrobe/chaplain_black /obj/structure/closet/wardrobe/chaplain_black
name = "chapel wardrobe" name = "chapel wardrobe"
desc = "It's a storage unit for approved religious attire." desc = "It's a storage unit for approved religious attire."
closet_appearance = /decl/closet_appearance/wardrobe/black closet_appearance = /decl/closet_appearance/wardrobe/chapel
starts_with = list( starts_with = list(
/obj/item/clothing/under/rank/chaplain, /obj/item/clothing/under/rank/chaplain,
@@ -113,7 +113,7 @@
/obj/structure/closet/wardrobe/xenos /obj/structure/closet/wardrobe/xenos
name = "xenos wardrobe" name = "xenos wardrobe"
closet_appearance = /decl/closet_appearance/wardrobe/green closet_appearance = /decl/closet_appearance/wardrobe/xenos
starts_with = list( starts_with = list(
/obj/item/clothing/suit/unathi/mantle, /obj/item/clothing/suit/unathi/mantle,
@@ -147,7 +147,7 @@
/obj/structure/closet/wardrobe/atmospherics_yellow /obj/structure/closet/wardrobe/atmospherics_yellow
name = "atmospherics wardrobe" name = "atmospherics wardrobe"
closet_appearance = /decl/closet_appearance/wardrobe/yellow closet_appearance = /decl/closet_appearance/wardrobe/engineer/atmos
starts_with = list( starts_with = list(
/obj/item/clothing/under/rank/atmospheric_technician = 3, /obj/item/clothing/under/rank/atmospheric_technician = 3,
@@ -161,7 +161,7 @@
/obj/structure/closet/wardrobe/engineering_yellow /obj/structure/closet/wardrobe/engineering_yellow
name = "engineering wardrobe" name = "engineering wardrobe"
closet_appearance = /decl/closet_appearance/wardrobe/yellow closet_appearance = /decl/closet_appearance/wardrobe/engineer
starts_with = list( starts_with = list(
/obj/item/clothing/under/rank/engineer = 3, /obj/item/clothing/under/rank/engineer = 3,
@@ -188,7 +188,7 @@
/obj/structure/closet/wardrobe/pjs /obj/structure/closet/wardrobe/pjs
name = "pajama wardrobe" name = "pajama wardrobe"
closet_appearance = /decl/closet_appearance/wardrobe/white closet_appearance = /decl/closet_appearance/wardrobe/pjs
starts_with = list( starts_with = list(
/obj/item/clothing/under/pj/red = 2, /obj/item/clothing/under/pj/red = 2,
@@ -199,7 +199,7 @@
/obj/structure/closet/wardrobe/science_white /obj/structure/closet/wardrobe/science_white
name = "science wardrobe" name = "science wardrobe"
closet_appearance = /decl/closet_appearance/wardrobe/white closet_appearance = /decl/closet_appearance/wardrobe/science
starts_with = list( starts_with = list(
/obj/item/clothing/under/rank/scientist = 3, /obj/item/clothing/under/rank/scientist = 3,
@@ -228,7 +228,7 @@
/obj/structure/closet/wardrobe/robotics_black /obj/structure/closet/wardrobe/robotics_black
name = "robotics wardrobe" name = "robotics wardrobe"
closet_appearance = /decl/closet_appearance/wardrobe/black closet_appearance = /decl/closet_appearance/wardrobe/robotics
starts_with = list( starts_with = list(
/obj/item/clothing/under/rank/roboticist = 2, /obj/item/clothing/under/rank/roboticist = 2,
@@ -249,7 +249,7 @@
/obj/structure/closet/wardrobe/chemistry_white /obj/structure/closet/wardrobe/chemistry_white
name = "chemistry wardrobe" name = "chemistry wardrobe"
closet_appearance = /decl/closet_appearance/wardrobe/white closet_appearance = /decl/closet_appearance/wardrobe/medical/chemistry
starts_with = list( starts_with = list(
/obj/item/clothing/under/rank/chemist = 2, /obj/item/clothing/under/rank/chemist = 2,
@@ -263,7 +263,7 @@
/obj/structure/closet/wardrobe/genetics_white /obj/structure/closet/wardrobe/genetics_white
name = "genetics wardrobe" name = "genetics wardrobe"
closet_appearance = /decl/closet_appearance/wardrobe/white closet_appearance = /decl/closet_appearance/wardrobe/medical/genetics
starts_with = list( starts_with = list(
/obj/item/clothing/under/rank/geneticist = 2, /obj/item/clothing/under/rank/geneticist = 2,
@@ -276,7 +276,7 @@
/obj/structure/closet/wardrobe/virology_white /obj/structure/closet/wardrobe/virology_white
name = "virology wardrobe" name = "virology wardrobe"
closet_appearance = /decl/closet_appearance/wardrobe/white closet_appearance = /decl/closet_appearance/wardrobe/medical/virology
starts_with = list( starts_with = list(
/obj/item/clothing/under/rank/virologist = 2, /obj/item/clothing/under/rank/virologist = 2,
@@ -290,7 +290,7 @@
/obj/structure/closet/wardrobe/medic_white /obj/structure/closet/wardrobe/medic_white
name = "medical wardrobe" name = "medical wardrobe"
closet_appearance = /decl/closet_appearance/wardrobe/white closet_appearance = /decl/closet_appearance/wardrobe/medical/white
starts_with = list( starts_with = list(
/obj/item/clothing/under/rank/medical = 2, /obj/item/clothing/under/rank/medical = 2,
@@ -315,7 +315,7 @@
/obj/structure/closet/wardrobe/medic_gown /obj/structure/closet/wardrobe/medic_gown
name = "cloning wardrobe" name = "cloning wardrobe"
closet_appearance = /decl/closet_appearance/wardrobe/white closet_appearance = /decl/closet_appearance/wardrobe/medical/patient
starts_with = list( starts_with = list(
/obj/item/clothing/under/medigown = 4) /obj/item/clothing/under/medigown = 4)
@@ -394,7 +394,7 @@
/obj/structure/closet/wardrobe/ert /obj/structure/closet/wardrobe/ert
name = "emergency response team equipment" name = "emergency response team equipment"
closet_appearance = /decl/closet_appearance/tactical closet_appearance = /decl/closet_appearance/ert
starts_with = list( starts_with = list(
/obj/item/clothing/under/rank/centcom, /obj/item/clothing/under/rank/centcom,
@@ -411,7 +411,7 @@
/obj/structure/closet/wardrobe/suit /obj/structure/closet/wardrobe/suit
name = "suit locker" name = "suit locker"
closet_appearance = /decl/closet_appearance/wardrobe/mixed closet_appearance = /decl/closet_appearance/wardrobe/suit
starts_with = list( starts_with = list(
/obj/item/clothing/under/assistantformal, /obj/item/clothing/under/assistantformal,

BIN
icons/obj/closets/decals/closet.dmi
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 3.2 KiB

After

Width:  |  Height:  |  Size: 3.2 KiB