From 1fd7362fdef32ae3e2b9bca7213b6159ced90cc1 Mon Sep 17 00:00:00 2001 From: BurgerLUA <8602857+BurgerLUA@users.noreply.github.com> Date: Sat, 29 Jun 2024 05:08:16 -0700 Subject: [PATCH 1/2] Fixes incorrect Moonstation Dorms directions. (#1688) ## About The Pull Request Fixes incorrect Moonstation Dorms directions. ## Why It's Good For The Game Fixes incorrect Moonstation Dorms directions. ## Proof Of Testing Fixes incorrect Moonstation Dorms directions. ## Changelog :cl: BurgerBB fix: Fixes incorrect Moonstation Dorms directions. /:cl: --------- Co-authored-by: projectkepler-RU <99981766+projectkepler-ru@users.noreply.github.com> --- _maps/map_files/moonstation/moonstation.dmm | 910 ++++++++++---------- 1 file changed, 456 insertions(+), 454 deletions(-) diff --git a/_maps/map_files/moonstation/moonstation.dmm b/_maps/map_files/moonstation/moonstation.dmm index 0ee789af09d71..6ec8fd33155d1 100644 --- a/_maps/map_files/moonstation/moonstation.dmm +++ b/_maps/map_files/moonstation/moonstation.dmm @@ -10130,13 +10130,14 @@ pixel_x = -32; pixel_y = 40 }, -/obj/structure/sign/directions/dorms/directional/north{ - pixel_x = -32 - }, /obj/structure/sign/directions/upload/directional/north{ pixel_x = -32; pixel_y = 24 }, +/obj/structure/sign/directions/dorms/directional/east{ + pixel_x = -32; + pixel_y = 32 + }, /turf/open/floor/iron/checker, /area/station/hallway/secondary/recreation) "cVh" = ( @@ -20956,6 +20957,9 @@ /obj/item/storage/toolbox/mechanical{ pixel_y = 12 }, +/obj/machinery/camera/autoname/mine/directional/east{ + dir = 6 + }, /turf/open/floor/plastic, /area/station/commons/public_xenoarch) "fPD" = ( @@ -25740,9 +25744,6 @@ /obj/item/kirbyplants/random/dead/research_director, /turf/open/floor/wood, /area/station/command/heads_quarters/rd) -"hlo" = ( -/turf/open/genturf, -/area/moonstation/underground) "hlx" = ( /obj/structure/table/wood, /turf/open/floor/iron/checker, @@ -26630,12 +26631,13 @@ /obj/structure/sign/directions/command/directional/west{ pixel_y = 40 }, -/obj/structure/sign/directions/dorms/directional/west{ - pixel_y = 32 - }, /obj/structure/sign/directions/upload/directional/west{ pixel_y = 24 }, +/obj/structure/sign/directions/dorms/directional/south{ + pixel_y = 32; + pixel_x = -32 + }, /turf/open/floor/iron/dark/corner, /area/station/hallway/primary/central/fore) "hyh" = ( @@ -26941,9 +26943,9 @@ pixel_x = -32; pixel_y = 24 }, -/obj/structure/sign/directions/dorms/directional/south{ - pixel_y = 32; - pixel_x = -32 +/obj/structure/sign/directions/dorms/directional/east{ + pixel_x = -32; + pixel_y = 32 }, /turf/open/floor/wood/tile, /area/station/hallway/primary/central/aft) @@ -36064,14 +36066,15 @@ pixel_x = -32; pixel_y = 24 }, -/obj/structure/sign/directions/dorms/directional/west{ - pixel_y = 32 - }, /obj/structure/sign/directions/command/directional/east{ pixel_x = -32; pixel_y = 40 }, /obj/machinery/firealarm/directional/north, +/obj/structure/sign/directions/dorms/directional/east{ + pixel_x = -32; + pixel_y = 32 + }, /turf/open/floor/wood/tile, /area/station/hallway/primary/central/aft) "kiN" = ( @@ -39200,9 +39203,6 @@ pixel_x = -32; pixel_y = 40 }, -/obj/structure/sign/directions/dorms/directional/north{ - pixel_x = -32 - }, /obj/structure/sign/directions/upload/directional/north{ pixel_x = -32; pixel_y = 24 @@ -39211,6 +39211,10 @@ /obj/machinery/camera/autoname/directional/west{ dir = 10 }, +/obj/structure/sign/directions/dorms/directional/south{ + pixel_y = 32; + pixel_x = -32 + }, /turf/open/floor/wood/tile, /area/station/hallway/primary/central/aft) "lai" = ( @@ -59081,13 +59085,14 @@ pixel_x = -32; pixel_y = 24 }, -/obj/structure/sign/directions/dorms/directional/west{ - pixel_y = 32 - }, /obj/structure/sign/directions/command/directional/north{ pixel_x = -32; pixel_y = 40 }, +/obj/structure/sign/directions/dorms/directional/east{ + pixel_x = -32; + pixel_y = 32 + }, /turf/open/floor/iron/dark/corner{ dir = 1 }, @@ -63720,12 +63725,12 @@ /obj/structure/sign/directions/command/directional/west{ pixel_y = 40 }, -/obj/structure/sign/directions/dorms/directional/west{ - pixel_y = 32 - }, /obj/structure/sign/directions/upload/directional/west{ pixel_y = 24 }, +/obj/structure/sign/directions/dorms/directional/north{ + pixel_x = -32 + }, /turf/open/floor/wood/tile, /area/station/hallway/secondary/exit) "rQR" = ( @@ -69778,13 +69783,14 @@ pixel_x = -32; pixel_y = 40 }, -/obj/structure/sign/directions/dorms/directional/north{ - pixel_x = -32 - }, /obj/structure/sign/directions/upload/directional/north{ pixel_x = -32; pixel_y = 24 }, +/obj/structure/sign/directions/dorms/directional/east{ + pixel_x = -32; + pixel_y = 32 + }, /turf/open/floor/iron/dark, /area/station/hallway/secondary/exit) "tCo" = ( @@ -74247,9 +74253,6 @@ pixel_x = -32; pixel_y = 40 }, -/obj/structure/sign/directions/dorms/directional/north{ - pixel_x = -32 - }, /obj/structure/sign/directions/upload/directional/east{ pixel_x = -32; pixel_y = 24 @@ -74257,6 +74260,10 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, +/obj/structure/sign/directions/dorms/directional/east{ + pixel_x = -32; + pixel_y = 32 + }, /turf/open/floor/iron/checker, /area/station/hallway/primary/port) "uOJ" = ( @@ -74823,9 +74830,6 @@ /obj/effect/turf_decal/tile/neutral/half/contrasted{ dir = 1 }, -/obj/structure/sign/directions/dorms/directional/west{ - pixel_y = 32 - }, /obj/structure/sign/directions/command/directional/east{ pixel_x = -32; pixel_y = 40 @@ -74834,6 +74838,10 @@ pixel_x = -32; pixel_y = 24 }, +/obj/structure/sign/directions/dorms/directional/east{ + pixel_x = -32; + pixel_y = 32 + }, /turf/open/floor/iron/dark/corner{ dir = 1 }, @@ -77072,13 +77080,6 @@ /obj/structure/disposalpipe/segment, /turf/open/floor/plating, /area/station/maintenance/port/aft) -"vEf" = ( -/obj/machinery/camera/autoname/mine/directional/west, -/obj/effect/turf_decal/tile/purple{ - dir = 8 - }, -/turf/open/floor/plastic, -/area/station/commons/public_xenoarch) "vEm" = ( /obj/effect/turf_decal/tile/dark_red/anticorner/contrasted{ dir = 1 @@ -85618,6 +85619,7 @@ dir = 8 }, /obj/item/radio/intercom/directional/west, +/obj/machinery/camera/autoname/mine/directional/west, /turf/open/floor/plastic, /area/station/commons/public_xenoarch) "yar" = ( @@ -205130,7 +205132,7 @@ soE soE soE soE -hlo +jnN jnN jnN jnN @@ -206610,7 +206612,7 @@ mha iUK gCK lKR -vEf +oFD oFD tog xPM @@ -279613,8 +279615,8 @@ stM stM stM stM -kUC -kUC +stM +stM stM stM stM @@ -279845,11 +279847,6 @@ vmO vmO vmO vmO -kUC -kUC -kUC -kUC -kUC stM stM stM @@ -279869,10 +279866,15 @@ stM stM stM stM -kUC -kUC -kUC -kUC +stM +stM +stM +stM +stM +stM +stM +stM +stM stM stM stM @@ -280101,14 +280103,6 @@ vmO vmO vmO vmO -kUC -kUC -kUC -kUC -kUC -kUC -kUC -kUC stM stM stM @@ -280125,12 +280119,20 @@ stM stM stM stM -kUC -kUC -kUC -kUC -kUC -kUC +stM +stM +stM +stM +stM +stM +stM +stM +stM +stM +stM +stM +stM +stM stM stM stM @@ -280357,17 +280359,6 @@ vmO vmO vmO vmO -kUC -kUC -kUC -kUC -kUC -kUC -kUC -kUC -kUC -kUC -kUC stM stM stM @@ -280380,15 +280371,26 @@ stM stM stM stM -kUC -kUC -kUC -kUC -kUC -kUC -kUC -kUC -kUC +stM +stM +stM +stM +stM +stM +stM +stM +stM +stM +stM +stM +stM +stM +stM +stM +stM +stM +stM +stM stM stM stM @@ -280613,19 +280615,6 @@ vmO vmO vmO vmO -kUC -kUC -kUC -kUC -kUC -kUC -kUC -kUC -kUC -kUC -kUC -kUC -kUC stM stM stM @@ -280635,19 +280624,32 @@ stM stM stM stM -kUC -kUC -kUC -kUC -kUC -kUC -kUC -kUC -kUC -kUC -kUC -kUC -kUC +stM +stM +stM +stM +stM +stM +stM +stM +stM +stM +stM +stM +stM +stM +stM +stM +stM +stM +stM +stM +stM +stM +stM +stM +stM +stM stM stM stM @@ -280869,20 +280871,6 @@ vmO vmO vmO vmO -kUC -kUC -kUC -kUC -kUC -kUC -kUC -kUC -kUC -kUC -kUC -kUC -kUC -kUC stM stM stM @@ -280891,20 +280879,34 @@ stM stM stM stM -kUC -kUC -kUC -kUC -kUC -kUC -kUC -kUC -kUC -kUC -kUC -kUC -kUC -kUC +stM +stM +stM +stM +stM +stM +stM +stM +stM +stM +stM +stM +stM +stM +stM +stM +stM +stM +stM +stM +stM +stM +stM +stM +stM +stM +stM +stM stM stM stM @@ -281123,45 +281125,45 @@ vmO vmO vmO vmO -kUC -kUC -kUC -kUC -kUC -kUC -kUC -kUC -kUC -kUC -kUC -kUC -kUC -kUC -kUC -kUC -kUC -kUC stM stM stM stM -kUC -kUC -kUC -kUC -kUC -kUC -kUC -kUC -kUC -kUC -kUC -kUC -kUC -kUC -kUC -kUC -kUC +stM +stM +stM +stM +stM +stM +stM +stM +stM +stM +stM +stM +stM +stM +stM +stM +stM +stM +stM +stM +stM +stM +stM +stM +stM +stM +stM +stM +stM +stM +stM +stM +stM +stM +stM kUC stM stM @@ -281382,42 +281384,42 @@ kUC kUC kUC kUC +stM +stM +stM +stM +stM +stM +stM +stM +stM +stM +stM +stM +stM +stM +stM +stM +stM +stM +stM kUC -kUC -kUC -kUC -kUC -kUC -kUC -kUC -kUC -kUC -kUC -kUC -kUC -kUC -kUC -kUC -kUC -kUC -kUC -kUC -kUC -kUC -kUC -kUC -kUC -kUC -kUC -kUC -kUC -kUC -kUC -kUC -kUC -kUC -kUC -kUC +stM +stM +stM +stM +stM +stM +stM +stM +stM +stM +stM +stM +stM +stM +stM +stM kUC kUC kUC @@ -281640,6 +281642,202 @@ kUC kUC kUC kUC +stM +stM +stM +stM +stM +stM +stM +stM +stM +stM +stM +stM +stM +stM +stM +stM +stM +kUC +kUC +kUC +stM +stM +stM +stM +stM +stM +stM +stM +stM +stM +stM +stM +kUC +kUC +kUC +kUC +kUC +kUC +kUC +stM +stM +stM +stM +stM +stM +stM +stM +stM +stM +stM +stM +stM +stM +stM +stM +stM +stM +kUC +kUC +kUC +kUC +stM +stM +stM +stM +kUC +kUC +kUC +kUC +kUC +kUC +kUC +kUC +kUC +kUC +kUC +kUC +kUC +kUC +kUC +kUC +kUC +kUC +kUC +kUC +kUC +kUC +kUC +kUC +kUC +kUC +kUC +kUC +kUC +kUC +kUC +kUC +kUC +kUC +kUC +kUC +kUC +kUC +kUC +kUC +kUC +kUC +kUC +kUC +kUC +kUC +kUC +kUC +kUC +kUC +kUC +"} +(251,1,3) = {" +hsI +hsI +hsI +hsI +hsI +hsI +hsI +hsI +hsI +hsI +hsI +hsI +hsI +hsI +hsI +hsI +hsI +hsI +hsI +hsI +hsI +hsI +hsI +hsI +hsI +hsI +hsI +hsI +hsI +hsI +kUC +kUC +kUC +kUC +kUC +kUC +kUC +stM +kUC +kUC +kUC +kUC +kUC +kUC +kUC +kUC +kUC +kUC +kUC +kUC +kUC +kUC +kUC +vmO +vmO +kUC +kUC +kUC +kUC +kUC +kUC +kUC +kUC +kUC +kUC +kUC +kUC +kUC +kUC +kUC +kUC +kUC +kUC +kUC +kUC +kUC +kUC +kUC kUC kUC kUC @@ -281669,6 +281867,28 @@ kUC kUC kUC kUC +vmO +vmO +vmO +vmO +vmO +vmO +vmO +kUC +kUC +kUC +kUC +kUC +kUC +kUC +kUC +kUC +kUC +kUC +kUC +kUC +kUC +kUC kUC kUC kUC @@ -281684,6 +281904,8 @@ stM stM stM stM +kUC +kUC stM stM stM @@ -281693,10 +281915,9 @@ stM stM stM stM -stM -stM -stM -stM +kUC +kUC +kUC kUC kUC kUC @@ -281705,227 +281926,8 @@ stM stM stM stM -kUC -kUC -kUC -kUC -kUC -kUC -kUC -kUC -kUC -kUC -kUC -kUC -kUC -kUC -kUC -kUC -kUC -kUC -kUC -kUC -kUC -kUC -kUC -kUC -kUC -kUC -kUC -kUC -kUC -kUC -kUC -kUC -kUC -kUC -kUC -kUC -kUC -kUC -kUC -kUC -kUC -kUC -kUC -kUC -kUC -kUC -kUC -kUC -kUC -kUC -kUC -"} -(251,1,3) = {" -hsI -hsI -hsI -hsI -hsI -hsI -hsI -hsI -hsI -hsI -hsI -hsI -hsI -hsI -hsI -hsI -hsI -hsI -hsI -hsI -hsI -hsI -hsI -hsI -hsI -hsI -hsI -hsI -hsI -hsI -kUC -kUC -kUC -kUC -kUC -kUC -kUC stM -kUC -kUC -kUC -kUC -kUC -kUC -kUC -kUC -kUC -kUC -kUC -kUC -kUC -kUC -kUC -vmO -vmO -kUC -kUC -kUC -kUC -kUC -kUC -kUC -kUC -kUC -kUC -kUC -kUC -kUC -kUC -kUC -kUC -kUC -kUC -kUC -kUC -kUC -kUC -kUC -kUC -kUC -kUC -kUC -kUC -kUC -kUC -kUC -kUC -kUC -kUC -kUC -kUC -kUC -kUC -kUC -kUC -kUC -kUC -kUC -kUC -kUC -kUC -kUC -kUC -kUC -kUC -kUC -kUC -vmO -vmO -vmO -vmO -vmO -vmO -vmO -kUC -kUC -kUC -kUC -kUC -kUC -kUC -kUC -kUC -kUC -kUC -kUC -kUC -kUC -kUC -kUC -kUC -kUC -kUC -kUC -kUC -kUC -kUC -kUC -kUC -kUC -kUC -kUC -kUC -kUC -kUC -kUC -kUC -kUC -kUC -kUC -kUC -kUC -kUC -kUC -kUC -kUC -kUC -kUC -kUC -kUC -kUC -kUC -kUC -kUC -kUC -kUC -kUC -kUC +stM kUC kUC kUC @@ -282153,11 +282155,22 @@ kUC kUC kUC kUC +stM +stM +stM +stM +stM kUC kUC kUC kUC kUC +stM +stM +stM +stM +stM +stM kUC kUC kUC @@ -282168,20 +282181,9 @@ kUC kUC kUC kUC -kUC -kUC -kUC -kUC -kUC -kUC -kUC -kUC -kUC -kUC -kUC -kUC -kUC -kUC +stM +stM +stM kUC kUC kUC @@ -282411,6 +282413,8 @@ kUC kUC kUC kUC +stM +stM kUC kUC kUC @@ -282420,11 +282424,9 @@ kUC kUC kUC kUC -kUC -kUC -kUC -kUC -kUC +stM +stM +stM kUC kUC kUC From cfcb9f40552cf56d8c54223175c88f9a230ebd53 Mon Sep 17 00:00:00 2001 From: Bubberbot <151680451+Bubberbot@users.noreply.github.com> Date: Sat, 29 Jun 2024 14:08:43 +0200 Subject: [PATCH 2/2] Automatic changelog for PR #1688 [ci skip] --- html/changelogs/AutoChangeLog-pr-1688.yml | 4 ++++ 1 file changed, 4 insertions(+) create mode 100644 html/changelogs/AutoChangeLog-pr-1688.yml diff --git a/html/changelogs/AutoChangeLog-pr-1688.yml b/html/changelogs/AutoChangeLog-pr-1688.yml new file mode 100644 index 0000000000000..7a0511ec7f8f4 --- /dev/null +++ b/html/changelogs/AutoChangeLog-pr-1688.yml @@ -0,0 +1,4 @@ +author: "BurgerBB" +delete-after: True +changes: + - bugfix: "Fixes incorrect Moonstation Dorms directions." \ No newline at end of file