god

Monkestation · Sep 14, 2023 · 0596c8b · 0596c8b
1 parent d41b3a2
commit 0596c8b
Show file tree

Hide file tree

Showing 5 changed files with 206 additions and 65 deletions.
diff --git a/_maps/map_files/Mining/Oshan.dmm b/_maps/map_files/Mining/Oshan.dmm
@@ -117,6 +117,7 @@
 /obj/machinery/atmospherics/components/tank/air{
 	dir = 1
 	},
+/obj/structure/cable,
 /turf/open/floor/plating,
 /area/station/security/prison/visit)
 "hC" = (
@@ -263,6 +264,7 @@
 /obj/item/clothing/glasses/meson,
 /obj/effect/decal/cleanable/dirt,
 /obj/item/tank/internals/oxygen,
+/obj/item/shovel,
 /turf/open/floor/iron,
 /area/station/security/prison/mess)
 "lH" = (
@@ -316,6 +318,7 @@
 /obj/item/clothing/glasses/meson,
 /obj/effect/decal/cleanable/dirt,
 /obj/item/tank/internals/oxygen,
+/obj/item/shovel,
 /turf/open/floor/iron,
 /area/station/security/prison/mess)
 "nU" = (
@@ -599,6 +602,9 @@
 	},
 /turf/open/floor/iron/white,
 /area/station/security/prison)
+"AB" = (
+/turf/closed/mineral/random/regrowth/underwater,
+/area/ocean/dark)
 "Bb" = (
 /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
 /turf/open/floor/iron/dark,
@@ -841,6 +847,7 @@
 	id = "mining_internal"
 	},
 /obj/structure/fans/tiny/forcefield,
+/obj/structure/plasticflaps,
 /turf/open/floor/iron/dark,
 /area/station/security/prison)
 "LF" = (
@@ -893,6 +900,7 @@
 /obj/effect/decal/cleanable/dirt,
 /obj/machinery/airalarm/directional/north,
 /obj/item/tank/internals/oxygen,
+/obj/item/shovel,
 /turf/open/floor/iron,
 /area/station/security/prison/mess)
 "OD" = (
@@ -18779,11 +18787,11 @@ qu
 qu
 ab
 qu
-Hh
-Hh
-Hh
-Hh
-Hh
+AB
+AB
+AB
+AB
+AB
 ke
 qu
 Yw
@@ -19035,12 +19043,12 @@ wE
 qu
 qu
 ab
-Hh
-Hh
-Hh
-Hh
-Hh
-Hh
+AB
+AB
+AB
+AB
+AB
+AB
 ke
 qu
 Yw
@@ -19292,12 +19300,12 @@ Wa
 qu
 qu
 ab
-Hh
-Hh
-Hh
-Hh
-Hh
-Hh
+AB
+AB
+AB
+AB
+AB
+AB
 ke
 qu
 Yw
@@ -19549,12 +19557,12 @@ Wa
 qu
 qu
 ab
-Hh
-Hh
-Hh
-Hh
-Hh
-Hh
+AB
+AB
+AB
+AB
+AB
+AB
 ke
 Yw
 Yw
@@ -19806,11 +19814,11 @@ Wa
 qu
 qu
 ab
-Hh
-Hh
-Hh
-Hh
-Hh
+AB
+AB
+AB
+AB
+AB
 qu
 ke
 Yw
@@ -21091,10 +21099,10 @@ Wa
 qu
 qu
 qu
-Hh
-Hh
-Hh
-Hh
+AB
+AB
+AB
+AB
 qu
 qu
 qu
@@ -21348,10 +21356,10 @@ Wa
 qu
 qu
 qu
-Hh
-Hh
-Hh
-Hh
+AB
+AB
+AB
+AB
 qu
 qu
 qu
@@ -21606,10 +21614,10 @@ qu
 qu
 qu
 qu
-Hh
-Hh
-Hh
-Hh
+AB
+AB
+AB
+AB
 qu
 qu
 qu
@@ -21864,9 +21872,9 @@ qu
 qu
 qu
 qu
-Hh
-Hh
-Hh
+AB
+AB
+AB
 qu
 qu
 qu
@@ -22381,8 +22389,8 @@ qu
 qu
 qu
 qu
-Hh
-Hh
+AB
+AB
 qu
 qu
 Yw
@@ -22637,9 +22645,9 @@ qu
 qu
 qu
 qu
-Hh
-Hh
-Hh
+AB
+AB
+AB
 qu
 qu
 Yw
@@ -22893,11 +22901,11 @@ qu
 qu
 qu
 qu
-Hh
-Hh
-Hh
-Hh
-Hh
+AB
+AB
+AB
+AB
+AB
 qu
 qu
 Yw
@@ -23153,7 +23161,7 @@ qu
 qu
 qu
 qu
-Hh
+AB
 qu
 qu
 qu

diff --git a/_maps/map_files/Oshan/oshan.dmm b/_maps/map_files/Oshan/oshan.dmm
@@ -1319,6 +1319,10 @@
 /obj/structure/cable,
 /turf/open/floor/iron,
 /area/station/cargo/storage)
