cyberpresidentvanellope/Bubberstation
1
0
Fork 0
mirror of https://github.com/Bubberstation/Bubberstation.git synced 2026-08-24 21:48:39 +01:00
Code Issues Packages Projects Releases Wiki Activity

Revert "test, prob will change"

Browse Source 
This reverts commit a35b1534fa.
This commit is contained in:
StrangeWeirdKitten
2023-10-28 17:33:28 -06:00
parent a35b1534fa
commit cade740db6
2 changed files with 73 additions and 88 deletions
Download Patch File Download Diff File Expand all files Collapse all files
_maps/map_files/KiloStation/KiloStation.dmm
+72 -87
View File
@@ -2371,8 +2371,12 @@
/obj/item/kirbyplants{
icon_state = "plant-05"
},
/turf/open/floor/wood,
/area/station/cargo/lobby)
/obj/effect/turf_decal/tile/brown/half/contrasted{
dir = 4
},
/obj/effect/turf_decal/tile/yellow,
/turf/open/floor/iron,
/area/station/hallway/primary/starboard)
"aMJ" = (
/obj/structure/plasticflaps/opaque,
/obj/machinery/navbeacon{
@@ -6905,12 +6909,6 @@
/obj/structure/cable,
/obj/effect/landmark/start/hangover,
/obj/effect/turf_decal/tile/neutral/fourcorners,
/obj/effect/turf_decal/tile/brown/half/contrasted{
dir = 4
},
/obj/effect/turf_decal/tile/yellow{
dir = 4
},
/turf/open/floor/iron,
/area/station/hallway/primary/starboard)
"cqc" = (
@@ -10671,8 +10669,12 @@
/obj/effect/turf_decal/loading_area{
dir = 8
},
/turf/open/floor/wood,
/area/station/cargo/lobby)
/obj/effect/turf_decal/tile/brown/half/contrasted{
dir = 4
},
/obj/effect/turf_decal/tile/yellow,
/turf/open/floor/iron,
/area/station/hallway/primary/starboard)
"dED" = (
/obj/effect/decal/cleanable/dirt,
/obj/effect/turf_decal/stripes/line,
@@ -12163,10 +12165,11 @@
/obj/structure/disposalpipe/segment{
dir = 4
},
/obj/structure/railing,
/obj/structure/chair/stool/directional/north,
/turf/open/floor/wood,
/area/station/cargo/lobby)
/obj/effect/landmark/start/hangover,
/obj/effect/turf_decal/tile/brown,
/obj/effect/turf_decal/tile/yellow,
/turf/open/floor/iron,
/area/station/hallway/primary/starboard)
"egr" = (
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
@@ -14772,13 +14775,10 @@
c_tag = "Starboard Hallway Cargo Counter";
name = "starboard camera"
},
/obj/effect/turf_decal/tile/yellow,
/obj/effect/turf_decal/tile/yellow{
dir = 1
},
/obj/effect/turf_decal/tile/brown/half/contrasted{
dir = 1
dir = 4
},
/obj/effect/turf_decal/tile/yellow,
/turf/open/floor/iron,
/area/station/hallway/primary/starboard)
"faN" = (
@@ -15349,8 +15349,11 @@
/area/station/hallway/primary/central/fore)
"fkw" = (
/obj/effect/landmark/start/hangover,
/turf/open/floor/wood,
/area/station/cargo/lobby)
/obj/effect/turf_decal/tile/neutral/half/contrasted{
dir = 8
},
/turf/open/floor/iron,
/area/station/hallway/primary/starboard)
"fkB" = (
/obj/structure/table,
/obj/item/stack/sheet/plasteel/fifty{
@@ -18354,10 +18357,11 @@
/turf/open/floor/iron/dark,
/area/station/science/xenobiology)
"gcq" = (
/obj/structure/cable,
/obj/structure/disposalpipe/segment,
/obj/effect/turf_decal/tile/neutral/fourcorners,
/obj/effect/turf_decal/tile/brown,
/obj/effect/turf_decal/delivery,
/obj/effect/turf_decal/tile/brown/half/contrasted{
dir = 4
},
/obj/effect/turf_decal/tile/yellow,
/turf/open/floor/iron,
/area/station/hallway/primary/starboard)
"gcy" = (
@@ -23028,11 +23032,11 @@
/turf/open/floor/iron/showroomfloor,
/area/station/commons/toilet/restrooms)
"hDK" = (
/obj/effect/turf_decal/tile/brown/half/contrasted,
/obj/effect/turf_decal/tile/yellow{
/obj/effect/decal/cleanable/dirt,
/obj/effect/turf_decal/tile/neutral/half/contrasted{
dir = 8
},
/turf/open/floor/iron/dark/corner,
/turf/open/floor/iron,
/area/station/hallway/primary/starboard)
"hDV" = (
/obj/effect/turf_decal/stripes/line{
@@ -25195,10 +25199,6 @@
/obj/structure/cable,
/obj/effect/mapping_helpers/mail_sorting/supply/cargo_bay,
/obj/effect/turf_decal/tile/neutral/fourcorners,
/obj/effect/turf_decal/tile/brown/half/contrasted{
dir = 4
},
/obj/effect/turf_decal/tile/yellow,
/turf/open/floor/iron,
/area/station/hallway/primary/starboard)
"ijz" = (
@@ -34916,8 +34916,11 @@
/turf/open/floor/iron/dark,
/area/station/commons/toilet/restrooms)
"lrR" = (
/turf/open/floor/wood,
/area/station/cargo/lobby)
/obj/effect/turf_decal/tile/neutral/half/contrasted{
dir = 8
},
/turf/open/floor/iron,
/area/station/hallway/primary/starboard)
"lrU" = (
/obj/machinery/disposal/bin,
/obj/effect/turf_decal/bot,
@@ -37161,10 +37164,6 @@
/obj/effect/turf_decal/tile/neutral/half/contrasted{
dir = 8
},
/obj/effect/turf_decal/tile/brown/half/contrasted,
/obj/effect/turf_decal/tile/yellow{
dir = 8
},
/turf/open/floor/iron/dark,
/area/station/hallway/primary/starboard)
"mej" = (
@@ -43347,12 +43346,14 @@
/turf/open/floor/iron/dark,
/area/station/science/xenobiology)
"okJ" = (
/obj/effect/decal/cleanable/dirt,
/obj/structure/disposalpipe/segment{
dir = 4
},
/obj/structure/railing,
/turf/open/floor/wood,
/area/station/cargo/lobby)
/obj/effect/turf_decal/tile/brown/anticorner/contrasted,
/obj/effect/turf_decal/tile/yellow,
/turf/open/floor/iron,
/area/station/hallway/primary/starboard)
"okN" = (
/turf/closed/wall/rust,
/area/station/service/bar/backroom)
@@ -51557,12 +51558,6 @@
/obj/effect/landmark/start/hangover,
/obj/structure/disposalpipe/segment,
/obj/effect/turf_decal/tile/neutral/fourcorners,
/obj/effect/turf_decal/tile/brown/half/contrasted{
dir = 4
},
/obj/effect/turf_decal/tile/yellow{
dir = 4
},
/turf/open/floor/iron,
/area/station/hallway/primary/starboard)
"qXc" = (
@@ -57435,9 +57430,15 @@
/turf/open/floor/iron,
/area/station/commons/fitness/recreation)
"sPd" = (
/obj/effect/decal/cleanable/dirt,
/obj/effect/landmark/start/assistant,
/turf/open/floor/wood,
/area/station/cargo/lobby)
/obj/effect/turf_decal/delivery,
/obj/effect/turf_decal/tile/brown/half/contrasted{
dir = 4
},
/obj/effect/turf_decal/tile/yellow,
/turf/open/floor/iron,
/area/station/hallway/primary/starboard)
"sPx" = (
/obj/machinery/light/directional/east,
/turf/open/floor/iron/dark,
@@ -59592,12 +59593,6 @@
/obj/structure/disposalpipe/segment,
/obj/structure/cable,
/obj/effect/turf_decal/tile/neutral/fourcorners,
/obj/effect/turf_decal/tile/brown/half/contrasted{
dir = 4
},
/obj/effect/turf_decal/tile/yellow{
dir = 4
},
/turf/open/floor/iron,
/area/station/hallway/primary/starboard)
"twN" = (
@@ -61112,12 +61107,6 @@
/obj/structure/cable,
/obj/structure/disposalpipe/segment,
/obj/effect/turf_decal/tile/neutral/fourcorners,
/obj/effect/turf_decal/tile/brown/half/contrasted{
dir = 4
},
/obj/effect/turf_decal/tile/yellow{
dir = 4
},
/turf/open/floor/iron,
/area/station/hallway/primary/starboard)
"tXB" = (
@@ -67338,11 +67327,12 @@
/turf/open/floor/iron/dark,
/area/station/science/robotics/lab)
"vTx" = (
/obj/structure/railing{
dir = 1
/obj/effect/turf_decal/tile/brown/half/contrasted{
dir = 4
},
/turf/open/floor/wood,
/area/station/cargo/lobby)
/obj/effect/turf_decal/tile/yellow,
/turf/open/floor/iron,
/area/station/hallway/primary/starboard)
"vTA" = (
/obj/effect/turf_decal/stripes/corner{
dir = 4
@@ -67769,8 +67759,9 @@
/turf/closed/wall/r_wall,
/area/station/engineering/atmos)
"vZB" = (
/obj/structure/sign/departments/cargo,
/turf/closed/wall,
/area/station/cargo/lobby)
/area/station/hallway/primary/starboard)
"wae" = (
/obj/machinery/atmospherics/components/unary/outlet_injector/monitored/mix_input{
dir = 1
@@ -69213,9 +69204,6 @@
/obj/structure/disposalpipe/segment,
/obj/structure/cable,
/obj/effect/turf_decal/tile/neutral/fourcorners,
/obj/effect/turf_decal/tile/brown{
dir = 4
},
/turf/open/floor/iron,
/area/station/hallway/primary/starboard)
"wwM" = (
@@ -69279,13 +69267,7 @@
/turf/open/floor/iron/dark,
/area/station/maintenance/starboard/fore)
"wxU" = (
/obj/structure/disposalpipe/segment,
/obj/structure/cable,
/obj/effect/turf_decal/tile/neutral/fourcorners,
/obj/effect/turf_decal/tile/brown/half/contrasted{
dir = 4
},
/obj/effect/turf_decal/tile/yellow{
/obj/effect/turf_decal/tile/brown{
dir = 4
},
/turf/open/floor/iron,
@@ -72020,9 +72002,12 @@
/area/station/security/office)
"xtC" = (
/obj/machinery/computer/cargo/request,
/obj/machinery/power/apc/auto_name/directional/north,
/turf/open/floor/wood,
/area/station/cargo/lobby)
/obj/effect/turf_decal/tile/brown/anticorner/contrasted{
dir = 4
},
/obj/effect/turf_decal/tile/yellow/opposingcorners,
/turf/open/floor/iron,
/area/station/hallway/primary/starboard)
"xtG" = (
/obj/structure/cable,
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
@@ -73826,7 +73811,7 @@
/obj/machinery/door/firedoor,
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
/obj/structure/sign/departments/cargo/directional/west,
/obj/structure/sign/poster/official/random/directional/west,
/turf/open/floor/iron/dark,
/area/station/hallway/primary/starboard)
"xWS" = (
@@ -111151,13 +111136,13 @@ kCa
asu
anN
mit
gcq
wxU
tXz
anN
twG
qXa
cpZ
tXz
wxU
anN
ijy
wwJ
aot
@@ -111408,13 +111393,13 @@ prq
vao
qpJ
fqq
hDK
tho
vTx
lrR
wxU
lrR
lrR
fkw
lrR
hDK
ege
fak
ykP
@@ -111669,7 +111654,7 @@ mee
vZB
xtC
sPd
lrR
gcq
aMy
dEw
okJ
modular_skyrat/modules/automapper/code/area_spawn_entries.dm
+1 -1
View File
@@ -46,7 +46,7 @@
mode = AREA_SPAWN_MODE_HUG_WALL
/datum/area_spawn/gbp_machine
target_areas = list(/area/station/cargo/lobby, /area/station/cargo/boutique, /area/station/construction/storage_wing) // lmao imagine map standardization
target_areas = list(/area/station/cargo/lobby, /area/station/cargo/boutique, /area/station/construction/storage_wing, /area/station/cargo/office) // Bubberstation Edit for Kilo- /area/station/cargo/office
desired_atom = /obj/machinery/gbp_redemption
mode = AREA_SPAWN_MODE_HUG_WALL