From a67d11b67619cf13cba174c1dab3df9b768f1ae2 Mon Sep 17 00:00:00 2001 From: ArrisFairburne Date: Thu, 20 Aug 2026 14:31:50 -0400 Subject: [PATCH] Upstream mapping standards (#6111) ## About The Pull Request Adds in upstream mapping standards to some the bubber specific maps. This just replaces slot machines with the random slotmachine spawner and adds in genetics front doors. ## Why It's Good For The Game Consistency with TG maps ## Proof Of Testing I didn't get any errors when I ran my local code ## Changelog :cl: map: bubberstation specific maps now get a genetics front door and new random slot machines /:cl: --- _maps/map_files/Blueshift/Blueshift.dmm | 92 +++++++------ _maps/map_files/BoxStation/BoxStation.dmm | 47 ++++--- _maps/map_files/NorthStar/north_star.dmm | 12 +- _maps/map_files/VoidRaptor/VoidRaptor.dmm | 142 ++++++++++++-------- _maps/map_files/biodome/biodome.dmm | 35 +++-- _maps/map_files/moonstation/moonstation.dmm | 46 ++----- 6 files changed, 200 insertions(+), 174 deletions(-) diff --git a/_maps/map_files/Blueshift/Blueshift.dmm b/_maps/map_files/Blueshift/Blueshift.dmm index d623d061e62..6d208afe94c 100644 --- a/_maps/map_files/Blueshift/Blueshift.dmm +++ b/_maps/map_files/Blueshift/Blueshift.dmm @@ -5177,10 +5177,12 @@ /turf/open/floor/wood, /area/station/service/bar/atrium) "bbz" = ( -/obj/machinery/computer/slot_machine, /obj/effect/decal/cleanable/dirt{ icon_state = "dirt-flat-1" }, +/obj/effect/spawner/random/entertainment/slot_machine{ + dir = 1 + }, /turf/open/floor/wood, /area/station/maintenance/rus_gambling) "bbE" = ( @@ -17731,10 +17733,12 @@ /turf/open/floor/plating, /area/station/maintenance/port/upper) "dqP" = ( -/obj/machinery/computer/slot_machine, /obj/effect/decal/cleanable/dirt{ icon_state = "dirt-flat-1" }, +/obj/effect/spawner/random/entertainment/slot_machine{ + dir = 8 + }, /turf/open/floor/plating, /area/station/maintenance/abandon_arcade) "dqS" = ( @@ -38500,6 +38504,18 @@ dir = 8 }, /area/station/hallway/primary/port) +"hqi" = ( +/obj/machinery/door/airlock/research/glass{ + name = "Genetics Lab" + }, +/obj/effect/mapping_helpers/airlock/access/all/science/genetics, +/obj/machinery/door/firedoor, +/obj/machinery/door/poddoor/shutters/preopen{ + id = "rdgene2"; + name = "Genetics Lab Shutters" + }, +/turf/open/floor/iron/dark, +/area/station/science/genetics) "hqo" = ( /obj/structure/window/spawner/directional/south, /obj/structure/window/spawner/directional/east, @@ -43394,7 +43410,7 @@ /turf/open/floor/iron, /area/station/maintenance/starboard/fore) "inq" = ( -/obj/machinery/computer/slot_machine, +/obj/effect/spawner/random/entertainment/slot_machine, /turf/open/floor/wood, /area/station/service/abandoned_gambling_den) "inu" = ( @@ -57588,25 +57604,6 @@ initial_gas_mix = "TEMP=2.7" }, /area/station/science/ordnance/bomb) -"kYy" = ( -/obj/structure/table, -/obj/effect/turf_decal/stripes{ - dir = 5 - }, -/obj/effect/turf_decal/stripes/white/line{ - dir = 10 - }, -/obj/item/paper_bin{ - pixel_y = 3 - }, -/obj/item/paper_bin{ - pixel_y = 3 - }, -/obj/item/pen{ - pixel_y = 3 - }, -/turf/open/floor/iron/dark, -/area/station/science/genetics) "kYB" = ( /obj/structure/cable, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -58877,11 +58874,11 @@ /turf/open/floor/plating, /area/station/maintenance/department/engineering/atmos_aux_port) "lkP" = ( -/obj/machinery/computer/slot_machine{ - pixel_y = 2 - }, /obj/machinery/light/directional/east, /obj/structure/extinguisher_cabinet/directional/east, +/obj/effect/spawner/random/entertainment/slot_machine{ + dir = 8 + }, /turf/open/floor/wood, /area/station/service/bar/atrium) "lkS" = ( @@ -71512,11 +71509,13 @@ /turf/open/floor/grass, /area/station/hallway/primary/central) "nJv" = ( -/obj/machinery/computer/slot_machine, /obj/machinery/light/directional/south, /obj/effect/decal/cleanable/dirt{ icon_state = "dirt-flat-1" }, +/obj/effect/spawner/random/entertainment/slot_machine{ + dir = 1 + }, /turf/open/floor/wood, /area/station/maintenance/rus_gambling) "nJx" = ( @@ -76578,6 +76577,7 @@ /obj/effect/turf_decal/stripes/white/line, /obj/item/clipboard, /obj/item/toy/figure/geneticist, +/obj/item/bouquet/rose, /turf/open/floor/iron/dark, /area/station/science/genetics) "oEB" = ( @@ -81979,10 +81979,12 @@ /turf/open/floor/iron, /area/station/commons/dorms) "pIA" = ( -/obj/machinery/computer/slot_machine, /obj/effect/decal/cleanable/dirt{ icon_state = "dirt-flat-1" }, +/obj/effect/spawner/random/entertainment/slot_machine{ + dir = 8 + }, /turf/open/floor/eighties, /area/station/maintenance/abandon_arcade) "pIJ" = ( @@ -94060,19 +94062,24 @@ /area/station/command/heads_quarters/rd) "rWn" = ( /obj/structure/table, -/obj/effect/turf_decal/stripes{ - dir = 4 - }, -/obj/effect/turf_decal/stripes/white/line{ - dir = 4 - }, /obj/machinery/requests_console/directional/south{ department = "Genetics"; name = "Genetics Requests console"; pixel_x = -30; pixel_y = 0 }, -/obj/item/bouquet/rose, +/obj/item/paper_bin{ + pixel_y = 3 + }, +/obj/item/pen{ + pixel_y = 3 + }, +/obj/effect/turf_decal/stripes{ + dir = 5 + }, +/obj/effect/turf_decal/stripes/white/line{ + dir = 10 + }, /turf/open/floor/iron/dark, /area/station/science/genetics) "rWt" = ( @@ -103644,7 +103651,9 @@ }, /area/station/science) "tMq" = ( -/obj/machinery/computer/slot_machine, +/obj/effect/spawner/random/entertainment/slot_machine{ + dir = 8 + }, /turf/open/floor/eighties, /area/station/maintenance/abandon_arcade) "tMs" = ( @@ -104220,10 +104229,10 @@ /turf/open/floor/iron/white, /area/station/science/research) "tQT" = ( -/obj/machinery/computer/slot_machine{ - pixel_y = 2 - }, /obj/machinery/digital_clock/directional/east, +/obj/effect/spawner/random/entertainment/slot_machine{ + dir = 8 + }, /turf/open/floor/wood, /area/station/service/bar/atrium) "tQV" = ( @@ -124621,7 +124630,6 @@ /turf/open/floor/iron/dark, /area/station/science/ordnance/storage) "xKN" = ( -/obj/item/kirbyplants/random, /obj/effect/turf_decal/trimline/purple/filled/line{ dir = 6 }, @@ -127184,7 +127192,7 @@ /turf/open/floor/iron, /area/station/security/prison/upper) "yiA" = ( -/obj/machinery/computer/slot_machine, +/obj/effect/spawner/random/entertainment/slot_machine, /turf/open/floor/plating, /area/station/service/abandoned_gambling_den) "yiC" = ( @@ -226629,7 +226637,7 @@ whu lqk pYm bcX -pYm +hqi lqk oEx vEL @@ -226886,7 +226894,7 @@ vma lqk tNn rHm -kYy +spO rWn hxo rEm diff --git a/_maps/map_files/BoxStation/BoxStation.dmm b/_maps/map_files/BoxStation/BoxStation.dmm index 94fcc8a943b..6d6b5f5f6ed 100644 --- a/_maps/map_files/BoxStation/BoxStation.dmm +++ b/_maps/map_files/BoxStation/BoxStation.dmm @@ -9672,7 +9672,9 @@ dir = 4 }, /obj/machinery/light/small/directional/south, -/obj/machinery/computer/slot_machine, +/obj/effect/spawner/random/entertainment/slot_machine{ + dir = 8 + }, /turf/open/floor/wood/parquet, /area/station/service/bar) "baj" = ( @@ -10956,11 +10958,10 @@ /turf/open/floor/iron/dark/small, /area/station/medical/pharmacy) "bgI" = ( -/obj/machinery/computer/slot_machine{ - name = "gamba"; - desc = "CAN'T STOP WINNING" - }, /obj/machinery/wall_healer/directional/south, +/obj/effect/spawner/random/entertainment/slot_machine{ + dir = 1 + }, /turf/open/floor/iron/dark/smooth_large, /area/station/command/meeting_room) "bgJ" = ( @@ -27961,7 +27962,7 @@ dir = 1 }, /obj/effect/turf_decal/trimline/purple/filled/corner{ - dir = 4 + dir = 8 }, /turf/open/floor/iron/white/smooth_edge{ dir = 1 @@ -28601,10 +28602,6 @@ /obj/item/stack/tile/basalt, /turf/open/floor/plating, /area/station/maintenance/starboard/fore) -"dJl" = ( -/obj/machinery/vending/cart, -/turf/open/floor/iron/large, -/area/station/hallway/primary/starboard) "dJm" = ( /obj/structure/table, /obj/item/clothing/head/cone{ @@ -39050,7 +39047,6 @@ dir = 9 }, /obj/structure/extinguisher_cabinet/directional/north, -/obj/item/kirbyplants/random, /turf/open/floor/iron/dark/textured, /area/station/science/genetics) "hJz" = ( @@ -40574,6 +40570,7 @@ dir = 4 }, /obj/machinery/airalarm/directional/east, +/obj/item/kirbyplants/random, /turf/open/floor/iron/dark/textured, /area/station/science/genetics) "ilO" = ( @@ -57449,6 +57446,7 @@ dir = 8 }, /obj/effect/turf_decal/trimline/purple/filled/mid_joiner, +/obj/machinery/vending/modularpc, /turf/open/floor/iron/corner{ dir = 4 }, @@ -58767,7 +58765,7 @@ alpha = 160 }, /obj/effect/turf_decal/trimline/purple/filled/corner{ - dir = 4 + dir = 8 }, /obj/effect/turf_decal/siding/thinplating/dark{ dir = 8 @@ -60903,6 +60901,13 @@ /obj/structure/flora/bush/sparsegrass/style_random, /turf/open/floor/grass, /area/station/service/hydroponics/garden/abandoned) +"pHx" = ( +/obj/machinery/light/directional/south, +/obj/effect/turf_decal/trimline/purple/filled/line, +/obj/effect/turf_decal/trimline/purple/filled/mid_joiner, +/obj/machinery/vending/cart, +/turf/open/floor/iron/edge, +/area/station/hallway/primary/starboard) "pHy" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4{ dir = 4 @@ -62754,10 +62759,6 @@ dir = 1 }, /area/station/hallway/primary/starboard) -"qrp" = ( -/obj/machinery/vending/modularpc, -/turf/open/floor/iron/large, -/area/station/hallway/primary/starboard) "qrt" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4{ dir = 4 @@ -71851,13 +71852,17 @@ /turf/open/floor/iron/white, /area/station/science/xenobiology) "tKY" = ( -/obj/effect/spawner/structure/window/reinforced, +/obj/machinery/door/airlock/research/glass{ + name = "Genetics Lab" + }, +/obj/effect/mapping_helpers/airlock/access/all/science/genetics, +/obj/machinery/door/firedoor, /obj/machinery/door/poddoor/shutters/preopen{ dir = 8; id = "gene_desk_shutters"; name = "Genetics Shutters" }, -/turf/open/floor/plating, +/turf/open/floor/iron/dark, /area/station/science/genetics) "tLd" = ( /obj/effect/turf_decal/siding/dark{ @@ -130992,7 +130997,7 @@ ggc vlZ qXW aYV -ewl +pHx bvx hWq bvx @@ -132277,8 +132282,8 @@ hSf wbr vSz dek -dJl -qrp +dek +pQG pKX gZx cat diff --git a/_maps/map_files/NorthStar/north_star.dmm b/_maps/map_files/NorthStar/north_star.dmm index d40db70dfc1..fdc036fc0fd 100644 --- a/_maps/map_files/NorthStar/north_star.dmm +++ b/_maps/map_files/NorthStar/north_star.dmm @@ -74565,8 +74565,10 @@ /turf/open/misc/dirt/jungle, /area/station/service/hydroponics/garden/abandoned) "szl" = ( -/obj/machinery/computer/slot_machine, /obj/effect/decal/cleanable/dirt, +/obj/effect/spawner/random/entertainment/slot_machine{ + dir = 4 + }, /turf/open/floor/carpet/green, /area/station/service/abandoned_gambling_den) "szn" = ( @@ -82389,9 +82391,11 @@ /turf/open/floor/iron/white, /area/station/science/xenobiology/hallway) "uwl" = ( -/obj/machinery/computer/slot_machine, /obj/machinery/firealarm/directional/west, /obj/effect/decal/cleanable/dirt, +/obj/effect/spawner/random/entertainment/slot_machine{ + dir = 4 + }, /turf/open/floor/carpet/green, /area/station/service/abandoned_gambling_den) "uwm" = ( @@ -92787,8 +92791,10 @@ /turf/open/floor/iron/dark, /area/station/hallway/floor2/aft) "wTU" = ( -/obj/machinery/computer/slot_machine, /obj/structure/sign/poster/contraband/random/directional/west, +/obj/effect/spawner/random/entertainment/slot_machine{ + dir = 4 + }, /turf/open/floor/carpet/green, /area/station/service/abandoned_gambling_den) "wTV" = ( diff --git a/_maps/map_files/VoidRaptor/VoidRaptor.dmm b/_maps/map_files/VoidRaptor/VoidRaptor.dmm index 87fa3e281d2..7b1b996ba9c 100644 --- a/_maps/map_files/VoidRaptor/VoidRaptor.dmm +++ b/_maps/map_files/VoidRaptor/VoidRaptor.dmm @@ -3845,9 +3845,10 @@ /turf/open/floor/iron/smooth, /area/station/command/cc_dock) "bdp" = ( -/obj/machinery/destructive_scanner, -/obj/effect/turf_decal/stripes/end, -/turf/open/floor/iron/white/smooth_large, +/obj/effect/turf_decal/trimline/purple/filled/warning{ + dir = 9 + }, +/turf/open/floor/iron/white, /area/station/hallway/primary/fore) "bdA" = ( /obj/machinery/atmospherics/pipe/smart/simple/scrubbers/visible, @@ -15329,14 +15330,11 @@ /turf/open/floor/iron/smooth, /area/station/hallway/primary/aft) "ewN" = ( -/obj/effect/turf_decal/stripes/line{ - dir = 8 +/obj/effect/turf_decal/trimline/purple/filled/corner{ + dir = 1 }, -/obj/effect/turf_decal/trimline/purple/filled/warning{ - dir = 8 - }, -/turf/open/floor/iron/white/smooth_edge{ - dir = 4 +/turf/open/floor/iron/white/smooth_corner{ + dir = 1 }, /area/station/hallway/primary/fore) "ewT" = ( @@ -15392,7 +15390,10 @@ dir = 4 }, /obj/structure/disposalpipe/segment, -/obj/structure/sink/directional/west, +/obj/structure/table, +/obj/machinery/computer/records/medical/laptop{ + pixel_y = 1 + }, /turf/open/floor/iron/white/smooth_edge{ dir = 8 }, @@ -16148,6 +16149,17 @@ dir = 4 }, /area/station/science/ordnance) +"eHO" = ( +/obj/machinery/door/poddoor/shutters/preopen{ + id = "genetics_shutters"; + name = "Genetics Shutters" + }, +/obj/machinery/door/airlock/research/glass{ + name = "Genetics Lab" + }, +/obj/effect/mapping_helpers/airlock/access/all/science/genetics, +/turf/open/floor/iron/dark, +/area/station/science/genetics) "eHP" = ( /obj/machinery/door/firedoor, /turf/open/floor/iron/large, @@ -24297,17 +24309,6 @@ dir = 1 }, /area/station/engineering/power_room) -"hcq" = ( -/obj/effect/turf_decal/trimline/purple/filled/corner{ - dir = 1 - }, -/obj/effect/turf_decal/stripes/corner{ - dir = 1 - }, -/turf/open/floor/iron/white/smooth_corner{ - dir = 1 - }, -/area/station/hallway/primary/fore) "hcw" = ( /obj/machinery/digital_clock{ pixel_y = 5 @@ -26600,6 +26601,13 @@ /obj/machinery/light/cold/directional/north, /turf/open/floor/engine, /area/station/engineering/main) +"hKi" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/effect/turf_decal/stripes/corner{ + dir = 8 + }, +/turf/open/floor/iron/white/smooth_large, +/area/station/hallway/primary/fore) "hKj" = ( /obj/machinery/door/firedoor, /obj/structure/cable, @@ -28192,6 +28200,9 @@ /area/station/engineering/atmos) "ijy" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/effect/turf_decal/stripes/corner{ + dir = 1 + }, /turf/open/floor/iron/white/smooth_large, /area/station/hallway/primary/fore) "ijR" = ( @@ -40105,12 +40116,12 @@ /area/station/hallway/secondary/exit/departure_lounge) "lrz" = ( /obj/item/kirbyplants/random, -/obj/effect/turf_decal/trimline/purple/filled/warning{ - dir = 9 - }, /obj/structure/railing{ dir = 4 }, +/obj/effect/turf_decal/trimline/purple/filled/line{ + dir = 1 + }, /turf/open/floor/iron/white, /area/station/hallway/primary/fore) "lrC" = ( @@ -42935,6 +42946,16 @@ /obj/machinery/firealarm/directional/south, /turf/open/floor/iron/large, /area/station/commons/dorms/laundry) +"mdt" = ( +/obj/effect/turf_decal/trimline/purple/filled/warning{ + dir = 8 + }, +/obj/effect/turf_decal/stripes/line, +/obj/structure/table, +/turf/open/floor/iron/white/smooth_edge{ + dir = 4 + }, +/area/station/hallway/primary/fore) "mdu" = ( /obj/structure/sign/nanotrasen{ pixel_x = -32 @@ -48766,6 +48787,9 @@ pixel_y = 32 }, /obj/machinery/vending/modularpc, +/obj/effect/turf_decal/trimline/purple/filled/line{ + dir = 1 + }, /turf/open/floor/iron/white/smooth_edge, /area/station/hallway/primary/fore) "nJT" = ( @@ -54483,8 +54507,8 @@ dir = 1 }, /obj/item/radio/intercom/directional/north, -/obj/machinery/computer/slot_machine, /obj/effect/turf_decal/bot, +/obj/effect/spawner/random/entertainment/slot_machine, /turf/open/floor/iron/smooth_edge, /area/station/engineering/break_room) "pjF" = ( @@ -56158,16 +56182,6 @@ }, /turf/open/floor/catwalk_floor/iron_smooth, /area/station/maintenance/solars/starboard/aft) -"pII" = ( -/obj/effect/turf_decal/trimline/purple/filled/warning{ - dir = 9 - }, -/obj/effect/turf_decal/stripes/line{ - dir = 1 - }, -/obj/effect/landmark/start/hangover, -/turf/open/floor/iron/white, -/area/station/hallway/primary/fore) "pIJ" = ( /obj/machinery/door/morgue{ name = "Relic Closet"; @@ -56871,11 +56885,13 @@ }, /area/station/cargo/sorting) "pUl" = ( -/obj/machinery/computer/slot_machine, /obj/effect/turf_decal/siding/wood{ dir = 8 }, /obj/effect/turf_decal/bot, +/obj/effect/spawner/random/entertainment/slot_machine{ + dir = 4 + }, /turf/open/floor/wood/large, /area/station/commons/fitness/recreation) "pUu" = ( @@ -58049,6 +58065,12 @@ }, /area/station/science/xenobiology) "qgT" = ( +/obj/structure/table, +/obj/item/stack/package_wrap, +/obj/item/hand_labeler, +/obj/effect/turf_decal/trimline/purple/filled/line{ + dir = 9 + }, /turf/open/floor/iron/white, /area/station/hallway/primary/fore) "qhe" = ( @@ -62404,14 +62426,12 @@ }, /area/station/engineering/power_room) "rtq" = ( -/obj/effect/turf_decal/trimline/purple/filled/line{ - dir = 8 - }, -/obj/structure/table, /obj/machinery/airalarm/directional/west, -/obj/item/stack/package_wrap, -/obj/item/hand_labeler, /obj/machinery/light/cold/directional/west, +/obj/machinery/destructive_scanner, +/obj/effect/turf_decal/stripes/end{ + dir = 4 + }, /turf/open/floor/iron/white/smooth_edge{ dir = 4 }, @@ -64578,14 +64598,11 @@ /turf/open/floor/wood/large, /area/station/hallway/primary/central/fore) "saU" = ( -/obj/machinery/computer/records/medical/laptop{ - pixel_y = 1 - }, -/obj/structure/table, /obj/effect/turf_decal/trimline/purple/filled/line{ dir = 5 }, /obj/machinery/newscaster/directional/north, +/obj/structure/sink/directional/south, /turf/open/floor/iron/white, /area/station/science/genetics) "sbv" = ( @@ -79579,9 +79596,12 @@ /turf/open/floor/wood, /area/station/security/prison/garden) "wex" = ( -/obj/effect/turf_decal/trimline/purple/filled/line{ +/obj/effect/turf_decal/trimline/purple/filled/warning{ dir = 8 }, +/obj/effect/turf_decal/stripes/line{ + dir = 1 + }, /turf/open/floor/iron/white/smooth_edge{ dir = 4 }, @@ -79684,6 +79704,13 @@ dir = 8 }, /area/station/cargo/office) +"wfQ" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/effect/turf_decal/stripes/line{ + dir = 8 + }, +/turf/open/floor/iron/white/smooth_large, +/area/station/hallway/primary/fore) "wfU" = ( /obj/machinery/door/firedoor, /turf/open/floor/iron/stairs/right{ @@ -83439,9 +83466,6 @@ /obj/structure/chair/sofa/bench/right{ dir = 8 }, -/obj/effect/turf_decal/trimline/purple/filled/corner{ - dir = 1 - }, /obj/effect/landmark/start/assistant, /obj/structure/railing{ dir = 4 @@ -86945,11 +86969,13 @@ /turf/open/floor/iron/freezer, /area/station/medical/chemistry) "yjU" = ( -/obj/machinery/computer/slot_machine, /obj/effect/turf_decal/siding/wood{ dir = 10 }, /obj/effect/turf_decal/bot, +/obj/effect/spawner/random/entertainment/slot_machine{ + dir = 4 + }, /turf/open/floor/wood/large, /area/station/commons/fitness/recreation) "ykd" = ( @@ -119063,7 +119089,7 @@ eSl aWD eYY vBP -dAP +eHO lwE dAP vBP @@ -119321,8 +119347,8 @@ eUT imR dto bdp -pII -wex +kFW +mdt rtq wex kFW @@ -119578,9 +119604,9 @@ xFy imR qgT ewN -hcq -ijy -ijy +rPp +hKi +wfQ ijy bbr iQp diff --git a/_maps/map_files/biodome/biodome.dmm b/_maps/map_files/biodome/biodome.dmm index f41235ba4a9..cb99145d950 100644 --- a/_maps/map_files/biodome/biodome.dmm +++ b/_maps/map_files/biodome/biodome.dmm @@ -13964,10 +13964,6 @@ }, /turf/open/floor/carpet/royalblack, /area/station/service/library) -"eTE" = ( -/obj/machinery/computer/slot_machine, -/turf/open/floor/wood, -/area/station/service/abandoned_gambling_den) "eTL" = ( /obj/structure/sign/directions/cryo/directional/north, /turf/open/floor/iron, @@ -27950,6 +27946,18 @@ /obj/structure/cable, /turf/open/floor/iron/recharge_floor, /area/station/science/robotics/mechbay) +"jUY" = ( +/obj/machinery/door/airlock/research/glass{ + name = "Genetics Lab" + }, +/obj/effect/mapping_helpers/airlock/access/all/science/genetics, +/obj/machinery/door/firedoor, +/obj/machinery/door/poddoor/shutters/preopen{ + id = "gene_desk_shutters"; + name = "Genetics Shutters" + }, +/turf/open/floor/iron/dark, +/area/station/science/genetics) "jVb" = ( /obj/effect/turf_decal/tile/yellow/half/contrasted, /turf/open/floor/iron/white, @@ -32191,7 +32199,6 @@ /area/station/service/kitchen) "lpq" = ( /obj/effect/turf_decal/siding/purple, -/obj/structure/chair/stool/directional/south, /turf/open/floor/iron/white, /area/station/science/genetics) "lps" = ( @@ -38169,6 +38176,7 @@ /area/station/construction) "nqj" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/effect/spawner/random/maintenance, /turf/open/floor/carpet/green, /area/station/service/abandoned_gambling_den) "nqk" = ( @@ -38679,7 +38687,7 @@ /area/station/cargo/blacksmith) "nzP" = ( /obj/effect/mapping_helpers/broken_floor, -/obj/machinery/computer/slot_machine, +/obj/effect/spawner/random/entertainment/slot_machine, /turf/open/floor/plating, /area/station/service/abandoned_gambling_den) "nzX" = ( @@ -41224,8 +41232,7 @@ /turf/open/floor/iron/dark, /area/station/security/eva) "otw" = ( -/obj/effect/spawner/random/maintenance, -/obj/machinery/computer/slot_machine, +/obj/effect/spawner/random/entertainment/slot_machine, /turf/open/floor/wood, /area/station/service/abandoned_gambling_den) "otL" = ( @@ -45359,7 +45366,9 @@ /obj/effect/turf_decal/siding/wood{ dir = 10 }, -/obj/machinery/computer/slot_machine, +/obj/effect/spawner/random/entertainment/slot_machine{ + dir = 1 + }, /turf/open/floor/wood/large, /area/station/commons/lounge) "pVf" = ( @@ -59512,9 +59521,9 @@ /obj/effect/turf_decal/siding/wood{ dir = 9 }, -/obj/machinery/computer/slot_machine, /obj/item/radio/intercom/directional/west, /obj/machinery/barsign/directional/north, +/obj/effect/spawner/random/entertainment/slot_machine, /turf/open/floor/wood/large, /area/station/commons/lounge) "uBt" = ( @@ -175790,7 +175799,7 @@ xoI xoI kRf jFc -sYC +rWo mwG uan arv @@ -176304,7 +176313,7 @@ cCA edN rar lpq -rWo +jUY mwG uan eXz @@ -185342,7 +185351,7 @@ hNy hNy hNy rSb -eTE +otw ptu xdw tfS diff --git a/_maps/map_files/moonstation/moonstation.dmm b/_maps/map_files/moonstation/moonstation.dmm index 42cdd4f16d0..a2d7e3c1440 100644 --- a/_maps/map_files/moonstation/moonstation.dmm +++ b/_maps/map_files/moonstation/moonstation.dmm @@ -4632,8 +4632,8 @@ /turf/open/floor/circuit/telecomms, /area/station/ai/satellite/chamber) "bfn" = ( -/obj/machinery/computer/slot_machine, /obj/structure/sign/poster/contraband/random/directional/east, +/obj/effect/spawner/random/entertainment/slot_machine, /turf/open/floor/wood, /area/station/service/abandoned_gambling_den) "bfs" = ( @@ -12785,16 +12785,6 @@ /obj/effect/decal/cleanable/cobweb/cobweb2, /turf/open/floor/iron, /area/station/security/prison/visit) -"dms" = ( -/obj/effect/mapping_helpers/broken_floor, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/obj/structure/cable, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/turf/open/floor/plating, -/area/station/maintenance/department/crew_quarters/dorms) "dmv" = ( /obj/machinery/door/airlock/external/glass{ name = "External Public Airlock" @@ -24045,7 +24035,7 @@ /area/station/service/abandoned_gambling_den) "geY" = ( /obj/machinery/light/directional/north, -/obj/machinery/computer/slot_machine, +/obj/effect/spawner/random/entertainment/slot_machine, /turf/open/floor/plating, /area/station/service/abandoned_gambling_den) "gfh" = ( @@ -32286,19 +32276,6 @@ name = "Holodeck Projector Floor" }, /area/station/holodeck/rec_center) -"ilj" = ( -/obj/machinery/atmospherics/pipe/multiz/scrubbers/visible/layer2{ - color = "#ff0000"; - dir = 8; - name = "Scrubbers multi deck pipe adapter" - }, -/obj/machinery/atmospherics/pipe/multiz/supply/visible/layer4{ - color = "#0000ff"; - dir = 8; - name = "Supply multi deck pipe adapter" - }, -/turf/open/floor/plating, -/area/station/maintenance/department/crew_quarters/bar) "ilp" = ( /obj/structure/railing/wooden_fencing{ dir = 1 @@ -44475,8 +44452,10 @@ "loM" = ( /obj/structure/railing, /obj/effect/turf_decal/siding/dark, -/obj/machinery/computer/slot_machine, /obj/machinery/airalarm/directional/west, +/obj/effect/spawner/random/entertainment/slot_machine{ + dir = 4 + }, /turf/open/floor/carpet/red, /area/station/commons/lounge) "loS" = ( @@ -53388,9 +53367,11 @@ /turf/open/floor/iron, /area/station/engineering/atmos/pumproom) "nFB" = ( -/obj/machinery/computer/slot_machine, /obj/item/radio/intercom/directional/west, /obj/machinery/barsign/directional/north, +/obj/effect/spawner/random/entertainment/slot_machine{ + dir = 4 + }, /turf/open/floor/carpet/red, /area/station/commons/lounge) "nFG" = ( @@ -81145,15 +81126,6 @@ }, /turf/open/floor/iron, /area/station/service/hydroponics/garden) -"uHj" = ( -/obj/structure/cable, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/structure/disposalpipe/segment{ - dir = 9 - }, -/turf/open/floor/plating, -/area/station/maintenance/department/medical) "uHk" = ( /obj/effect/turf_decal/caution, /obj/effect/turf_decal/stripes/line{ @@ -93410,7 +93382,7 @@ "xUo" = ( /obj/effect/decal/cleanable/cobweb, /obj/machinery/barsign/all_access/directional/north, -/obj/machinery/computer/slot_machine, +/obj/effect/spawner/random/entertainment/slot_machine, /turf/open/floor/wood, /area/station/service/abandoned_gambling_den) "xUp" = (