+"aRb" = (
+/obj/machinery/announcement_system,
+/turf/open/floor/circuit,
+/area/station/tcommsat/server)
 "aRd" = (
 /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
 /turf/open/floor/iron/dark,
@@ -7618,6 +7622,7 @@
 /obj/effect/turf_decal/stripes{
 	dir = 1
 	},
+/obj/structure/weightmachine/weightlifter,
 /turf/open/floor/iron,
 /area/station/commons/fitness)
 "exZ" = (
@@ -9768,6 +9773,7 @@
 "fJF" = (
 /obj/effect/turf_decal/stripes,
 /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
+/obj/structure/weightmachine/stacklifter,
 /turf/open/floor/iron,
 /area/station/commons/fitness)
 "fKl" = (
@@ -11432,6 +11438,7 @@
 	},
 /obj/machinery/porta_turret/ai,
 /obj/effect/turf_decal/bot_red,
+/obj/machinery/light/directional/south,
 /turf/open/floor/iron/dark,
 /area/station/ai_monitored/turret_protected/ai_upload)
 "gMi" = (
@@ -22019,6 +22026,7 @@
 	dir = 1
 	},
 /obj/machinery/atmospherics/components/unary/vent_pump/on/layer4,
+/obj/structure/weightmachine/weightlifter,
 /turf/open/floor/iron,
 /area/station/commons/fitness)
 "nck" = (
@@ -34998,6 +35006,7 @@
 	dir = 4;
 	color = "#486091"
 	},
+/obj/machinery/light/directional/south,
 /turf/open/floor/carpet/cyan,
 /area/station/ai_monitored/turret_protected/ai_upload)
 "uPb" = (
@@ -35079,6 +35088,12 @@
 	},
 /turf/open/floor/iron/dark/textured,
 /area/station/security/office)
+"uRq" = (
+/obj/structure/toilet/secret{
+	dir = 8
+	},
+/turf/open/floor/iron/showroomfloor,
+/area/station/commons/dorms)
 "uRv" = (
 /obj/effect/turf_decal/tile/blue/opposingcorners,
 /obj/effect/turf_decal/tile/dark_blue/opposingcorners{
@@ -37463,6 +37478,11 @@
 "wqs" = (
 /turf/open/floor/holofloor/beach/water,
 /area/station/maintenance/starboard/aft)
+"wqA" = (
+/obj/effect/turf_decal/stripes,
+/obj/structure/weightmachine/stacklifter,
+/turf/open/floor/iron,
+/area/station/commons/fitness)
 "wqB" = (
 /obj/machinery/vending/security,
 /obj/effect/turf_decal/trimline/red/filled/line{
@@ -39545,6 +39565,13 @@
 /obj/machinery/conveyor/auto,
 /turf/open/floor/plating,
 /area/station/maintenance/port/central)
+"xzg" = (
+/obj/effect/turf_decal/stripes,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
+/obj/structure/weightmachine/stacklifter,
+/turf/open/floor/iron,
+/area/station/commons/fitness)
 "xzj" = (
 /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2,
 /obj/structure/sign/poster/quirk/festive{
@@ -56550,7 +56577,7 @@ pVn
 vwP
 bmW
 bmW
-bmW
+uRq
 vwP
 rnM
 rnM
@@ -56864,7 +56891,7 @@ aKV
 pug
 qGs
 lqa
-dik
+xzg
 rYQ
 rYQ
 dwx
@@ -57378,7 +57405,7 @@ aKV
 kmY
 exP
 lqa
-ekZ
+wqA
 vtb
 rYQ
 dwx
@@ -61261,7 +61288,7 @@ xhY
 aXp
 dfM
 ctS
-ctS
+aRb
 bNX
 ctS
 hCB
@@ -84619,7 +84646,7 @@ meJ
 meJ
 meJ
 meJ
-meJ
+pSy
 meJ
 meJ
 meJ
@@ -84875,9 +84902,9 @@ aah
 meJ
 meJ
 meJ
-meJ
-meJ
-meJ
+pSy
+pSy
+pSy
 meJ
 aah
 aah