Merge branch 'Monkestation:master' into master

Monkestation · Oct 18, 2023 · 4e78a84 · 4e78a84
2 parents 4349e39 + 12d7e2e
commit 4e78a84
Show file tree

Hide file tree

Showing 190 changed files with 20,958 additions and 16,489 deletions.
diff --git a/_maps/map_files/Deltastation/DeltaStation2.dmm b/_maps/map_files/Deltastation/DeltaStation2.dmm
@@ -32670,12 +32670,9 @@
 /turf/open/floor/plating,
 /area/station/engineering/supermatter/room)
 "hXd" = (
-/obj/effect/turf_decal/box/corners,
-/obj/effect/turf_decal/box/corners{
-	dir = 4
-	},
 /obj/machinery/light/directional/south,
-/obj/effect/landmark/bitrunning/station_reward_spawn,
+/obj/machinery/byteforge,
+/obj/effect/turf_decal/box,
 /turf/open/floor/iron/dark/smooth_large,
 /area/station/bitrunning/den)
 "hXf" = (
@@ -40138,15 +40135,15 @@
 /turf/open/floor/iron/white,
 /area/station/medical/medbay)
 "jKY" = (
-/obj/effect/turf_decal/box/corners{
-	dir = 8
-	},
-/obj/effect/turf_decal/box/corners{
-	dir = 1
-	},
 /obj/effect/decal/cleanable/oil/streak,
 /obj/machinery/camera/directional/south,
-/obj/effect/landmark/bitrunning/station_reward_spawn,
+/obj/structure/table,
+/obj/item/storage/toolbox/mechanical{
+	pixel_y = 7
+	},
+/obj/item/reagent_containers/cup/soda_cans/space_mountain_wind{
+	pixel_x = 5
+	},
 /turf/open/floor/iron/dark/smooth_large,
 /area/station/bitrunning/den)
 "jKZ" = (
@@ -84361,6 +84358,11 @@
 	},
 /turf/open/floor/iron,
 /area/station/commons/dorms)
+"uCq" = (
+/obj/effect/decal/cleanable/dirt,
+/obj/effect/spawner/random/loafer,
+/turf/open/floor/plating,
+/area/station/maintenance/department/security)
 "uCt" = (
 /obj/effect/spawner/random/structure/chair_maintenance{
 	dir = 1
@@ -88611,10 +88613,6 @@
 	dir = 1
 	},
 /obj/effect/decal/cleanable/dirt/dust,
-/obj/item/storage/toolbox/mechanical{
-	pixel_x = -8;
-	pixel_y = 17
-	},
 /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
 /obj/structure/cable,
 /obj/machinery/holopad,
@@ -151776,7 +151774,7 @@ adM
 uHP
 dth
 fws
-vHY
+uCq
 rYA
 vHY
 hie

diff --git a/_maps/map_files/IceBoxStation/IceBoxStation.dmm b/_maps/map_files/IceBoxStation/IceBoxStation.dmm
@@ -30106,6 +30106,13 @@
 /obj/effect/decal/cleanable/dirt,
 /turf/open/floor/iron,
 /area/mine/production)
