From ad4e916c7d479332a9be785bafc8140da72f132e Mon Sep 17 00:00:00 2001 From: TheGamerdk <5618080+TheGamerdk@users.noreply.github.com> Date: Tue, 28 Jun 2022 21:59:50 +0200 Subject: [PATCH 1/4] e (#14639) --- _maps/map_files/YogStation/YogStation.dmm | 276 ++++++++-------------- 1 file changed, 99 insertions(+), 177 deletions(-) diff --git a/_maps/map_files/YogStation/YogStation.dmm b/_maps/map_files/YogStation/YogStation.dmm index bd2a90c1f556..d9df52bd83e6 100644 --- a/_maps/map_files/YogStation/YogStation.dmm +++ b/_maps/map_files/YogStation/YogStation.dmm @@ -183,10 +183,6 @@ }, /turf/open/floor/plasteel, /area/ai_monitored/security/armory) -"abd" = ( -/obj/machinery/bounty_board, -/turf/closed/wall, -/area/science/lab) "abe" = ( /obj/machinery/airalarm{ pixel_y = 24 @@ -13731,9 +13727,6 @@ }, /turf/open/floor/plasteel, /area/hallway/primary/starboard) -"bgc" = ( -/turf/closed/wall/r_wall, -/area/science/lab) "bgh" = ( /obj/machinery/door/airlock/maintenance{ req_access_txt = "12" @@ -14039,34 +14032,6 @@ /obj/structure/disposalpipe/segment, /turf/open/floor/plasteel/white, /area/science/research) -"bhC" = ( -/obj/machinery/door/poddoor/shutters/preopen{ - id = "rnd"; - name = "research lab shutters" - }, -/obj/effect/spawner/structure/window/reinforced, -/obj/machinery/door/firedoor/border_only{ - dir = 1 - }, -/obj/machinery/door/firedoor/border_only, -/turf/open/floor/plating, -/area/science/lab) -"bhD" = ( -/obj/structure/table/reinforced, -/obj/machinery/door/window/southright{ - name = "Research and Development Desk"; - req_access_txt = "7" - }, -/obj/machinery/door/poddoor/shutters/preopen{ - id = "rnd"; - name = "research lab shutters" - }, -/obj/machinery/door/firedoor/border_only{ - dir = 1 - }, -/obj/machinery/door/firedoor/border_only, -/turf/open/floor/plating, -/area/science/lab) "bhE" = ( /obj/structure/table, /obj/item/stack/sheet/glass/fifty{ @@ -14338,19 +14303,6 @@ }, /turf/open/floor/plasteel/white, /area/science/research) -"biS" = ( -/obj/machinery/camera{ - c_tag = "Research Division Access" - }, -/obj/structure/sink{ - dir = 4; - pixel_x = 11 - }, -/obj/effect/turf_decal/stripes/line{ - dir = 5 - }, -/turf/open/floor/plasteel/white, -/area/science/research) "biT" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ dir = 4 @@ -14407,15 +14359,6 @@ }, /turf/open/floor/plasteel/white, /area/science/lab) -"biY" = ( -/obj/structure/disposalpipe/segment, -/obj/structure/cable{ - icon_state = "1-2" - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/turf/open/floor/plating, -/area/maintenance/starboard) "bja" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -15288,12 +15231,6 @@ "bnp" = ( /turf/open/floor/plasteel, /area/science/lab) -"bnr" = ( -/obj/structure/plasticflaps{ - opacity = 1 - }, -/turf/open/floor/plating, -/area/science/lab) "bnu" = ( /obj/machinery/door/firedoor/border_only{ dir = 8 @@ -15629,9 +15566,6 @@ }, /turf/open/floor/plasteel/white, /area/science/lab) -"boB" = ( -/turf/closed/wall, -/area/science/lab) "boC" = ( /obj/machinery/door/airlock/mining/glass{ name = "Quartermaster"; @@ -16188,11 +16122,6 @@ /obj/structure/chair/stool, /turf/open/floor/plating, /area/maintenance/fore) -"bro" = ( -/turf/open/floor/plasteel/white/side{ - dir = 10 - }, -/area/science/research) "brp" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ @@ -30595,6 +30524,15 @@ }, /turf/open/floor/plasteel/dark, /area/bridge) +"fJH" = ( +/obj/structure/disposalpipe/segment, +/obj/structure/cable{ + icon_state = "1-2" + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/turf/closed/indestructible/riveted, +/area/maintenance/starboard) "fJS" = ( /obj/machinery/button/door{ id = "bridge blast"; @@ -31763,14 +31701,6 @@ }, /turf/open/floor/plasteel/white, /area/medical/genetics/cloning) -"gsd" = ( -/obj/machinery/door/poddoor/shutters/preopen{ - id = "rnd2"; - name = "research lab shutters" - }, -/obj/effect/spawner/structure/window/reinforced, -/turf/open/floor/plating, -/area/science/lab) "gsx" = ( /obj/effect/landmark/start/cyborg, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, @@ -46282,21 +46212,6 @@ }, /turf/open/floor/plasteel/white, /area/medical/storage) -"npe" = ( -/obj/machinery/door/poddoor/shutters/preopen{ - id = "rnd2"; - name = "research lab shutters" - }, -/obj/machinery/door/firedoor/border_only{ - dir = 1 - }, -/obj/machinery/door/firedoor/border_only, -/obj/machinery/door/airlock/research/glass{ - name = "R&D Lab"; - req_access_txt = "7" - }, -/turf/open/floor/plasteel/white, -/area/science/lab) "npo" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/sign/poster/official/help_others{ @@ -47673,6 +47588,18 @@ }, /turf/open/floor/plasteel/white, /area/science/mixing/chamber) +"oao" = ( +/obj/item/folder/white, +/obj/structure/table, +/obj/item/disk/tech_disk, +/obj/item/disk/tech_disk, +/obj/item/disk/design_disk, +/obj/item/disk/design_disk, +/obj/item/paicard{ + pixel_x = 4 + }, +/turf/closed/indestructible/riveted, +/area/science/lab) "oaF" = ( /obj/machinery/door/firedoor/border_only{ dir = 4 @@ -49524,18 +49451,6 @@ /obj/item/stock_parts/subspace/analyzer, /turf/open/floor/plasteel/white, /area/storage/tech) -"oRC" = ( -/obj/item/folder/white, -/obj/structure/table, -/obj/item/disk/tech_disk, -/obj/item/disk/tech_disk, -/obj/item/disk/design_disk, -/obj/item/disk/design_disk, -/obj/item/paicard{ - pixel_x = 4 - }, -/turf/open/floor/plasteel/white, -/area/science/lab) "oRG" = ( /obj/structure/table, /obj/machinery/cell_charger, @@ -51198,6 +51113,9 @@ }, /turf/open/floor/plasteel/dark/telecomms, /area/tcommsat/server) +"pTz" = ( +/turf/closed/indestructible/riveted, +/area/science/research) "pTL" = ( /obj/structure/sign/departments/minsky/engineering/telecommmunications{ pixel_y = 32 @@ -54174,10 +54092,6 @@ /obj/machinery/door/firedoor/border_only, /turf/open/floor/plating, /area/maintenance/aft) -"ryf" = ( -/obj/structure/sign/departments/minsky/research/research, -/turf/closed/wall/r_wall, -/area/science/lab) "rym" = ( /obj/effect/turf_decal/siding/wood{ dir = 8 @@ -56788,29 +56702,6 @@ /obj/structure/disposalpipe/segment, /turf/open/floor/plasteel/white, /area/medical/sleeper) -"sGR" = ( -/obj/machinery/door/poddoor/shutters/preopen{ - id = "rnd2"; - name = "research lab shutters" - }, -/obj/machinery/door/firedoor/border_only{ - dir = 1 - }, -/obj/machinery/door/firedoor/border_only, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 1 - }, -/obj/structure/disposalpipe/segment, -/obj/structure/cable{ - icon_state = "1-2" - }, -/obj/machinery/door/airlock/research/glass{ - name = "R&D Lab"; - req_access_txt = "7" - }, -/turf/open/floor/plasteel/white, -/area/science/lab) "sGW" = ( /obj/machinery/atmospherics/pipe/simple/purple/visible{ dir = 5 @@ -57270,6 +57161,21 @@ }, /turf/open/floor/plasteel, /area/quartermaster/qm) +"sTv" = ( +/obj/structure/disposalpipe/segment{ + dir = 5 + }, +/obj/structure/cable{ + icon_state = "1-4" + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ + dir = 5 + }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ + dir = 5 + }, +/turf/closed/indestructible/riveted, +/area/maintenance/starboard) "sTw" = ( /obj/machinery/atmospherics/components/unary/vent_pump/on{ dir = 4; @@ -58813,6 +58719,19 @@ }, /turf/open/floor/plasteel/grimy, /area/security/detectives_office) +"tEo" = ( +/obj/machinery/camera{ + c_tag = "Research Division Access" + }, +/obj/structure/sink{ + dir = 4; + pixel_x = 11 + }, +/obj/effect/turf_decal/stripes/line{ + dir = 5 + }, +/turf/closed/indestructible/riveted, +/area/science/research) "tEp" = ( /obj/structure/cable{ icon_state = "1-2" @@ -64901,6 +64820,9 @@ /obj/structure/window/reinforced, /turf/open/floor/plasteel, /area/security/prison) +"wQS" = ( +/turf/closed/indestructible/riveted, +/area/space) "wRg" = ( /obj/machinery/flasher{ id = "AI"; @@ -115932,13 +115854,13 @@ aYV vLR bfZ bhA -biS +tEo aMK dcg bvx boz bnJ -bBD +pTz bBD aNr bBD @@ -116188,14 +116110,14 @@ aYV jKG mYV bga -bgc -bgc -bgc -bgc -bgc -boB -boB -boB +wQS +wQS +wQS +wQS +wQS +wQS +wQS +wQS btb bmU bvJ @@ -116445,15 +116367,15 @@ aYV aYV vLR bfX -bhC +wQS biU bks blI bnn boA -oRC -abd -bgp +oao +wQS +pTz bmU bvJ bCk @@ -116702,15 +116624,15 @@ aYV aYV vLR bfX -bhD +wQS biV biW blK bnp boA boQ -gsd -bro +wQS +pTz bmU bvJ bxj @@ -116959,15 +116881,15 @@ aYV bdv vLR bgb -bhC +wQS biU biW blJ bno bkt biW -npe -bgp +wQS +pTz bmU bvK bxi @@ -117215,15 +117137,15 @@ bbF aYV aYV vLR -ryf -bgc +wQS +wQS biX bhV bka bka aCl bpo -sGR +wQS brp bmW bvK @@ -117472,7 +117394,7 @@ aCR bcy bdx beG -bgc +wQS bhE biW bkv @@ -117480,7 +117402,7 @@ blL biW bnh biW -gsd +wQS bte bmX bvK @@ -117729,7 +117651,7 @@ aMZ nhP wmI beI -bgc +wQS bhF dEY bib @@ -117737,7 +117659,7 @@ bki bmJ bnl bpq -boB +wQS bta bmY bvK @@ -117986,15 +117908,15 @@ aZd aTk aPq beH -bgc -bgc -bgc -bgc -bgc -bgc -bgc +wQS +wQS +wQS +wQS +wQS +wQS +wQS giP -bgc +wQS wMP bmZ bvK @@ -118245,13 +118167,13 @@ bdz beJ xtQ bhH -biY -biY -biY -bjS -bnr +fJH +fJH +fJH +sTv +wQS bpr -bgc +wQS blx bna bvM @@ -118506,9 +118428,9 @@ hoc hoc hoc bjT -boB -bgc -bgc +wQS +wQS +wQS bsk bsF aCN From 5e16af4be54b47fcf2dcffafca18fb4888fd9cc6 Mon Sep 17 00:00:00 2001 From: TheRyeGuyWhoWillNowDie <70169560+TheRyeGuyWhoWillNowDie@users.noreply.github.com> Date: Mon, 1 Aug 2022 15:35:12 -0400 Subject: [PATCH 2/4] Squashed commit of the following: commit ad4e916c7d479332a9be785bafc8140da72f132e Author: TheGamerdk <5618080+TheGamerdk@users.noreply.github.com> Date: Tue Jun 28 21:59:50 2022 +0200 e (#14639) --- _maps/map_files/YogStation/YogStation.dmm | 268 ++++++++-------------- 1 file changed, 99 insertions(+), 169 deletions(-) diff --git a/_maps/map_files/YogStation/YogStation.dmm b/_maps/map_files/YogStation/YogStation.dmm index 1061612fed01..d9df52bd83e6 100644 --- a/_maps/map_files/YogStation/YogStation.dmm +++ b/_maps/map_files/YogStation/YogStation.dmm @@ -183,10 +183,6 @@ }, /turf/open/floor/plasteel, /area/ai_monitored/security/armory) -"abd" = ( -/obj/machinery/bounty_board, -/turf/closed/wall, -/area/science/lab) "abe" = ( /obj/machinery/airalarm{ pixel_y = 24 @@ -13731,9 +13727,6 @@ }, /turf/open/floor/plasteel, /area/hallway/primary/starboard) -"bgc" = ( -/turf/closed/wall/r_wall, -/area/science/lab) "bgh" = ( /obj/machinery/door/airlock/maintenance{ req_access_txt = "12" @@ -14039,34 +14032,6 @@ /obj/structure/disposalpipe/segment, /turf/open/floor/plasteel/white, /area/science/research) -"bhC" = ( -/obj/machinery/door/poddoor/shutters/preopen{ - id = "rnd"; - name = "research lab shutters" - }, -/obj/effect/spawner/structure/window/reinforced, -/obj/machinery/door/firedoor/border_only{ - dir = 1 - }, -/obj/machinery/door/firedoor/border_only, -/turf/open/floor/plating, -/area/science/lab) -"bhD" = ( -/obj/structure/table/reinforced, -/obj/machinery/door/window/southright{ - name = "Research and Development Desk"; - req_access_txt = "7" - }, -/obj/machinery/door/poddoor/shutters/preopen{ - id = "rnd"; - name = "research lab shutters" - }, -/obj/machinery/door/firedoor/border_only{ - dir = 1 - }, -/obj/machinery/door/firedoor/border_only, -/turf/open/floor/plating, -/area/science/lab) "bhE" = ( /obj/structure/table, /obj/item/stack/sheet/glass/fifty{ @@ -14338,19 +14303,6 @@ }, /turf/open/floor/plasteel/white, /area/science/research) -"biS" = ( -/obj/machinery/camera{ - c_tag = "Research Division Access" - }, -/obj/structure/sink{ - dir = 4; - pixel_x = 11 - }, -/obj/effect/turf_decal/stripes/line{ - dir = 5 - }, -/turf/open/floor/plasteel/white, -/area/science/research) "biT" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ dir = 4 @@ -14407,15 +14359,6 @@ }, /turf/open/floor/plasteel/white, /area/science/lab) -"biY" = ( -/obj/structure/disposalpipe/segment, -/obj/structure/cable{ - icon_state = "1-2" - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/turf/open/floor/plating, -/area/maintenance/starboard) "bja" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -15288,12 +15231,6 @@ "bnp" = ( /turf/open/floor/plasteel, /area/science/lab) -"bnr" = ( -/obj/structure/plasticflaps{ - opacity = 1 - }, -/turf/open/floor/plating, -/area/science/lab) "bnu" = ( /obj/machinery/door/firedoor/border_only{ dir = 8 @@ -15629,9 +15566,6 @@ }, /turf/open/floor/plasteel/white, /area/science/lab) -"boB" = ( -/turf/closed/wall, -/area/science/lab) "boC" = ( /obj/machinery/door/airlock/mining/glass{ name = "Quartermaster"; @@ -16188,11 +16122,6 @@ /obj/structure/chair/stool, /turf/open/floor/plating, /area/maintenance/fore) -"bro" = ( -/turf/open/floor/plasteel/white/side{ - dir = 10 - }, -/area/science/research) "brp" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ @@ -30595,6 +30524,15 @@ }, /turf/open/floor/plasteel/dark, /area/bridge) +"fJH" = ( +/obj/structure/disposalpipe/segment, +/obj/structure/cable{ + icon_state = "1-2" + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/turf/closed/indestructible/riveted, +/area/maintenance/starboard) "fJS" = ( /obj/machinery/button/door{ id = "bridge blast"; @@ -31763,14 +31701,6 @@ }, /turf/open/floor/plasteel/white, /area/medical/genetics/cloning) -"gsd" = ( -/obj/machinery/door/poddoor/shutters/preopen{ - id = "rnd2"; - name = "research lab shutters" - }, -/obj/effect/spawner/structure/window/reinforced, -/turf/open/floor/plating, -/area/science/lab) "gsx" = ( /obj/effect/landmark/start/cyborg, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, @@ -39992,25 +39922,6 @@ }, /turf/open/floor/plasteel, /area/hallway/primary/port) -"klU" = ( -/obj/machinery/door/poddoor/shutters/preopen{ - id = "rnd2"; - name = "research lab shutters" - }, -/obj/machinery/door/firedoor/border_only{ - dir = 1 - }, -/obj/machinery/door/firedoor/border_only, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 1 - }, -/obj/structure/disposalpipe/segment, -/obj/structure/cable{ - icon_state = "1-2" - }, -/turf/open/floor/plasteel/white, -/area/science/lab) "klZ" = ( /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ dir = 1 @@ -47677,6 +47588,18 @@ }, /turf/open/floor/plasteel/white, /area/science/mixing/chamber) +"oao" = ( +/obj/item/folder/white, +/obj/structure/table, +/obj/item/disk/tech_disk, +/obj/item/disk/tech_disk, +/obj/item/disk/design_disk, +/obj/item/disk/design_disk, +/obj/item/paicard{ + pixel_x = 4 + }, +/turf/closed/indestructible/riveted, +/area/science/lab) "oaF" = ( /obj/machinery/door/firedoor/border_only{ dir = 4 @@ -49528,18 +49451,6 @@ /obj/item/stock_parts/subspace/analyzer, /turf/open/floor/plasteel/white, /area/storage/tech) -"oRC" = ( -/obj/item/folder/white, -/obj/structure/table, -/obj/item/disk/tech_disk, -/obj/item/disk/tech_disk, -/obj/item/disk/design_disk, -/obj/item/disk/design_disk, -/obj/item/paicard{ - pixel_x = 4 - }, -/turf/open/floor/plasteel/white, -/area/science/lab) "oRG" = ( /obj/structure/table, /obj/machinery/cell_charger, @@ -51202,6 +51113,9 @@ }, /turf/open/floor/plasteel/dark/telecomms, /area/tcommsat/server) +"pTz" = ( +/turf/closed/indestructible/riveted, +/area/science/research) "pTL" = ( /obj/structure/sign/departments/minsky/engineering/telecommmunications{ pixel_y = 32 @@ -54178,10 +54092,6 @@ /obj/machinery/door/firedoor/border_only, /turf/open/floor/plating, /area/maintenance/aft) -"ryf" = ( -/obj/structure/sign/departments/minsky/research/research, -/turf/closed/wall/r_wall, -/area/science/lab) "rym" = ( /obj/effect/turf_decal/siding/wood{ dir = 8 @@ -57251,6 +57161,21 @@ }, /turf/open/floor/plasteel, /area/quartermaster/qm) +"sTv" = ( +/obj/structure/disposalpipe/segment{ + dir = 5 + }, +/obj/structure/cable{ + icon_state = "1-4" + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ + dir = 5 + }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ + dir = 5 + }, +/turf/closed/indestructible/riveted, +/area/maintenance/starboard) "sTw" = ( /obj/machinery/atmospherics/components/unary/vent_pump/on{ dir = 4; @@ -58794,6 +58719,19 @@ }, /turf/open/floor/plasteel/grimy, /area/security/detectives_office) +"tEo" = ( +/obj/machinery/camera{ + c_tag = "Research Division Access" + }, +/obj/structure/sink{ + dir = 4; + pixel_x = 11 + }, +/obj/effect/turf_decal/stripes/line{ + dir = 5 + }, +/turf/closed/indestructible/riveted, +/area/science/research) "tEp" = ( /obj/structure/cable{ icon_state = "1-2" @@ -61950,17 +61888,6 @@ }, /turf/open/floor/plasteel, /area/maintenance/disposal/incinerator) -"vku" = ( -/obj/machinery/door/poddoor/shutters/preopen{ - id = "rnd2"; - name = "research lab shutters" - }, -/obj/machinery/door/firedoor/border_only{ - dir = 1 - }, -/obj/machinery/door/firedoor/border_only, -/turf/open/floor/plasteel/white, -/area/science/lab) "vkJ" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -64893,6 +64820,9 @@ /obj/structure/window/reinforced, /turf/open/floor/plasteel, /area/security/prison) +"wQS" = ( +/turf/closed/indestructible/riveted, +/area/space) "wRg" = ( /obj/machinery/flasher{ id = "AI"; @@ -115924,13 +115854,13 @@ aYV vLR bfZ bhA -biS +tEo aMK dcg bvx boz bnJ -bBD +pTz bBD aNr bBD @@ -116180,14 +116110,14 @@ aYV jKG mYV bga -bgc -bgc -bgc -bgc -bgc -boB -boB -boB +wQS +wQS +wQS +wQS +wQS +wQS +wQS +wQS btb bmU bvJ @@ -116437,15 +116367,15 @@ aYV aYV vLR bfX -bhC +wQS biU bks blI bnn boA -oRC -abd -bgp +oao +wQS +pTz bmU bvJ bCk @@ -116694,15 +116624,15 @@ aYV aYV vLR bfX -bhD +wQS biV biW blK bnp boA boQ -gsd -bro +wQS +pTz bmU bvJ bxj @@ -116951,15 +116881,15 @@ aYV bdv vLR bgb -bhC +wQS biU biW blJ bno bkt biW -vku -bgp +wQS +pTz bmU bvK bxi @@ -117207,15 +117137,15 @@ bbF aYV aYV vLR -ryf -bgc +wQS +wQS biX bhV bka bka aCl bpo -klU +wQS brp bmW bvK @@ -117464,7 +117394,7 @@ aCR bcy bdx beG -bgc +wQS bhE biW bkv @@ -117472,7 +117402,7 @@ blL biW bnh biW -gsd +wQS bte bmX bvK @@ -117721,7 +117651,7 @@ aMZ nhP wmI beI -bgc +wQS bhF dEY bib @@ -117729,7 +117659,7 @@ bki bmJ bnl bpq -boB +wQS bta bmY bvK @@ -117978,15 +117908,15 @@ aZd aTk aPq beH -bgc -bgc -bgc -bgc -bgc -bgc -bgc +wQS +wQS +wQS +wQS +wQS +wQS +wQS giP -bgc +wQS wMP bmZ bvK @@ -118237,13 +118167,13 @@ bdz beJ xtQ bhH -biY -biY -biY -bjS -bnr +fJH +fJH +fJH +sTv +wQS bpr -bgc +wQS blx bna bvM @@ -118498,9 +118428,9 @@ hoc hoc hoc bjT -boB -bgc -bgc +wQS +wQS +wQS bsk bsF aCN From 7fb014c081799c0c1d3ff85bf9d562f745f292f8 Mon Sep 17 00:00:00 2001 From: TheRyeGuyWhoWillNowDie <70169560+TheRyeGuyWhoWillNowDie@users.noreply.github.com> Date: Mon, 1 Aug 2022 15:50:04 -0400 Subject: [PATCH 3/4] Update YogStation.dmm --- _maps/map_files/YogStation/YogStation.dmm | 268 ++++++++++++++-------- 1 file changed, 169 insertions(+), 99 deletions(-) diff --git a/_maps/map_files/YogStation/YogStation.dmm b/_maps/map_files/YogStation/YogStation.dmm index 93996b7a7192..74d6f52576d3 100644 --- a/_maps/map_files/YogStation/YogStation.dmm +++ b/_maps/map_files/YogStation/YogStation.dmm @@ -183,6 +183,10 @@ }, /turf/open/floor/plasteel, /area/ai_monitored/security/armory) +"abd" = ( +/obj/machinery/bounty_board, +/turf/closed/wall, +/area/science/lab) "abe" = ( /obj/machinery/airalarm{ pixel_y = 24 @@ -13568,6 +13572,9 @@ }, /turf/open/floor/plasteel, /area/hallway/primary/starboard) +"bgc" = ( +/turf/closed/wall/r_wall, +/area/science/lab) "bgh" = ( /obj/machinery/door/airlock/maintenance{ req_access_txt = "12" @@ -13890,6 +13897,34 @@ /obj/structure/disposalpipe/segment, /turf/open/floor/plasteel/white, /area/science/research) +"bhC" = ( +/obj/machinery/door/poddoor/shutters/preopen{ + id = "rnd"; + name = "research lab shutters" + }, +/obj/effect/spawner/structure/window/reinforced, +/obj/machinery/door/firedoor/border_only{ + dir = 1 + }, +/obj/machinery/door/firedoor/border_only, +/turf/open/floor/plating, +/area/science/lab) +"bhD" = ( +/obj/structure/table/reinforced, +/obj/machinery/door/window/southright{ + name = "Research and Development Desk"; + req_access_txt = "7" + }, +/obj/machinery/door/poddoor/shutters/preopen{ + id = "rnd"; + name = "research lab shutters" + }, +/obj/machinery/door/firedoor/border_only{ + dir = 1 + }, +/obj/machinery/door/firedoor/border_only, +/turf/open/floor/plating, +/area/science/lab) "bhE" = ( /obj/structure/table, /obj/item/stack/sheet/glass/fifty{ @@ -14161,6 +14196,19 @@ }, /turf/open/floor/plasteel/white, /area/science/research) +"biS" = ( +/obj/machinery/camera{ + c_tag = "Research Division Access" + }, +/obj/structure/sink{ + dir = 4; + pixel_x = 11 + }, +/obj/effect/turf_decal/stripes/line{ + dir = 5 + }, +/turf/open/floor/plasteel/white, +/area/science/research) "biT" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ dir = 4 @@ -14217,6 +14265,15 @@ }, /turf/open/floor/plasteel/white, /area/science/lab) +"biY" = ( +/obj/structure/disposalpipe/segment, +/obj/structure/cable{ + icon_state = "1-2" + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/turf/open/floor/plating, +/area/maintenance/starboard) "bja" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -15082,6 +15139,12 @@ "bnp" = ( /turf/open/floor/plasteel, /area/science/lab) +"bnr" = ( +/obj/structure/plasticflaps{ + opacity = 1 + }, +/turf/open/floor/plating, +/area/science/lab) "bnu" = ( /obj/machinery/door/firedoor/border_only{ dir = 8 @@ -15417,6 +15480,9 @@ }, /turf/open/floor/plasteel/white, /area/science/lab) +"boB" = ( +/turf/closed/wall, +/area/science/lab) "boC" = ( /obj/machinery/door/airlock/mining/glass{ name = "Quartermaster"; @@ -15973,6 +16039,11 @@ /obj/structure/chair/stool, /turf/open/floor/plating, /area/maintenance/fore) +"bro" = ( +/turf/open/floor/plasteel/white/side{ + dir = 10 + }, +/area/science/research) "brp" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ @@ -30274,15 +30345,6 @@ }, /turf/open/floor/plasteel/dark, /area/bridge) -"fJH" = ( -/obj/structure/disposalpipe/segment, -/obj/structure/cable{ - icon_state = "1-2" - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/turf/closed/indestructible/riveted, -/area/maintenance/starboard) "fJS" = ( /obj/machinery/button/door{ id = "bridge blast"; @@ -31442,6 +31504,14 @@ }, /turf/open/floor/plasteel/white, /area/medical/genetics/cloning) +"gsd" = ( +/obj/machinery/door/poddoor/shutters/preopen{ + id = "rnd2"; + name = "research lab shutters" + }, +/obj/effect/spawner/structure/window/reinforced, +/turf/open/floor/plating, +/area/science/lab) "gsx" = ( /obj/effect/landmark/start/cyborg, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, @@ -39674,6 +39744,25 @@ }, /turf/open/floor/plasteel, /area/hallway/primary/port) +"klU" = ( +/obj/machinery/door/poddoor/shutters/preopen{ + id = "rnd2"; + name = "research lab shutters" + }, +/obj/machinery/door/firedoor/border_only{ + dir = 1 + }, +/obj/machinery/door/firedoor/border_only, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ + dir = 1 + }, +/obj/structure/disposalpipe/segment, +/obj/structure/cable{ + icon_state = "1-2" + }, +/turf/open/floor/plasteel/white, +/area/science/lab) "klZ" = ( /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ dir = 1 @@ -47670,18 +47759,6 @@ }, /turf/open/floor/plasteel/white, /area/science/mixing/chamber) -"oao" = ( -/obj/item/folder/white, -/obj/structure/table, -/obj/item/disk/tech_disk, -/obj/item/disk/tech_disk, -/obj/item/disk/design_disk, -/obj/item/disk/design_disk, -/obj/item/paicard{ - pixel_x = 4 - }, -/turf/closed/indestructible/riveted, -/area/science/lab) "oaF" = ( /obj/machinery/door/firedoor/border_only{ dir = 4 @@ -49545,6 +49622,18 @@ /obj/item/stock_parts/subspace/analyzer, /turf/open/floor/plasteel/white, /area/storage/tech) +"oRC" = ( +/obj/item/folder/white, +/obj/structure/table, +/obj/item/disk/tech_disk, +/obj/item/disk/tech_disk, +/obj/item/disk/design_disk, +/obj/item/disk/design_disk, +/obj/item/paicard{ + pixel_x = 4 + }, +/turf/open/floor/plasteel/white, +/area/science/lab) "oRG" = ( /obj/structure/table, /obj/machinery/cell_charger, @@ -51224,9 +51313,6 @@ }, /turf/open/floor/plasteel/dark/telecomms, /area/tcommsat/server) -"pTz" = ( -/turf/closed/indestructible/riveted, -/area/science/research) "pTL" = ( /obj/structure/sign/departments/minsky/engineering/telecommmunications{ pixel_y = 32 @@ -54248,6 +54334,10 @@ /obj/machinery/door/firedoor/border_only, /turf/open/floor/plating, /area/maintenance/aft) +"ryf" = ( +/obj/structure/sign/departments/minsky/research/research, +/turf/closed/wall/r_wall, +/area/science/lab) "rym" = ( /obj/effect/turf_decal/siding/wood{ dir = 8 @@ -57339,21 +57429,6 @@ }, /turf/open/floor/plasteel, /area/quartermaster/qm) -"sTv" = ( -/obj/structure/disposalpipe/segment{ - dir = 5 - }, -/obj/structure/cable{ - icon_state = "1-4" - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 5 - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 5 - }, -/turf/closed/indestructible/riveted, -/area/maintenance/starboard) "sTw" = ( /obj/machinery/atmospherics/components/unary/vent_pump/on{ dir = 4; @@ -58921,19 +58996,6 @@ }, /turf/open/floor/plasteel/grimy, /area/security/detectives_office) -"tEo" = ( -/obj/machinery/camera{ - c_tag = "Research Division Access" - }, -/obj/structure/sink{ - dir = 4; - pixel_x = 11 - }, -/obj/effect/turf_decal/stripes/line{ - dir = 5 - }, -/turf/closed/indestructible/riveted, -/area/science/research) "tEp" = ( /obj/structure/cable{ icon_state = "1-2" @@ -62113,6 +62175,17 @@ }, /turf/open/floor/plasteel, /area/maintenance/disposal/incinerator) +"vku" = ( +/obj/machinery/door/poddoor/shutters/preopen{ + id = "rnd2"; + name = "research lab shutters" + }, +/obj/machinery/door/firedoor/border_only{ + dir = 1 + }, +/obj/machinery/door/firedoor/border_only, +/turf/open/floor/plasteel/white, +/area/science/lab) "vkJ" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -65015,9 +65088,6 @@ /obj/structure/window/reinforced, /turf/open/floor/plasteel, /area/security/prison) -"wQS" = ( -/turf/closed/indestructible/riveted, -/area/space) "wRg" = ( /obj/machinery/flasher{ id = "AI"; @@ -116016,13 +116086,13 @@ aYV vLR bfZ bhA -tEo +biS aMK dcg bvx boz bnJ -pTz +bBD bBD aNr bBD @@ -116272,14 +116342,14 @@ aYV jKG mYV bga -wQS -wQS -wQS -wQS -wQS -wQS -wQS -wQS +bgc +bgc +bgc +bgc +bgc +boB +boB +boB btb bmU bvJ @@ -116529,15 +116599,15 @@ aYV aYV vLR bfX -wQS +bhC biU bks blI bnn boA -oao -wQS -pTz +oRC +abd +bgp bmU bvJ bCk @@ -116786,15 +116856,15 @@ aYV aYV vLR bfX -wQS +bhD biV biW blK bnp boA boQ -wQS -pTz +gsd +bro bmU bvJ bxj @@ -117043,15 +117113,15 @@ aYV bdv vLR bgb -wQS +bhC biU biW blJ bno bkt biW -wQS -pTz +vku +bgp bmU bvK bxi @@ -117299,15 +117369,15 @@ bbF aYV aYV vLR -wQS -wQS +ryf +bgc biX bhV bka bka aCl bpo -wQS +klU brp bmW bvK @@ -117556,7 +117626,7 @@ aCR bcy bdx beG -wQS +bgc bhE biW bkv @@ -117564,7 +117634,7 @@ blL biW bnh biW -wQS +gsd bte bmX bvK @@ -117813,7 +117883,7 @@ aMZ nhP wmI beI -wQS +bgc bhF dEY bib @@ -117821,7 +117891,7 @@ bki bmJ bnl bpq -wQS +boB bta bmY bvK @@ -118070,15 +118140,15 @@ aZd aTk aPq beH -wQS -wQS -wQS -wQS -wQS -wQS -wQS +bgc +bgc +bgc +bgc +bgc +bgc +bgc giP -wQS +bgc wMP bmZ bvK @@ -118329,13 +118399,13 @@ bdz beJ xtQ bhH -fJH -fJH -fJH -sTv -wQS +biY +biY +biY +bjS +bnr bpr -wQS +bgc blx bna bvM @@ -118590,9 +118660,9 @@ hoc hoc hoc bjT -wQS -wQS -wQS +boB +bgc +bgc bsk bsF aCN From c24a56276ccc54a2f3cf6411d90fba79258a312a Mon Sep 17 00:00:00 2001 From: TheRyeGuyWhoWillNowDie <70169560+TheRyeGuyWhoWillNowDie@users.noreply.github.com> Date: Sat, 13 Aug 2022 18:08:55 -0400 Subject: [PATCH 4/4] Update toys.dm --- code/modules/vending/toys.dm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/code/modules/vending/toys.dm b/code/modules/vending/toys.dm index 0c6b762a773c..a9c63a5fa513 100644 --- a/code/modules/vending/toys.dm +++ b/code/modules/vending/toys.dm @@ -2,8 +2,8 @@ name = "\improper Donksoft Toy Vendor" desc = "Ages 8 and up approved vendor that dispenses toys." icon_state = "syndi" - product_slogans = "Get your cool toys today!;Trigger a valid hunter today!;Quality toy weapons for cheap prices!;Give them to HoPs for all access!;Give them to HoS to get permabrigged!" - product_ads = "Feel robust with your toys!;Express your inner child today!;Toy weapons don't kill people, but valid hunters do!;Who needs responsibilities when you have toy weapons?;Make your next murder FUN!" + product_slogans = "Get your cool toys today!;Trigger a security officer today!;Quality toy weapons for cheap prices!;Give them to HoPs for all access!;Give them to HoS to get permabrigged!" + product_ads = "Feel robust with your toys!;Express your inner child today!;Toy weapons don't kill people, but security does!;Who needs responsibilities when you have toy weapons?;Make your next murder FUN!" vend_reply = "Come back for more!" circuit = /obj/item/circuitboard/machine/vending/donksofttoyvendor products = list(