From 6357ddb9ebe63d15d0c6777003fcb8df8ea5318d Mon Sep 17 00:00:00 2001 From: SkyratBot <59378654+SkyratBot@users.noreply.github.com> Date: Sat, 19 Aug 2023 05:08:39 +0200 Subject: [PATCH] [MIRROR] Fixes lavaland beach bartender closets. [MDB IGNORE] (#23189) * Fixes lavaland beach bartender closets. (#77698) ## About The Pull Request I subtyped the closets under bar closet as we have no wooden closet subtype which is stupid, and this may not be the best solution. But hey, now it's not varedited just in the map. Fixes https://github.com/tgstation/tgstation/issues/76943. ## Changelog :cl: fix: fixed lavaland beach bartender closets looking off. /:cl: * Fixes lavaland beach bartender closets. --------- Co-authored-by: Helg2 <93882977+Helg2@users.noreply.github.com> --- .../LavaRuins/lavaland_biodome_beach.dmm | 145 +++++++----------- .../crates_lockers/closets/secure/bar.dm | 22 ++- code/modules/clothing/shoes/sandals.dm | 4 + 3 files changed, 77 insertions(+), 94 deletions(-) diff --git a/_maps/RandomRuins/LavaRuins/lavaland_biodome_beach.dmm b/_maps/RandomRuins/LavaRuins/lavaland_biodome_beach.dmm index 81cbc8cea52..9fb7d46ce58 100644 --- a/_maps/RandomRuins/LavaRuins/lavaland_biodome_beach.dmm +++ b/_maps/RandomRuins/LavaRuins/lavaland_biodome_beach.dmm @@ -6,6 +6,10 @@ /obj/machinery/oven/range, /turf/open/floor/wood, /area/ruin/powered/beach) +"ae" = ( +/obj/structure/closet/secure_closet/bar/lavaland_bartender_booze, +/turf/open/floor/wood, +/area/ruin/powered/beach) "aj" = ( /turf/closed/wall/mineral/sandstone, /area/ruin/powered/beach) @@ -224,6 +228,12 @@ /obj/machinery/reagentgrinder, /turf/open/floor/wood, /area/ruin/powered/beach) +"fS" = ( +/mob/living/basic/crab{ + name = "Jonny" + }, +/turf/open/misc/beach/sand, +/area/ruin/powered/beach) "gg" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer4, @@ -331,13 +341,6 @@ /obj/structure/punching_bag, /turf/open/floor/pod/dark, /area/ruin/powered/beach) -"hZ" = ( -/obj/effect/turf_decal/sand, -/mob/living/basic/crab{ - name = "James" - }, -/turf/open/misc/beach/sand, -/area/ruin/powered/beach) "iH" = ( /obj/structure/flora/bush/stalky/style_random, /obj/structure/flora/bush/sparsegrass/style_random, @@ -484,12 +487,6 @@ icon_state = "sand" }, /area/ruin/powered/beach) -"pV" = ( -/mob/living/basic/crab{ - name = "Jon" - }, -/turf/open/misc/beach/sand, -/area/ruin/powered/beach) "qc" = ( /obj/structure/mirror/directional/west, /obj/structure/sink/kitchen/directional/south, @@ -530,22 +527,6 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer4, /turf/closed/wall/mineral/sandstone, /area/ruin/powered/beach) -"qK" = ( -/obj/structure/closet/secure_closet{ - icon_state = "cabinet"; - name = "bartender's closet"; - req_access = list("bar") - }, -/obj/item/clothing/shoes/sandal{ - desc = "A very fashionable pair of flip-flops."; - name = "flip-flops" - }, -/obj/item/clothing/neck/beads, -/obj/item/clothing/glasses/sunglasses/reagent, -/obj/item/clothing/suit/costume/hawaiian, -/obj/machinery/light/small/directional/east, -/turf/open/floor/wood, -/area/ruin/powered/beach) "qT" = ( /obj/machinery/light/directional/east, /obj/machinery/atmospherics/components/unary/vent_pump/on{ @@ -562,12 +543,6 @@ /obj/item/toy/seashell, /turf/open/misc/beach/sand, /area/ruin/powered/beach) -"rG" = ( -/mob/living/basic/crab{ - name = "Jonny" - }, -/turf/open/misc/beach/sand, -/area/ruin/powered/beach) "rK" = ( /obj/item/toy/beach_ball, /turf/open/misc/beach/sand, @@ -593,6 +568,12 @@ }, /turf/closed/wall/mineral/wood/nonmetal, /area/ruin/powered/beach) +"sA" = ( +/mob/living/basic/crab{ + name = "Jon" + }, +/turf/open/misc/beach/sand, +/area/ruin/powered/beach) "sV" = ( /obj/machinery/hydroponics/constructable, /turf/open/floor/iron/grimy, @@ -744,6 +725,13 @@ /obj/item/storage/medkit/brute, /turf/open/floor/wood, /area/ruin/powered/beach) +"AB" = ( +/obj/effect/turf_decal/sand, +/mob/living/basic/crab{ + name = "James" + }, +/turf/open/misc/beach/sand, +/area/ruin/powered/beach) "AC" = ( /obj/item/storage/crayons, /obj/structure/closet/crate/wooden, @@ -959,37 +947,6 @@ /obj/machinery/light/directional/west, /turf/open/floor/iron/stairs/left, /area/ruin/powered/beach) -"HW" = ( -/obj/item/reagent_containers/cup/glass/bottle/beer/light, -/obj/item/reagent_containers/cup/glass/bottle/beer/light, -/obj/item/reagent_containers/cup/glass/bottle/beer/light, -/obj/item/reagent_containers/cup/glass/bottle/beer/light, -/obj/item/vending_refill/cigarette, -/obj/item/vending_refill/boozeomat, -/obj/structure/closet/secure_closet{ - icon_state = "cabinet"; - name = "booze storage"; - req_access = list("bar") - }, -/obj/item/storage/backpack/duffelbag, -/obj/item/etherealballdeployer, -/obj/item/reagent_containers/cup/glass/bottle/beer/light, -/obj/item/reagent_containers/cup/glass/bottle/beer/light, -/obj/item/reagent_containers/cup/glass/bottle/beer/light, -/obj/item/reagent_containers/cup/glass/bottle/beer/light, -/obj/item/reagent_containers/cup/glass/bottle/beer/light, -/obj/item/reagent_containers/cup/glass/bottle/beer/light, -/obj/item/reagent_containers/cup/glass/bottle/beer/light, -/obj/item/reagent_containers/cup/glass/bottle/beer/light, -/obj/item/reagent_containers/cup/glass/bottle/beer/light, -/obj/item/reagent_containers/cup/glass/bottle/beer/light, -/obj/item/reagent_containers/cup/glass/colocup, -/obj/item/reagent_containers/cup/glass/colocup, -/obj/item/reagent_containers/cup/glass/colocup, -/obj/item/reagent_containers/cup/glass/colocup, -/obj/item/reagent_containers/cup/glass/colocup, -/turf/open/floor/wood, -/area/ruin/powered/beach) "Il" = ( /obj/structure/table/wood, /obj/item/reagent_containers/condiment/saltshaker, @@ -1218,22 +1175,14 @@ dir = 8 }, /area/ruin/powered/beach) -"RB" = ( -/obj/structure/closet/cabinet, -/obj/item/storage/backpack/duffelbag, -/obj/item/clothing/under/shorts/blue, -/obj/item/clothing/suit/costume/ianshirt, -/obj/item/clothing/shoes/sandal{ - desc = "A very fashionable pair of flip-flops."; - name = "flip-flops" - }, -/obj/item/clothing/glasses/sunglasses, -/obj/item/clothing/neck/beads, -/turf/open/floor/wood, -/area/ruin/powered/beach) "RE" = ( /turf/closed/wall/mineral/wood/nonmetal, /area/ruin/powered/beach) +"RZ" = ( +/obj/structure/closet/secure_closet/bar/lavaland_bartender_clothes, +/obj/machinery/light/small/directional/east, +/turf/open/floor/wood, +/area/ruin/powered/beach) "Sn" = ( /obj/machinery/door/airlock/maintenance{ name = "Supply Room" @@ -1242,6 +1191,13 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer4, /turf/open/floor/plating, /area/ruin/powered/beach) +"SC" = ( +/obj/machinery/light/directional/north, +/mob/living/basic/crab{ + name = "Eddie" + }, +/turf/open/misc/beach/sand, +/area/ruin/powered/beach) "SH" = ( /obj/structure/closet/crate/freezer{ name = "Cooler" @@ -1321,13 +1277,6 @@ /obj/structure/noticeboard/staff, /turf/closed/wall/mineral/wood/nonmetal, /area/ruin/powered/beach) -"UM" = ( -/obj/machinery/light/directional/north, -/mob/living/basic/crab{ - name = "Eddie" - }, -/turf/open/misc/beach/sand, -/area/ruin/powered/beach) "UT" = ( /obj/structure/flora/bush/sparsegrass/style_random, /turf/open/misc/beach/sand, @@ -1428,6 +1377,16 @@ /obj/structure/fluff/beach_umbrella/science, /turf/open/misc/beach/sand, /area/ruin/powered/beach) +"XR" = ( +/obj/structure/closet/cabinet, +/obj/item/storage/backpack/duffelbag, +/obj/item/clothing/under/shorts/blue, +/obj/item/clothing/suit/costume/ianshirt, +/obj/item/clothing/shoes/sandal/beach, +/obj/item/clothing/glasses/sunglasses, +/obj/item/clothing/neck/beads, +/turf/open/floor/wood, +/area/ruin/powered/beach) "XW" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden{ dir = 4 @@ -1520,7 +1479,7 @@ Zi BE Mf Iy -rG +fS UT aj oQ @@ -1555,7 +1514,7 @@ VI UT SY aj -HW +ae aC aC Eq @@ -1587,7 +1546,7 @@ VI VI FH aj -qK +RZ aC aC CK @@ -1704,7 +1663,7 @@ ct BN Lm Lm -hZ +AB Lm Lm VI @@ -1888,7 +1847,7 @@ MZ Bp wL MZ -UM +SC VI cm VI @@ -2160,7 +2119,7 @@ VI VI VI VI -pV +sA Lm wY wY @@ -2247,7 +2206,7 @@ aC aj EE Rk -RB +XR aj tB aC 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 17b99db9f19..e74873bfaef 100644 --- a/code/game/objects/structures/crates_lockers/closets/secure/bar.dm +++ b/code/game/objects/structures/crates_lockers/closets/secure/bar.dm @@ -14,7 +14,7 @@ /obj/structure/closet/secure_closet/bar/PopulateContents() ..() for(var/i in 1 to 10) - new /obj/item/reagent_containers/cup/glass/bottle/beer( src ) + new /obj/item/reagent_containers/cup/glass/bottle/beer(src) new /obj/item/etherealballdeployer(src) new /obj/item/roulette_wheel_beacon(src) @@ -25,3 +25,23 @@ /obj/structure/closet/secure_closet/bar/all_access req_access = null + +/obj/structure/closet/secure_closet/bar/lavaland_bartender_booze/PopulateContents() + new /obj/item/vending_refill/cigarette(src) + new /obj/item/vending_refill/boozeomat(src) + new /obj/item/storage/backpack/duffelbag(src) + new /obj/item/etherealballdeployer(src) + for(var/i in 1 to 14) + new /obj/item/reagent_containers/cup/glass/bottle/beer/light(src) + for(var/i in 1 to 5) + new /obj/item/reagent_containers/cup/glass/colocup(src) + +/obj/structure/closet/secure/closet/bar/lavaland_bartender_clothes + name = "bartender's closet" + +/obj/structure/closet/secure_closet/bar/lavaland_bartender_clothes/PopulateContents() + new /obj/item/clothing/neck/beads(src) + new /obj/item/clothing/glasses/sunglasses/reagent(src) + new /obj/item/clothing/suit/costume/hawaiian(src) + new /obj/item/clothing/shoes/sandal/beach(src) + diff --git a/code/modules/clothing/shoes/sandals.dm b/code/modules/clothing/shoes/sandals.dm index f6c867bca7a..9c948e2fac8 100644 --- a/code/modules/clothing/shoes/sandals.dm +++ b/code/modules/clothing/shoes/sandals.dm @@ -18,3 +18,7 @@ name = "magical sandals" desc = "A pair of sandals imbued with magic." resistance_flags = FIRE_PROOF | ACID_PROOF + +/obj/item/clothing/shoes/sandal/beach + name = "flip-flops" + desc = "A very fashionable pair of flip-flops."