+"jLk" = (
+/obj/structure/cable,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
+/obj/effect/spawner/random/loafer,
+/turf/open/floor/plating,
+/area/station/security/prison/safe)
 "jLl" = (
 /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden,
 /obj/effect/turf_decal/siding/yellow{
@@ -31963,11 +31970,7 @@
 /turf/open/floor/iron/smooth,
 /area/station/security/holding_cell)
 "kpn" = (
-/obj/effect/turf_decal/box/corners{
-	dir = 8
-	},
-/obj/effect/turf_decal/box/corners,
-/obj/effect/landmark/bitrunning/station_reward_spawn,
+/obj/effect/decal/cleanable/dirt/dust,
 /turf/open/floor/iron/dark/smooth_large,
 /area/station/bitrunning/den)
 "kpp" = (
@@ -47640,15 +47643,10 @@
 /area/station/security/holding_cell)
 "pmQ" = (
 /obj/machinery/light_switch/directional/west,
-/obj/effect/turf_decal/box/corners{
-	dir = 1
-	},
-/obj/effect/turf_decal/box/corners{
-	dir = 4
-	},
 /obj/effect/decal/cleanable/cobweb,
 /obj/effect/decal/cleanable/dirt/dust,
-/obj/effect/landmark/bitrunning/station_reward_spawn,
+/obj/machinery/byteforge,
+/obj/effect/turf_decal/box,
 /turf/open/floor/iron/dark/smooth_large,
 /area/station/bitrunning/den)
 "pna" = (
@@ -170915,7 +170913,7 @@ wRa
 vVH
 nRO
 ulz
-ulz
+jLk
 ulz
 pNm
 eOz

diff --git a/_maps/map_files/KiloStation/KiloStation.dmm b/_maps/map_files/KiloStation/KiloStation.dmm
@@ -29517,6 +29517,9 @@
 /obj/machinery/firealarm/directional/west,
 /obj/item/radio/intercom/directional/north,
 /obj/machinery/pdapainter/supply,
+/obj/machinery/byteforge{
+	pixel_y = 14
+	},
 /turf/open/floor/iron/dark,
 /area/station/command/heads_quarters/qm)
 "jGt" = (

diff --git a/_maps/map_files/MetaStation/MetaStation.dmm b/_maps/map_files/MetaStation/MetaStation.dmm
@@ -3435,16 +3435,9 @@
 /turf/open/floor/iron/white,
 /area/station/medical/abandoned)
 "bje" = (
-/obj/effect/turf_decal/box/corners{
-	dir = 8
-	},
-/obj/effect/turf_decal/box/corners{
-	dir = 1
-	},
 /obj/effect/decal/cleanable/oil/streak,
 /obj/machinery/atmospherics/components/unary/vent_pump/on/layer4,
 /obj/structure/extinguisher_cabinet/directional/north,
-/obj/effect/landmark/bitrunning/station_reward_spawn,
 /turf/open/floor/iron/dark/smooth_large,
 /area/station/bitrunning/den)
 "bjB" = (
@@ -29483,14 +29476,11 @@
 /turf/open/floor/iron/dark/textured_half,
 /area/station/bitrunning/den)
 "kHU" = (
-/obj/effect/turf_decal/box/corners,
-/obj/effect/turf_decal/box/corners{
-	dir = 4
-	},
 /obj/effect/decal/cleanable/dirt/dust,
 /obj/machinery/light_switch/directional/north,
 /obj/effect/decal/cleanable/dirt/dust,
-/obj/effect/landmark/bitrunning/station_reward_spawn,
+/obj/machinery/byteforge,
+/obj/effect/turf_decal/box,
 /turf/open/floor/iron/dark/smooth_large,
 /area/station/bitrunning/den)
 "kIG" = (
@@ -39676,6 +39666,10 @@
 /obj/machinery/duct,
 /turf/open/floor/plating,
 /area/station/maintenance/port/aft)
+"omE" = (
+/obj/effect/spawner/random/loafer,
+/turf/open/floor/plating,
+/area/station/maintenance/port/fore)
 "omF" = (
 /obj/machinery/teleport/station,
 /obj/machinery/status_display/evac/directional/north,
@@ -90451,7 +90445,7 @@ aaa
 bxr
 jXu
 rOz
-sHu
+omE
 siY
 jXu
 aaa

diff --git a/_maps/map_files/NorthStar/north_star.dmm b/_maps/map_files/NorthStar/north_star.dmm
@@ -8391,16 +8391,11 @@
 	},
 /area/station/hallway/floor2/aft)
 "caN" = (
-/obj/effect/turf_decal/box/corners{
-	dir = 8
-	},
-/obj/effect/turf_decal/box/corners{
-	dir = 1
-	},
 /obj/machinery/firealarm/directional/south,
 /obj/machinery/light/directional/south,
 /obj/effect/decal/cleanable/oil/streak,
-/obj/effect/landmark/bitrunning/station_reward_spawn,
+/obj/machinery/byteforge,
+/obj/effect/turf_decal/box,
 /turf/open/floor/iron/dark/smooth_large,
 /area/station/bitrunning/den)
 "caQ" = (
@@ -50556,9 +50551,6 @@
 /obj/structure/cable,
 /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
 /obj/effect/turf_decal/trimline/brown/line,
-/obj/effect/turf_decal/stripes/corner{
-	dir = 8
-	},
 /obj/structure/disposalpipe/segment{
 	dir = 4
 	},
@@ -51614,9 +51606,6 @@
 /obj/item/cigbutt/cigarbutt{
 	pixel_x = 7
 	},
-/obj/effect/turf_decal/stripes{
-	dir = 8
-	},
 /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{
 	dir = 1
 	},
@@ -55467,11 +55456,13 @@
 	},
 /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
 /obj/structure/cable,
-/obj/effect/turf_decal/stripes,
 /obj/effect/turf_decal/trimline/brown/line,
 /obj/structure/disposalpipe/segment{
 	dir = 5
 	},
