[MIRROR] [Modular] New Lockers! (Skyrat Edition) (#999)

* [Modular] New Lockers! (Skyrat Edition) [MDB IGNORE] (#25409) * moves sec lockers to use modular file * Removes redundant /station subtype from NTC Locker * consistency with other stuff + its converted now (YOU'RE THE LAZY ASSHAT, ASSHAT.) * blueshield consistency with other lockers/bags * resprite all the modular closets (that I'm willing to do) * stop being mean. Asshat. * Resprites wall lockers (separate file so they can have working overlays) * Even if these don't work here's the icons so I don't lose them (again) * Wall mounts can be rebuilt! Yahoo! * oh I should probably push these whoops * fixes animations * removes an EVIL icon override we had buried * ff maps --------- Co-authored-by: OrionTheFox <[email protected]> Co-authored-by: Iajret <[email protected]>
Fluffy-Frontier · Dec 7, 2023 · 36908ce · 36908ce
1 parent 00ed22b
commit 36908ce
Show file tree

Hide file tree

Showing 21 changed files with 110 additions and 60 deletions.
diff --git a/_maps/map_files/KiloStation2/KiloStation2.dmm b/_maps/map_files/KiloStation2/KiloStation2.dmm
@@ -63836,9 +63836,9 @@
 /turf/open/floor/iron/dark,
 /area/station/hallway/primary/central/fore)
 "uwV" = (
-/obj/structure/closet/secure_closet/nanotrasen_consultant/station,
 /obj/item/assembly/flash/handheld,
 /obj/machinery/status_display/ai/directional/north,
+/obj/structure/closet/secure_closet/nanotrasen_consultant,
 /turf/open/floor/carpet/executive,
 /area/station/command/heads_quarters/nt_rep)
 "uwX" = (

diff --git a/_maps/map_files/NSSJourney/NSSJourney.dmm b/_maps/map_files/NSSJourney/NSSJourney.dmm
@@ -39437,8 +39437,8 @@
 /obj/effect/turf_decal/siding/wood{
 	dir = 1
 	},
-/obj/structure/closet/secure_closet/nanotrasen_consultant/station,
 /obj/item/clothing/under/rank/centcom/intern,
+/obj/structure/closet/secure_closet/nanotrasen_consultant,
 /turf/open/floor/wood,
 /area/station/command/heads_quarters/nt_rep)
 "hZK" = (

diff --git a/_maps/map_files/NSVBlueshift/Blueshift.dmm b/_maps/map_files/NSVBlueshift/Blueshift.dmm
@@ -72121,7 +72121,7 @@
 /turf/open/floor/iron/dark,
 /area/station/hallway/secondary/entry)
 "nOw" = (
-/obj/structure/closet/secure_closet/nanotrasen_consultant/station,
+/obj/structure/closet/secure_closet/nanotrasen_consultant,
 /obj/item/clothing/accessory/medal/silver/bureaucracy,
 /obj/item/clothing/accessory/medal/gold/nanotrasen_consultant,
 /obj/item/clothing/accessory/medal/gold/ordom,

diff --git a/_maps/map_files/VoidRaptor/VoidRaptor.dmm b/_maps/map_files/VoidRaptor/VoidRaptor.dmm
@@ -51429,7 +51429,7 @@
 /turf/open/floor/iron/smooth,
 /area/station/security/checkpoint/supply)
 "ovo" = (
-/obj/structure/closet/secure_closet/nanotrasen_consultant/station,
+/obj/structure/closet/secure_closet/nanotrasen_consultant,
 /obj/item/clothing/accessory/medal/gold/ordom,
 /obj/item/storage/briefcase/secure/white,
 /obj/item/clothing/gloves/combat/naval,

diff --git a/_maps/skyrat/automapper/templates/birdshot/birdshot_ntrep_office.dmm b/_maps/skyrat/automapper/templates/birdshot/birdshot_ntrep_office.dmm
@@ -17,7 +17,7 @@
 /turf/open/floor/carpet/executive,
 /area/station/command/heads_quarters/nt_rep)
 "bD" = (
-/obj/structure/closet/secure_closet/nanotrasen_consultant/station,
+/obj/structure/closet/secure_closet/nanotrasen_consultant,
 /turf/open/floor/carpet/executive,
 /area/station/command/heads_quarters/nt_rep)
 "ca" = (

diff --git a/_maps/skyrat/automapper/templates/deltastation/deltastation_ntrep_office.dmm b/_maps/skyrat/automapper/templates/deltastation/deltastation_ntrep_office.dmm
@@ -175,7 +175,7 @@
 /turf/open/floor/wood,
 /area/station/command/heads_quarters/nt_rep)
 "D" = (
-/obj/structure/closet/secure_closet/nanotrasen_consultant/station,
+/obj/structure/closet/secure_closet/nanotrasen_consultant,
 /obj/item/storage/briefcase,
 /obj/item/assembly/flash/handheld,
 /obj/effect/turf_decal/tile/neutral/fourcorners,

diff --git a/_maps/skyrat/automapper/templates/icebox/icebox_ntrep_office.dmm b/_maps/skyrat/automapper/templates/icebox/icebox_ntrep_office.dmm
@@ -333,7 +333,7 @@
 /turf/open/floor/iron,
 /area/station/hallway/primary/central)
 "yu" = (
-/obj/structure/closet/secure_closet/nanotrasen_consultant/station,
+/obj/structure/closet/secure_closet/nanotrasen_consultant,
 /obj/item/assembly/flash/handheld,
 /obj/machinery/light/directional/west,
 /obj/item/radio/intercom/directional/west,

diff --git a/_maps/skyrat/automapper/templates/metastation/metastation_ntrep_office.dmm b/_maps/skyrat/automapper/templates/metastation/metastation_ntrep_office.dmm
@@ -133,7 +133,7 @@
 "A" = (
 /obj/machinery/airalarm/directional/east,
 /obj/machinery/light/directional/east,
-/obj/structure/closet/secure_closet/nanotrasen_consultant/station,
+/obj/structure/closet/secure_closet/nanotrasen_consultant,
 /obj/item/assembly/flash/handheld,
 /turf/open/floor/carpet/executive,
 /area/station/command/heads_quarters/nt_rep)

diff --git a/_maps/skyrat/automapper/templates/northstar/northstar_ntrep_office.dmm b/_maps/skyrat/automapper/templates/northstar/northstar_ntrep_office.dmm
@@ -138,7 +138,7 @@
 /turf/open/floor/wood,
 /area/station/command/heads_quarters/nt_rep)
 "v" = (
-/obj/structure/closet/secure_closet/nanotrasen_consultant/station,
+/obj/structure/closet/secure_closet/nanotrasen_consultant,
 /turf/open/floor/wood,
 /area/station/command/heads_quarters/nt_rep)
 "w" = (

diff --git a/_maps/skyrat/automapper/templates/tramstation/tramstation_ntrep_office.dmm b/_maps/skyrat/automapper/templates/tramstation/tramstation_ntrep_office.dmm
@@ -30,7 +30,7 @@
 /turf/open/floor/carpet/executive,
 /area/station/command/heads_quarters/nt_rep)
 "e" = (
-/obj/structure/closet/secure_closet/nanotrasen_consultant/station,
+/obj/structure/closet/secure_closet/nanotrasen_consultant,
 /turf/open/floor/wood,
 /area/station/command/heads_quarters/nt_rep)
 "f" = (

diff --git a/modular_skyrat/master_files/code/game/objects/items/stacks/sheets/sheet_types.dm b/modular_skyrat/master_files/code/game/objects/items/stacks/sheets/sheet_types.dm
@@ -21,6 +21,9 @@
 // Iron
 
 GLOBAL_LIST_INIT(skyrat_metal_recipes, list(
+	new/datum/stack_recipe("wall mounted fire-safety closet", /obj/item/wallframe/firecloset, 2, time = 1.5 SECONDS, check_density = FALSE, category = CAT_FURNITURE),
+	new/datum/stack_recipe("wall mounted emergency closet", /obj/item/wallframe/emcloset, 2, time = 1.5 SECONDS, check_density = FALSE, category = CAT_FURNITURE),
+	new/datum/stack_recipe("wall mounted closet", /obj/item/wallframe/closet, 2, time = 1.5 SECONDS, check_density = FALSE, category = CAT_FURNITURE),
 	new/datum/stack_recipe("pool floor tile", /obj/item/stack/tile/iron/pool, 1, 4, 20, check_density = FALSE, category = CAT_TILES),
 	new/datum/stack_recipe("lowered floor tile", /obj/item/stack/tile/iron/lowered, 1, 4, 20, check_density = FALSE, category = CAT_TILES),
 	new/datum/stack_recipe("elevated floor tile", /obj/item/stack/tile/iron/elevated, 1, 4, 20, check_density = FALSE, category = CAT_TILES),

diff --git a/modular_skyrat/master_files/icons/obj/closet.dmi b/modular_skyrat/master_files/icons/obj/closet.dmi
diff --git a/modular_skyrat/master_files/icons/obj/closet_wall.dmi b/modular_skyrat/master_files/icons/obj/closet_wall.dmi
diff --git a/modular_skyrat/modules/advanced_shuttles/code/closet.dm b/modular_skyrat/modules/advanced_shuttles/code/closet.dm
@@ -16,7 +16,7 @@
 	icon = 'modular_skyrat/master_files/icons/obj/closet.dmi'
 	icon_state = "wallcloset"
 	icon_door = "wallcloset_mesh"
-	door_anim_time = 0 //CONVERT THESE DOORS YOU LAZY ASSHATS
+	door_anim_time = 0 //Somebody needs to remove the hard-sprited shuttles, or at least their lockers. These are a sin.
 
 /obj/structure/closet/shuttle/white
 	icon_state = "wallcloset_white"
@@ -69,40 +69,106 @@
 	icon_state = "vent"
 	icon_door = "vent"
 
-//Wall closets
-/obj/structure/closet/firecloset/wall
+//Generic Wall Closets - mount onto a wall, will end up storing anything that's on the tile it was placed from and 'occupies'.
+//Mob Size is small so that it doesn't end up storing players standing on those tiles.
+/obj/structure/closet/generic/wall
+	door_anim_squish = 0.3
+	door_anim_angle = 115
+	door_hinge_x = -8.5
 	wall_mounted = TRUE
 	max_mob_size = MOB_SIZE_SMALL
-	anchored = TRUE
 	density = TRUE
-	icon = 'modular_skyrat/master_files/icons/obj/closet.dmi'
-	icon_state = "fire_wall"
-	door_anim_time = 0 //CONVERT THESE DOORS YOU LAZY ASSHATS
+	anchored = TRUE
+	anchorable = FALSE //Prevents it being unwrenched and dragged around. Gotta unweld it!
+	paint_jobs = FALSE //Prevents it being repainted into other non-wall lockers.
+	icon = 'modular_skyrat/master_files/icons/obj/closet_wall.dmi'
+	icon_state = "locker_wall"
 
 /obj/structure/closet/emcloset/wall
+	door_anim_squish = 0.3
+	door_anim_angle = 115
+	door_hinge_x = -8.5
 	wall_mounted = TRUE
 	max_mob_size = MOB_SIZE_SMALL
-	anchored = TRUE
 	density = TRUE
-	icon = 'modular_skyrat/master_files/icons/obj/closet.dmi'
+	anchored = TRUE
+	anchorable = FALSE
+	paint_jobs = FALSE
+	icon = 'modular_skyrat/master_files/icons/obj/closet_wall.dmi'
 	icon_state = "emergency_wall"
-	door_anim_time = 0 //CONVERT THESE DOORS YOU LAZY ASSHATS
 
-/obj/structure/closet/secure_closet/wall
+/obj/structure/closet/firecloset/wall
+	door_anim_squish = 0.3
+	door_anim_angle = 115
+	door_hinge_x = -8.5
 	wall_mounted = TRUE
 	max_mob_size = MOB_SIZE_SMALL
+	density = TRUE
 	anchored = TRUE
+	anchorable = FALSE
+	paint_jobs = FALSE
+	icon = 'modular_skyrat/master_files/icons/obj/closet_wall.dmi'
+	icon_state = "fire_wall"
+
+//These two are pre-locked versions of closet/generic/wall, for mapping only
+/obj/structure/closet/secure_closet/wall
+	door_anim_squish = 0.3
+	door_anim_angle = 115
+	door_hinge_x = -8.5
+	wall_mounted = TRUE
+	max_mob_size = MOB_SIZE_SMALL
 	density = TRUE
-	icon = 'modular_skyrat/master_files/icons/obj/closet.dmi'
-	icon_state = "closet_wall"
-	door_anim_time = 0 //CONVERT THESE DOORS YOU LAZY ASSHATS
+	anchored = TRUE
+	anchorable = FALSE
+	paint_jobs = FALSE
+	icon = 'modular_skyrat/master_files/icons/obj/closet_wall.dmi'
+	icon_state = "locker_wall"
 
 /obj/structure/closet/secure_closet/personal/wall
+	door_anim_squish = 0.3
+	door_anim_angle = 115
+	door_hinge_x = -8.5
 	wall_mounted = TRUE
 	max_mob_size = MOB_SIZE_SMALL
-	anchored = TRUE
 	density = TRUE
-	icon = 'modular_skyrat/master_files/icons/obj/closet.dmi'
-	icon_state = "closet_wall"
-	icon_door = null
-	door_anim_time = 0 //CONVERT THESE DOORS YOU LAZY ASSHATS
+	anchored = TRUE
+	anchorable = FALSE
+	paint_jobs = FALSE
+	icon = 'modular_skyrat/master_files/icons/obj/closet_wall.dmi'
+	icon_state = "locker_wall"
+
+//These procs create empty subtypes, for when it's placed by a user rather than mapped in...
+//Secure/personal don't get these since they're made with airlock electronics
+/obj/structure/closet/generic/wall/empty/PopulateContents()
+	return
+
+/obj/structure/closet/emcloset/wall/empty/PopulateContents()
+	return
+
+/obj/structure/closet/firecloset/wall/empty/PopulateContents()
+	return
+
+//Wallmounts, for rebuilding the wall lockers above
+/obj/item/wallframe/closet
+	name = "wall mounted closet"
+	desc = "It's a wall mounted storage unit for... well, whatever you put in this one. Apply to wall to use."
+	icon = 'modular_skyrat/master_files/icons/obj/closet_wall.dmi'
+	icon_state = "locker_mount"
+	result_path = /obj/structure/closet/generic/wall/empty
+	pixel_shift = 32
+
+/obj/item/wallframe/emcloset
+	name = "wall mounted emergency closet"
+	desc = "It's a wall mounted storage unit for emergency breath masks and O2 tanks. Apply to wall to use."
+	icon = 'modular_skyrat/master_files/icons/obj/closet_wall.dmi'
+	icon_state = "emergency_mount"
+	result_path = /obj/structure/closet/emcloset/wall/empty
+	pixel_shift = 32
+
+/obj/item/wallframe/firecloset
+	name = "wall mounted fire-safety closet"
+	desc = "It's a wall mounted storage unit for fire-fighting supplies. Apply to wall to use."
+	icon = 'modular_skyrat/master_files/icons/obj/closet_wall.dmi'
+	icon_state = "fire_mount"
+	result_path = /obj/structure/closet/firecloset/wall/empty
+	pixel_shift = 32
diff --git a/modular_skyrat/modules/blueshield/code/closet.dm b/modular_skyrat/modules/blueshield/code/closet.dm
@@ -1,5 +1,5 @@
 /obj/item/storage/bag/garment/blueshield
-	name = "Blueshield's garment bag"
+	name = "blueshield's garment bag"
 	desc = "A bag for storing extra clothes and shoes. This one belongs to the blueshield."
 
 /obj/item/storage/bag/garment/blueshield/PopulateContents()
@@ -15,7 +15,7 @@
 	new /obj/item/clothing/neck/mantle/bsmantle(src)
 
 /obj/structure/closet/secure_closet/blueshield
-	name = "\the blueshield's locker"
+	name = "blueshield's locker"
 	icon_state = "bs"
 	icon = 'modular_skyrat/master_files/icons/obj/closet.dmi'
 	req_access = list(ACCESS_CAPTAIN)

diff --git a/modular_skyrat/modules/mapping/code/lockers/interdyne_fob/generic.dm b/modular_skyrat/modules/mapping/code/lockers/interdyne_fob/generic.dm
@@ -3,10 +3,6 @@
 	req_access = list("syndicate")
 
 // Generic lockers/subtypes
-/obj/structure/closet/secure_closet/personal
-	icon_door = "cabinet"
-	icon_state = "cabinet"
-
 /obj/structure/closet/secure_closet/interdynefob/mod_locker
 	icon_door = "syndicate"
 	icon_state = "syndicate"

diff --git a/modular_skyrat/modules/nanotrasen_rep/code/nanotrasen_consultant.dm b/modular_skyrat/modules/nanotrasen_rep/code/nanotrasen_consultant.dm
@@ -112,7 +112,7 @@
 	greyscale_colors = "#017941#0060b8"
 
 /obj/item/storage/bag/garment/nanotrasen_consultant
-	name = "Nanotrasen consultant's garment bag"
+	name = "nanotrasen consultant's garment bag"
 	desc = "A bag for storing extra clothes and shoes. This one belongs to the Nanotrasen consultant."
 
 /obj/item/storage/bag/garment/nanotrasen_consultant/PopulateContents()
@@ -133,14 +133,13 @@
 	new /obj/item/clothing/under/rank/centcom/intern(src)
 	new /obj/item/clothing/head/hats/intern(src)
 
-/obj/structure/closet/secure_closet/nanotrasen_consultant/station
-	name = "\proper nanotrasen consultant's locker"
+/obj/structure/closet/secure_closet/nanotrasen_consultant
+	name = "nanotrasen consultant's locker"
 	req_access = list(ACCESS_CAPTAIN, ACCESS_CENT_GENERAL)
 	icon_state = "cc"
 	icon = 'modular_skyrat/master_files/icons/obj/closet.dmi'
-	door_anim_time = 0 //CONVERT THESE DOORS YOU LAZY ASSHATS
 
-/obj/structure/closet/secure_closet/nanotrasen_consultant/station/PopulateContents()
+/obj/structure/closet/secure_closet/nanotrasen_consultant/PopulateContents()
 	..()
 	new /obj/item/storage/backpack/satchel/leather(src)
 	new /obj/item/clothing/neck/petcollar(src)

diff --git a/modular_skyrat/modules/salon/code/barber.dm b/modular_skyrat/modules/salon/code/barber.dm
@@ -36,7 +36,7 @@
 	id_trim = /datum/id_trim/job/barber
 
 /obj/structure/closet/secure_closet/barber
-	name = "Barber's locker"
+	name = "barber's locker"
 	icon_state = "barber"
 	icon = 'modular_skyrat/master_files/icons/obj/closet.dmi'
 	req_access = list(ACCESS_BARBER)

diff --git a/modular_skyrat/modules/sec_haul/code/corrections_officer/corrections_officer_equipment.dm b/modular_skyrat/modules/sec_haul/code/corrections_officer/corrections_officer_equipment.dm
@@ -51,7 +51,7 @@
 	name = "corrections officer riot gear"
 	icon = 'modular_skyrat/master_files/icons/obj/closet.dmi'
 	icon_state = "riot"
-	door_anim_time = 0 //CONVERT THESE DOORS YOU LAZY ASSHATS
+	door_anim_time = 0 //Somebody resprite or remove this 'riot' locker. It's evil.
 
 /obj/structure/closet/secure_closet/corrections_officer/PopulateContents()
 	..()

diff --git a/modular_skyrat/modules/sec_haul/code/peacekeeper/peacekeeper_lockers.dm b/modular_skyrat/modules/sec_haul/code/peacekeeper/peacekeeper_lockers.dm
@@ -1,22 +1,8 @@
 /obj/structure/closet/secure_closet/security
-	icon = 'modular_skyrat/modules/sec_haul/icons/lockers/closet.dmi'
-
-/obj/structure/closet/secure_closet/hos
-	icon = 'modular_skyrat/modules/sec_haul/icons/lockers/closet.dmi'
+	icon = 'modular_skyrat/master_files/icons/obj/closet.dmi'
 
 /obj/structure/closet/secure_closet/warden
-	icon = 'modular_skyrat/modules/sec_haul/icons/lockers/closet.dmi'
-
-/obj/structure/closet/secure_closet/armory1
-	icon = 'modular_skyrat/modules/sec_haul/icons/lockers/closet.dmi'
-	icon_state = "armory"
+	icon = 'modular_skyrat/master_files/icons/obj/closet.dmi'
 
-/obj/structure/closet/secure_closet/armory2
-	icon = 'modular_skyrat/modules/sec_haul/icons/lockers/closet.dmi'
-	icon_state = "armory"
-	icon_door = null
-
-/obj/structure/closet/secure_closet/armory3
-	icon = 'modular_skyrat/modules/sec_haul/icons/lockers/closet.dmi'
-	icon_state = "armory"
-	icon_door = null
+/obj/structure/closet/secure_closet/hos
+	icon = 'modular_skyrat/master_files/icons/obj/closet.dmi'
diff --git a/modular_skyrat/modules/sec_haul/icons/lockers/closet.dmi b/modular_skyrat/modules/sec_haul/icons/lockers/closet.dmi