[MIRROR] New closets [MDB IGNORE] (#25167)

* New closets * Grammar checks every closet that spawns on a station. (#73331) All closets now are called either closets, lockers, wardrobes etc. (e.g. the lethal injections locker was previously called "lethal injections") Head of staff and the cook's locker are no longer proper nouns, it didn't make much grammatical sense and it keeps consistency with other lockers (Example: detective's cabinet) All locker names de-capitalized except the Thunderdome ones since those made sense. The empty freezer is now just called a freezer since it being empty or not depends on what players and mappers do to it. Tram now has evidence lockers labelled from 1 through 7 instead of 7 evidence lockers labelled as 1. Changes have been made to all station maps and in code, I've not gone through all ruins, away missions, etc. Cleans up a lot of minor name issues. :cl: spellcheck: All station closet and lockers have had their naming conventions standardized. fix: Tram now has evidence lockers labelled 1 through 7 instead of 7 evidence lockers labelled as locker 1. /:cl: * Removed Duplicates, Modularized Overrides. * Added Base States, Removed Unused Icons * Icon states * Fix wall closets to not fail CI --------- Co-authored-by: Andrew <[email protected]> Co-authored-by: NamelessFairy <[email protected]> Co-authored-by: SomeRandomOwl <[email protected]>
Fluffy-Frontier · Nov 25, 2023 · 2f95b6c · 2f95b6c
1 parent ca6703b
commit 2f95b6c
Show file tree

Hide file tree

Showing 20 changed files with 71 additions and 64 deletions.
diff --git a/code/game/objects/structures/crates_lockers/closets.dm b/code/game/objects/structures/crates_lockers/closets.dm
@@ -26,13 +26,13 @@ GLOBAL_LIST_EMPTY(roundstart_station_closets)
 	/// Whether or not this door is being animated
 	var/is_animating_door = FALSE
 	/// Vertical squish of the door
-	var/door_anim_squish = 0.12
+	var/door_anim_squish = 0.2
 	/// The maximum angle the door will be drawn at
-	var/door_anim_angle = 136
-	/// X position of the closet door hinge
+	var/door_anim_angle = 140
+	/// X position of the closet door hinge, relative to the center of the sprite
 	var/door_hinge_x = -6.5
 	/// Amount of time it takes for the door animation to play
-	var/door_anim_time = 1.5 // set to 0 to make the door not animate at all
+	var/door_anim_time = 2 // set to 0 to make the door not animate at all
 	/// Paint jobs for this closet, crates are a subtype of closet so they override these values
 	var/list/paint_jobs = TRUE
 	/// Controls whether a door overlay should be applied using the icon_door value as the icon state
@@ -65,6 +65,7 @@ GLOBAL_LIST_EMPTY(roundstart_station_closets)
 	var/delivery_icon = "deliverycloset" //which icon to use when packagewrapped. null to be unwrappable.
 	var/anchorable = TRUE
 	var/icon_welded = "welded"
+	var/icon_broken = "sparking"
 	/// Whether a skittish person can dive inside this closet. Disable if opening the closet causes "bad things" to happen or that it leads to a logical inconsistency.
 	var/divable = TRUE
 	/// true whenever someone with the strong pull component (or magnet modsuit module) is dragging this, preventing opening
@@ -199,6 +200,11 @@ GLOBAL_LIST_EMPTY(roundstart_station_closets)
 	if(welded)
 		. += icon_welded
 
+	if(broken && secure)
+		. += mutable_appearance(icon, icon_broken, alpha = alpha)
+		. += emissive_appearance(icon, icon_broken, src, alpha = alpha)
+		return
+
 	if(broken || !secure)
 		return
 	//Overlay is similar enough for both that we can use the same mask for both

diff --git a/code/game/objects/structures/crates_lockers/closets/fitness.dm b/code/game/objects/structures/crates_lockers/closets/fitness.dm
@@ -15,8 +15,9 @@
 
 
 /obj/structure/closet/boxinggloves
-	name = "boxing gloves"
+	name = "boxing gloves closet"
 	desc = "It's a storage unit for gloves for use in the boxing ring."
+	icon_door = "mixed"
 
 /obj/structure/closet/boxinggloves/PopulateContents()
 	..()
@@ -41,6 +42,7 @@
 	name = "red laser tag equipment"
 	desc = "It's a storage unit for laser tag equipment."
 	icon_door = "red"
+	icon_state = "rack"
 
 /obj/structure/closet/lasertag/red/PopulateContents()
 	..()
@@ -55,6 +57,7 @@
 	name = "blue laser tag equipment"
 	desc = "It's a storage unit for laser tag equipment."
 	icon_door = "blue"
+	icon_state = "rack"
 
 /obj/structure/closet/lasertag/blue/PopulateContents()
 	..()

diff --git a/code/game/objects/structures/crates_lockers/closets/job_closets.dm b/code/game/objects/structures/crates_lockers/closets/job_closets.dm
@@ -3,7 +3,7 @@
 /obj/structure/closet/gmcloset
 	name = "formal closet"
 	desc = "It's a storage unit for formal clothing."
-	icon_door = "black"
+	icon_door = "bar_wardrobe"
 
 /obj/structure/closet/gmcloset/PopulateContents()
 	..()
@@ -24,9 +24,9 @@
 	generate_items_inside(items_inside,src)
 
 /obj/structure/closet/chefcloset
-	name = "\proper chef's closet"
+	name = "chef's closet"
 	desc = "It's a storage unit for foodservice garments and mouse traps."
-	icon_door = "black"
+	icon_door = "chef_wardrobe"
 
 /obj/structure/closet/chefcloset/PopulateContents()
 	..()
@@ -47,7 +47,7 @@
 /obj/structure/closet/jcloset
 	name = "custodial closet"
 	desc = "It's a storage unit for janitorial clothes and gear."
-	icon_door = "mixed"
+	icon_door = "jani_wardrobe"
 
 /obj/structure/closet/jcloset/PopulateContents()
 	..()
@@ -75,7 +75,7 @@
 /obj/structure/closet/lawcloset
 	name = "legal closet"
 	desc = "It's a storage unit for courtroom apparel and items."
-	icon_door = "blue"
+	icon_door = "law_wardrobe"
 
 /obj/structure/closet/lawcloset/PopulateContents()
 	..()
@@ -102,7 +102,7 @@
 /obj/structure/closet/wardrobe/chaplain_black
 	name = "chapel wardrobe"
 	desc = "It's a storage unit for Nanotrasen-approved religious attire."
-	icon_door = "black"
+	icon_door = "chap_wardrobe"
 
 /obj/structure/closet/wardrobe/chaplain_black/PopulateContents()
 	new /obj/item/choice_beacon/holy(src)
@@ -120,7 +120,7 @@
 
 /obj/structure/closet/wardrobe/red
 	name = "security wardrobe"
-	icon_door = "red"
+	icon_door = "sec_wardrobe"
 
 /obj/structure/closet/wardrobe/red/PopulateContents()
 	var/static/items_inside = list(
@@ -140,7 +140,7 @@
 
 /obj/structure/closet/wardrobe/cargotech
 	name = "cargo wardrobe"
-	icon_door = "orange"
+	icon_door = "cargo_wardrobe"
 
 /obj/structure/closet/wardrobe/cargotech/PopulateContents()
 	var/static/items_inside = list(
@@ -172,7 +172,7 @@
 
 /obj/structure/closet/wardrobe/engineering_yellow
 	name = "engineering wardrobe"
-	icon_door = "yellow"
+	icon_door = "engi_wardrobe"
 
 /obj/structure/closet/wardrobe/engineering_yellow/PopulateContents()
 	var/static/items_inside = list(
@@ -191,6 +191,7 @@
 
 /obj/structure/closet/wardrobe/white/medical
 	name = "medical doctor's wardrobe"
+	icon_door = "med_wardrobe"
 
 /obj/structure/closet/wardrobe/white/medical/PopulateContents()
 	var/static/items_inside = list(
@@ -213,7 +214,7 @@
 
 /obj/structure/closet/wardrobe/robotics_black
 	name = "robotics wardrobe"
-	icon_door = "black"
+	icon_door = "robo_wardrobe"
 
 /obj/structure/closet/wardrobe/robotics_black/PopulateContents()
 	var/static/items_inside = list(
@@ -233,7 +234,7 @@
 
 /obj/structure/closet/wardrobe/chemistry_white
 	name = "chemistry wardrobe"
-	icon_door = "white"
+	icon_door = "chem_wardrobe"
 
 /obj/structure/closet/wardrobe/chemistry_white/PopulateContents()
 	var/static/items_inside = list(
@@ -251,7 +252,7 @@
 
 /obj/structure/closet/wardrobe/genetics_white
 	name = "genetics wardrobe"
-	icon_door = "white"
+	icon_door = "gen_wardrobe"
 
 /obj/structure/closet/wardrobe/genetics_white/PopulateContents()
 	var/static/items_inside = list(
@@ -268,7 +269,7 @@
 
 /obj/structure/closet/wardrobe/virology_white
 	name = "virology wardrobe"
-	icon_door = "white"
+	icon_door = "viro_wardrobe"
 
 /obj/structure/closet/wardrobe/virology_white/PopulateContents()
 	var/static/items_inside = list(
@@ -285,7 +286,7 @@
 
 /obj/structure/closet/wardrobe/science_white
 	name = "science wardrobe"
-	icon_door = "white"
+	icon_door = "sci_wardrobe"
 
 /obj/structure/closet/wardrobe/science_white/PopulateContents()
 	var/static/items_inside = list(
@@ -304,7 +305,7 @@
 
 /obj/structure/closet/wardrobe/botanist
 	name = "botanist wardrobe"
-	icon_door = "green"
+	icon_door = "botany_wardrobe"
 
 /obj/structure/closet/wardrobe/botanist/PopulateContents()
 	var/static/items_inside = list(
@@ -321,7 +322,7 @@
 
 /obj/structure/closet/wardrobe/curator
 	name = "treasure hunting wardrobe"
-	icon_door = "black"
+	icon_door = "curator_wardrobe"
 
 /obj/structure/closet/wardrobe/curator/PopulateContents()
 	new /obj/item/clothing/head/fedora/curator(src)

diff --git a/code/game/objects/structures/crates_lockers/closets/l3closet.dm b/code/game/objects/structures/crates_lockers/closets/l3closet.dm
@@ -10,9 +10,19 @@
 	new /obj/item/clothing/mask/breath(src)
 	new /obj/item/tank/internals/oxygen(src)
 
+/obj/structure/closet/l3closet/scientist
+	icon_door = "bio_sci"
+
+/obj/structure/closet/l3closet/scientist/PopulateContents()
+	new /obj/item/storage/bag/xeno(src)
+	new /obj/item/clothing/suit/bio_suit/scientist(src)
+	new /obj/item/clothing/head/bio_hood/scientist(src)
+	new /obj/item/clothing/mask/breath(src)
+	new /obj/item/tank/internals/oxygen(src)
+
 
 /obj/structure/closet/l3closet/virology
-	icon_state = "bio_viro"
+	icon_door = "bio_viro"
 
 /obj/structure/closet/l3closet/virology/PopulateContents()
 	new /obj/item/storage/bag/bio(src)
@@ -23,7 +33,7 @@
 
 
 /obj/structure/closet/l3closet/security
-	icon_state = "bio_sec"
+	icon_door = "bio_sec"
 
 /obj/structure/closet/l3closet/security/PopulateContents()
 	new /obj/item/clothing/suit/bio_suit/security(src)
@@ -33,22 +43,10 @@
 
 
 /obj/structure/closet/l3closet/janitor
-	icon_state = "bio_jan"
+	icon_door = "bio_jan"
 
 /obj/structure/closet/l3closet/janitor/PopulateContents()
 	new /obj/item/clothing/suit/bio_suit/janitor(src)
 	new /obj/item/clothing/head/bio_hood/janitor(src)
 	new /obj/item/clothing/mask/breath(src)
 	new /obj/item/tank/internals/oxygen(src)
-
-
-/obj/structure/closet/l3closet/scientist
-	icon_state = "bio_viro"
-
-/obj/structure/closet/l3closet/scientist/PopulateContents()
-	new /obj/item/storage/bag/xeno(src)
-	new /obj/item/clothing/suit/bio_suit/scientist(src)
-	new /obj/item/clothing/head/bio_hood/scientist(src)
-	new /obj/item/clothing/mask/breath(src)
-	new /obj/item/tank/internals/oxygen(src)
-
diff --git a/code/game/objects/structures/crates_lockers/closets/secure/cargo.dm b/code/game/objects/structures/crates_lockers/closets/secure/cargo.dm
@@ -1,5 +1,5 @@
 /obj/structure/closet/secure_closet/quartermaster
-	name = "\proper quartermaster's locker"
+	name = "quartermaster's locker"
 	req_access = list(ACCESS_QM)
 	icon_state = "qm"
 

diff --git a/code/game/objects/structures/crates_lockers/closets/secure/engineering.dm b/code/game/objects/structures/crates_lockers/closets/secure/engineering.dm
@@ -1,5 +1,5 @@
 /obj/structure/closet/secure_closet/engineering_chief
-	name = "\proper chief engineer's locker"
+	name = "chief engineer's locker"
 	req_access = list(ACCESS_CE)
 	icon_state = "ce"
 
@@ -83,7 +83,7 @@
 
 
 /obj/structure/closet/secure_closet/atmospherics
-	name = "\proper atmospheric technician's locker"
+	name = "atmospheric technician's locker"
 	req_access = list(ACCESS_ATMOSPHERICS)
 	icon_state = "atmos"
 

diff --git a/code/game/objects/structures/crates_lockers/closets/secure/freezer.dm b/code/game/objects/structures/crates_lockers/closets/secure/freezer.dm
@@ -42,7 +42,7 @@
 	. = ..()
 
 /obj/structure/closet/secure_closet/freezer/empty
-	name = "empty freezer"
+	name = "freezer"
 
 /obj/structure/closet/secure_closet/freezer/empty/open
 	req_access = null

diff --git a/code/game/objects/structures/crates_lockers/closets/secure/medical.dm b/code/game/objects/structures/crates_lockers/closets/secure/medical.dm
@@ -21,6 +21,7 @@
 /obj/structure/closet/secure_closet/medical2
 	name = "anesthetic closet"
 	desc = "Used to knock people out."
+	icon_state = "med_secure"
 	req_access = list(ACCESS_SURGERY)
 
 /obj/structure/closet/secure_closet/medical2/PopulateContents()
@@ -48,6 +49,7 @@
 	name = "psychology locker"
 	req_access = list(ACCESS_PSYCHOLOGY)
 	icon_state = "cabinet"
+	door_anim_time = 0 // no animation
 	open_sound = 'sound/machines/wooden_closet_open.ogg'
 	close_sound = 'sound/machines/wooden_closet_close.ogg'
 	open_sound_volume = 25
@@ -68,7 +70,7 @@
 	new /obj/item/clothing/glasses/blindfold(src)
 
 /obj/structure/closet/secure_closet/chief_medical
-	name = "\proper chief medical officer's locker"
+	name = "chief medical officer's locker"
 	req_access = list(ACCESS_CMO)
 	icon_state = "cmo"
 
@@ -103,7 +105,8 @@
 	new /obj/item/storage/hypospraykit/cmo(src) //SKYRAT EDIT ADDITION - New Hyposprays
 
 /obj/structure/closet/secure_closet/animal
-	name = "animal control"
+	name = "animal control locker"
+	icon_door = "chemical"
 	req_access = list(ACCESS_SURGERY)
 
 /obj/structure/closet/secure_closet/animal/PopulateContents()
@@ -116,7 +119,7 @@
 	name = "chemical closet"
 	desc = "Store dangerous chemicals in here."
 	req_access = list(ACCESS_PHARMACY)
-	icon_door = "chemical"
+	icon_state = "chem_secure"
 
 /obj/structure/closet/secure_closet/chemical/PopulateContents()
 	..()

diff --git a/code/game/objects/structures/crates_lockers/closets/secure/personal.dm b/code/game/objects/structures/crates_lockers/closets/secure/personal.dm
@@ -44,6 +44,7 @@
 	close_sound = 'sound/machines/wooden_closet_close.ogg'
 	open_sound_volume = 25
 	close_sound_volume = 50
+	door_anim_time = 0 // no animation
 
 /obj/structure/closet/secure_closet/personal/cabinet/PopulateContents()
 	new /obj/item/storage/backpack/satchel/leather/withwallet( src )

diff --git a/code/game/objects/structures/crates_lockers/closets/secure/scientist.dm b/code/game/objects/structures/crates_lockers/closets/secure/scientist.dm
@@ -1,5 +1,5 @@
 /obj/structure/closet/secure_closet/research_director
-	name = "\proper research director's locker"
+	name = "research director's locker"
 	req_access = list(ACCESS_RD)
 	icon_state = "rd"