+/obj/effect/turf_decal/stripes/corner{
+	dir = 8
+	},
 /turf/open/floor/iron/dark/smooth_half,
 /area/station/bitrunning/den)
 "owo" = (
@@ -77997,12 +77988,10 @@
 /turf/open/floor/carpet/royalblue,
 /area/station/commons/dorms/room4)
 "uLN" = (
-/obj/effect/turf_decal/box/corners,
-/obj/effect/turf_decal/box/corners{
-	dir = 4
-	},
 /obj/effect/decal/cleanable/dirt/dust,
-/obj/effect/landmark/bitrunning/station_reward_spawn,
+/obj/effect/turf_decal/stripes{
+	dir = 8
+	},
 /turf/open/floor/iron/dark/smooth_large,
 /area/station/bitrunning/den)
 "uLO" = (

diff --git a/_maps/map_files/Oshan/oshan.dmm b/_maps/map_files/Oshan/oshan.dmm
@@ -5367,6 +5367,15 @@
 /obj/structure/cable/multilayer/connected,
 /turf/open/floor/iron/dark/textured,
 /area/station/command/bridge)
+"cRm" = (
+/obj/effect/turf_decal/siding/wood,
+/obj/machinery/door/poddoor/shutters/preopen{
+	id = "kitchen";
+	name = "Kitchen"
+	},
+/obj/structure/table/wood,
+/turf/open/floor/carpet,
+/area/station/service/bar)
 "cRO" = (
 /obj/machinery/camera/autoname/directional/west,
 /obj/effect/turf_decal/trimline/red/filled/line{
@@ -8915,7 +8924,8 @@
 	},
 /area/station/science/lobby)
 "eGh" = (
-/obj/effect/landmark/bitrunning/station_reward_spawn,
+/obj/machinery/byteforge,
+/obj/effect/turf_decal/box,
 /turf/open/floor/carpet/neon/simple/orange/nodots,
 /area/station/bitrunning/den)
 "eGI" = (
@@ -34455,6 +34465,9 @@
 /obj/effect/turf_decal/delivery,
 /turf/open/floor/iron/dark/textured,
 /area/station/engineering/main)
+"rwd" = (
+/turf/open/floor/carpet/neon/simple/orange/nodots,
+/area/station/bitrunning/den)
 "rwi" = (
 /obj/machinery/meter,
 /obj/machinery/atmospherics/pipe/smart/simple/yellow/visible{
@@ -38190,7 +38203,6 @@
 /obj/structure/disposalpipe/segment{
 	dir = 6
 	},
-/obj/structure/table/wood,
 /obj/effect/turf_decal/siding/wood{
 	dir = 1
 	},
@@ -38199,6 +38211,9 @@
 	dir = 1;
 	name = "Kitchen"
 	},
+/obj/machinery/smartfridge/drinks{
+	icon_state = "boozeomat"
+	},
 /turf/open/floor/carpet,
 /area/station/service/bar)
 "tym" = (
@@ -40767,9 +40782,7 @@
 /turf/open/floor/iron/dark,
 /area/station/engineering/atmos)
 "uHW" = (
-/obj/machinery/smartfridge/drinks{
-	icon_state = "boozeomat"
-	},
+/obj/machinery/vending/boozeomat,
 /turf/open/floor/carpet,
 /area/station/service/bar)
 "uIg" = (
@@ -64489,7 +64502,7 @@ sHS
 pIL
 pIL
 pIL
-lLc
+cRm
 aVb
 mIS
 oWO
@@ -68622,7 +68635,7 @@ kXk
 iSl
 wUo
 btg
-eGh
+rwd
 eGh
 pEa
 wsx

diff --git a/_maps/map_files/debug/runtimestation.dmm b/_maps/map_files/debug/runtimestation.dmm
@@ -1853,10 +1853,6 @@
 /obj/item/paper/guides/jobs/security/labor_camp,
 /turf/open/floor/iron,
 /area/station/security/brig)
-"gU" = (
-/obj/effect/landmark/bitrunning/station_reward_spawn,
-/turf/open/floor/circuit/green,
-/area/station/bitrunning/den)
 "gW" = (
 /obj/effect/spawner/structure/window/reinforced,
 /obj/structure/sign/warning/radiation/rad_area/directional/north,
@@ -1882,6 +1878,10 @@
 /obj/machinery/light_switch/directional/west,
 /turf/open/floor/iron,
 /area/station/construction)
+"ip" = (
+/obj/machinery/byteforge,
+/turf/open/floor/circuit/green,
+/area/station/bitrunning/den)
 "is" = (
 /obj/structure/sign/warning/vacuum/external/directional/east,
 /turf/open/floor/iron,
@@ -3223,7 +3223,7 @@ aa
 aa
 aa
 pl
-gU
+Lq
 Lq
 RW
 nk
@@ -3315,8 +3315,8 @@ aa
 aa
 aa
 pl
-gU
 Lq
+ip
 RW
 nk
 pl