From f0fea164d27de72bb40ed8c994a5f37357b0a67e Mon Sep 17 00:00:00 2001 From: Helg2 <93882977+Helg2@users.noreply.github.com> Date: Tue, 16 May 2023 02:04:15 +0300 Subject: [PATCH] Replaces var edited freezers. (#75439) ## About The Pull Request Besides cleaning up code a little i changed all the bar lockers near `boozeomats/all_access` to also be `all_access`. And also changed freezer on Beach away mission to be free accessed like the freezers near it. ## Why It's Good For The Game Cleaner code, i guess? Free beer. ## Changelog :cl: add: Old bar on Metastation, tranquility emergency shuttle and Beach away mission now have free access bar closets. Also freezers on beach are now all access so you can now open them. /:cl: --- .../LavaRuins/lavaland_biodome_beach.dmm | 12 +++--------- .../SpaceRuins/DJstation/kitchen_1.dmm | 4 +--- .../SpaceRuins/DJstation/kitchen_4.dmm | 8 ++------ _maps/RandomRuins/SpaceRuins/deepstorage.dmm | 4 +--- _maps/RandomZLevels/TheBeach.dmm | 6 ++---- _maps/map_files/Deltastation/DeltaStation2.dmm | 4 +--- _maps/map_files/MetaStation/MetaStation.dmm | 2 +- _maps/shuttles/emergency_tranquility.dmm | 2 +- .../crates_lockers/closets/secure/bar.dm | 3 +++ .../crates_lockers/closets/secure/freezer.dm | 15 ++++++++++++--- .../Scripts/75439_freezers_null_access.txt | 4 ++++ 11 files changed, 31 insertions(+), 33 deletions(-) create mode 100644 tools/UpdatePaths/Scripts/75439_freezers_null_access.txt diff --git a/_maps/RandomRuins/LavaRuins/lavaland_biodome_beach.dmm b/_maps/RandomRuins/LavaRuins/lavaland_biodome_beach.dmm index 7e74d0e6918..181dcf507cf 100644 --- a/_maps/RandomRuins/LavaRuins/lavaland_biodome_beach.dmm +++ b/_maps/RandomRuins/LavaRuins/lavaland_biodome_beach.dmm @@ -165,9 +165,7 @@ /turf/open/water/beach, /area/ruin/powered/beach) "cV" = ( -/obj/structure/closet/secure_closet/freezer/meat{ - req_access = null - }, +/obj/structure/closet/secure_closet/freezer/meat/all_access, /obj/item/food/meat/rawbacon, /obj/item/food/meat/rawbacon, /obj/item/food/meat/rawcutlet, @@ -423,9 +421,7 @@ /turf/open/floor/wood, /area/ruin/powered/beach) "nI" = ( -/obj/structure/closet/secure_closet/freezer/kitchen{ - req_access = null - }, +/obj/structure/closet/secure_closet/freezer/kitchen/all_access, /obj/item/reagent_containers/condiment/milk, /obj/item/reagent_containers/condiment/mayonnaise, /obj/item/reagent_containers/condiment/flour, @@ -859,9 +855,7 @@ /turf/open/floor/iron/grimy, /area/ruin/powered/beach) "Ds" = ( -/obj/structure/closet/secure_closet/freezer/kitchen{ - req_access = null - }, +/obj/structure/closet/secure_closet/freezer/kitchen/all_access, /turf/open/floor/wood, /area/ruin/powered/beach) "Eq" = ( diff --git a/_maps/RandomRuins/SpaceRuins/DJstation/kitchen_1.dmm b/_maps/RandomRuins/SpaceRuins/DJstation/kitchen_1.dmm index ad57c27a6c7..eb8a951ce7a 100644 --- a/_maps/RandomRuins/SpaceRuins/DJstation/kitchen_1.dmm +++ b/_maps/RandomRuins/SpaceRuins/DJstation/kitchen_1.dmm @@ -23,9 +23,7 @@ /turf/open/floor/iron, /area/ruin/space/djstation) "n" = ( -/obj/structure/closet/secure_closet/freezer/fridge{ - req_access = null - }, +/obj/structure/closet/secure_closet/freezer/fridge/all_access, /obj/machinery/light/directional/south, /obj/effect/turf_decal/tile/bar/opposingcorners, /turf/open/floor/iron, diff --git a/_maps/RandomRuins/SpaceRuins/DJstation/kitchen_4.dmm b/_maps/RandomRuins/SpaceRuins/DJstation/kitchen_4.dmm index c73bea86ada..6c70ee4def8 100644 --- a/_maps/RandomRuins/SpaceRuins/DJstation/kitchen_4.dmm +++ b/_maps/RandomRuins/SpaceRuins/DJstation/kitchen_4.dmm @@ -47,9 +47,7 @@ /turf/open/floor/iron/white, /area/ruin/space/djstation) "k" = ( -/obj/structure/closet/secure_closet/freezer/meat{ - req_access = null - }, +/obj/structure/closet/secure_closet/freezer/meat/all_access, /turf/open/floor/iron/freezer, /area/ruin/space/djstation) "r" = ( @@ -61,9 +59,7 @@ /turf/open/floor/iron/white, /area/ruin/space/djstation) "A" = ( -/obj/structure/closet/secure_closet/freezer/fridge{ - req_access = null - }, +/obj/structure/closet/secure_closet/freezer/fridge/all_access, /turf/open/floor/iron/freezer, /area/ruin/space/djstation) "F" = ( diff --git a/_maps/RandomRuins/SpaceRuins/deepstorage.dmm b/_maps/RandomRuins/SpaceRuins/deepstorage.dmm index 86dd49cd8f2..8d926bee3a9 100644 --- a/_maps/RandomRuins/SpaceRuins/deepstorage.dmm +++ b/_maps/RandomRuins/SpaceRuins/deepstorage.dmm @@ -385,9 +385,7 @@ /turf/open/floor/iron, /area/ruin/space/has_grav/deepstorage/storage) "bs" = ( -/obj/structure/closet/secure_closet/freezer/kitchen{ - req_access = null - }, +/obj/structure/closet/secure_closet/freezer/kitchen/all_access, /obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ dir = 4 }, diff --git a/_maps/RandomZLevels/TheBeach.dmm b/_maps/RandomZLevels/TheBeach.dmm index 45da11f62c3..5926ae64c20 100644 --- a/_maps/RandomZLevels/TheBeach.dmm +++ b/_maps/RandomZLevels/TheBeach.dmm @@ -613,7 +613,7 @@ /turf/open/floor/wood, /area/awaymission/beach) "cj" = ( -/obj/structure/closet/secure_closet/bar, +/obj/structure/closet/secure_closet/bar/all_access, /obj/item/storage/box/drinkingglasses, /obj/item/storage/box/drinkingglasses, /obj/item/storage/box/drinkingglasses, @@ -656,9 +656,7 @@ /turf/open/floor/wood, /area/awaymission/beach) "cr" = ( -/obj/structure/closet/secure_closet/freezer/kitchen{ - req_access = list("kitchen") - }, +/obj/structure/closet/secure_closet/freezer/kitchen, /obj/item/storage/fancy/egg_box, /obj/item/reagent_containers/condiment/milk, /obj/item/reagent_containers/condiment/milk, diff --git a/_maps/map_files/Deltastation/DeltaStation2.dmm b/_maps/map_files/Deltastation/DeltaStation2.dmm index 8858a325985..4e7bf4c1979 100644 --- a/_maps/map_files/Deltastation/DeltaStation2.dmm +++ b/_maps/map_files/Deltastation/DeltaStation2.dmm @@ -80631,9 +80631,7 @@ /area/station/hallway/secondary/entry) "uhn" = ( /obj/structure/window/spawner/directional/west, -/obj/structure/closet/secure_closet/freezer/kitchen{ - req_access = null - }, +/obj/structure/closet/secure_closet/freezer/kitchen/all_access, /obj/item/food/breadslice/plain, /obj/item/food/breadslice/plain, /obj/item/food/breadslice/plain, diff --git a/_maps/map_files/MetaStation/MetaStation.dmm b/_maps/map_files/MetaStation/MetaStation.dmm index e2d5cdf04d3..7a7c9d7436d 100644 --- a/_maps/map_files/MetaStation/MetaStation.dmm +++ b/_maps/map_files/MetaStation/MetaStation.dmm @@ -35892,7 +35892,7 @@ /turf/open/floor/iron, /area/station/cargo/miningoffice) "mUD" = ( -/obj/structure/closet/secure_closet/bar{ +/obj/structure/closet/secure_closet/bar/all_access{ pixel_x = -3; pixel_y = -1 }, diff --git a/_maps/shuttles/emergency_tranquility.dmm b/_maps/shuttles/emergency_tranquility.dmm index c1521f617c5..20f5f98b1a0 100644 --- a/_maps/shuttles/emergency_tranquility.dmm +++ b/_maps/shuttles/emergency_tranquility.dmm @@ -2272,7 +2272,7 @@ /turf/open/floor/carpet, /area/shuttle/escape) "Pi" = ( -/obj/structure/closet/secure_closet/bar, +/obj/structure/closet/secure_closet/bar/all_access, /obj/machinery/light/directional/west, /turf/open/floor/stone, /area/shuttle/escape) diff --git a/code/game/objects/structures/crates_lockers/closets/secure/bar.dm b/code/game/objects/structures/crates_lockers/closets/secure/bar.dm index cb5a70e8440..93a381b66d6 100644 --- a/code/game/objects/structures/crates_lockers/closets/secure/bar.dm +++ b/code/game/objects/structures/crates_lockers/closets/secure/bar.dm @@ -17,3 +17,6 @@ new /obj/item/reagent_containers/cup/glass/bottle/beer( src ) new /obj/item/etherealballdeployer(src) new /obj/item/roulette_wheel_beacon(src) + +/obj/structure/closet/secure_closet/bar/all_access + req_access = null diff --git a/code/game/objects/structures/crates_lockers/closets/secure/freezer.dm b/code/game/objects/structures/crates_lockers/closets/secure/freezer.dm index 5091c01eacc..a13e4dc699a 100644 --- a/code/game/objects/structures/crates_lockers/closets/secure/freezer.dm +++ b/code/game/objects/structures/crates_lockers/closets/secure/freezer.dm @@ -59,10 +59,13 @@ new /obj/item/reagent_containers/condiment/rice(src) new /obj/item/reagent_containers/condiment/sugar(src) +/obj/structure/closet/secure_closet/freezer/kitchen/all_access + req_access = null + /obj/structure/closet/secure_closet/freezer/kitchen/maintenance name = "maintenance refrigerator" desc = "This refrigerator looks quite dusty, is there anything edible still inside?" - req_access = list() + req_access = null /obj/structure/closet/secure_closet/freezer/kitchen/maintenance/PopulateContents() ..() @@ -73,7 +76,7 @@ new /obj/item/storage/fancy/egg_box(src) /obj/structure/closet/secure_closet/freezer/kitchen/mining - req_access = list() + req_access = null /obj/structure/closet/secure_closet/freezer/meat name = "meat fridge" @@ -86,7 +89,10 @@ /obj/structure/closet/secure_closet/freezer/meat/open locked = FALSE - req_access = list() + req_access = null + +/obj/structure/closet/secure_closet/freezer/meat/all_access + req_access = null /obj/structure/closet/secure_closet/freezer/gulag_fridge name = "refrigerator" @@ -108,6 +114,9 @@ for(var/i in 1 to 2) new /obj/item/storage/fancy/egg_box(src) +/obj/structure/closet/secure_closet/freezer/fridge/all_access + req_access = null + /obj/structure/closet/secure_closet/freezer/fridge/open req_access = null locked = FALSE diff --git a/tools/UpdatePaths/Scripts/75439_freezers_null_access.txt b/tools/UpdatePaths/Scripts/75439_freezers_null_access.txt new file mode 100644 index 00000000000..975280f48ec --- /dev/null +++ b/tools/UpdatePaths/Scripts/75439_freezers_null_access.txt @@ -0,0 +1,4 @@ +/obj/structure/closet/secure_closet/freezer/meat{req_access = null} : /obj/structure/closet/secure_closet/freezer/meat/all_access{@OLD;req_access=@SKIP} +/obj/structure/closet/secure_closet/freezer/fridge{req_access = null} : /obj/structure/closet/secure_closet/freezer/fridge/all_access{@OLD;req_access=@SKIP} +/obj/structure/closet/secure_closet/freezer/kitchen{req_access = null} : /obj/structure/closet/secure_closet/freezer/kitchen/all_access{@OLD;req_access=@SKIP} +/obj/structure/closet/secure_closet/bar{req_access = null} : /obj/structure/closet/secure_closet/bar/all_access{@OLD;req_access=@SKIP}