Skip to content

Commit

Permalink
fixes
Browse files Browse the repository at this point in the history
  • Loading branch information
@mothmapper
mothmapper committed Jul 11, 2024
1 parent 91199e9 commit 89c953f
Showing 1 changed file with 143 additions and 2 deletions.
145 changes: 143 additions & 2 deletions _maps/map_files/ProtoBoxStation/ProtoBoxStation.dmm
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21686,10 +21686,17 @@
/obj/structure/cable,
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
<<<<<<< Updated upstream
/obj/effect/turf_decal/trimline/purple/filled/end,
/obj/effect/turf_decal/trimline/purple/line{
dir = 1
},
=======
/obj/effect/turf_decal/trimline/purple/filled/end{
dir = 1
},
/obj/effect/turf_decal/trimline/purple/line,
>>>>>>> Stashed changes
/turf/open/floor/iron/dark,
/area/station/maintenance/starboard)
"btc" = (
Expand Down Expand Up @@ -37461,7 +37468,14 @@
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
/obj/structure/cable,
/obj/structure/table/wood,
<<<<<<< Updated upstream
/obj/effect/spawner/random/food_or_drink/snack,
=======
/obj/item/toy/plush/explosive{
pixel_x = 0;
pixel_y = 0
},
>>>>>>> Stashed changes
/turf/open/floor/iron/checker,
/area/station/science/breakroom)
"dQL" = (
Expand Down Expand Up @@ -40929,6 +40943,20 @@
},
/turf/open/floor/iron/dark,
/area/station/medical/treatment_center)
"gTC" = (
/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{
dir = 1
},
/obj/effect/turf_decal/stripes/corner{
dir = 8
},
/obj/effect/turf_decal/tile/blue{
dir = 8
},
/obj/machinery/power/apc/auto_name/directional/south,
/obj/structure/cable,
/turf/open/floor/iron/dark,
/area/station/engineering/transit_tube)
"gTD" = (
/obj/effect/turf_decal/trimline/red/filled/line{
dir = 9
Expand Down Expand Up @@ -41399,6 +41427,12 @@
"hox" = (
/turf/open/floor/iron/dark,
/area/station/science/explab)
"hoM" = (
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
/obj/structure/cable,
/turf/open/floor/iron/dark,
/area/station/engineering/transit_tube)
"hoO" = (
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
/obj/effect/landmark/blobstart,
Expand Down Expand Up @@ -44088,6 +44122,9 @@
/obj/effect/turf_decal/siding,
/turf/open/floor/iron/white/small,
/area/station/medical/storage)
"jQr" = (
/turf/closed/wall/r_wall,
/area/station/engineering/transit_tube)
"jQC" = (
/obj/structure/broken_flooring/side/directional/north,
/turf/open/floor/plating,
Expand Down Expand Up @@ -44922,6 +44959,14 @@
/obj/effect/turf_decal/siding/wood/corner,
/turf/open/floor/wood/large,
/area/station/command/meeting_room)
"kxU" = (
/obj/machinery/door/airlock/external{
name = "MiniSat Space Access Airlock"
},
/obj/effect/mapping_helpers/airlock/cyclelink_helper,
/obj/effect/mapping_helpers/airlock/access/any/command/minisat,
/turf/open/floor/iron/dark,
/area/station/engineering/transit_tube)
"kxV" = (
/obj/structure/rack,
/obj/item/stack/sheet/iron/fifty,
Expand Down Expand Up @@ -44953,6 +44998,14 @@
"kyG" = (
/turf/open/floor/iron/freezer,
/area/station/science/xenobiology)
"kzm" = (
/obj/machinery/light/small/directional/west,
/obj/effect/turf_decal/stripes/line{
dir = 1
},
/obj/effect/turf_decal/stripes/line,
/turf/open/floor/iron/dark,
/area/station/engineering/transit_tube)
"kzL" = (
/turf/open/floor/wood,
/area/station/service/bar)
Expand Down Expand Up @@ -45834,6 +45887,10 @@
/obj/structure/cable,
/turf/open/floor/plating,
/area/station/maintenance/aft)
"lmv" = (
/obj/machinery/atmospherics/pipe/smart/manifold4w/orange/visible,
/turf/closed/wall,
/area/station/engineering/transit_tube)
"lmB" = (
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
Expand Down Expand Up @@ -48335,6 +48392,9 @@
/obj/machinery/light_switch/directional/north,
/turf/open/floor/iron,
/area/station/commons/storage/tools)
"nzM" = (
/turf/closed/wall,
/area/station/engineering/transit_tube)
"nzO" = (
/turf/closed/wall/r_wall,
/area/station/medical/treatment_center)
Expand Down Expand Up @@ -49053,6 +49113,9 @@
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
/turf/open/floor/iron/dark,
/area/station/science/ordnance)
"ocq" = (
/turf/open/floor/iron/dark/textured_large,
/area/station/science/ordnance/testlab)
"ocY" = (
/obj/machinery/light/small/directional/north,
/obj/structure/table/reinforced,
Expand Down Expand Up @@ -50320,6 +50383,10 @@
},
/turf/open/floor/iron/white,
/area/station/medical/treatment_center)
"pkP" = (
/obj/machinery/atmospherics/pipe/smart/manifold4w/orange/visible,
/turf/closed/wall/r_wall,
/area/station/engineering/transit_tube)
"pkS" = (
/obj/machinery/newscaster/directional/east,
/obj/structure/bed/medical/anchored{
Expand Down Expand Up @@ -52636,6 +52703,17 @@
},
/turf/open/floor/iron,
/area/station/commons/locker)
"rgZ" = (
/obj/structure/disposalpipe/segment,
/obj/structure/cable,
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
/obj/effect/turf_decal/trimline/purple/filled/end,
/obj/effect/turf_decal/trimline/purple/line{
dir = 1
},
/turf/open/floor/iron/dark,
/area/station/maintenance/starboard)
"rhO" = (
/obj/machinery/airalarm/directional/north,
/obj/machinery/dna_scannernew,
Expand Down Expand Up @@ -53885,9 +53963,12 @@
/turf/open/floor/iron/dark,
/area/station/command/heads_quarters/cmo)
"spk" = (
<<<<<<< Updated upstream
/turf/open/floor/iron/dark/textured_large,
/area/station/science/ordnance/testlab)
"sql" = (
=======
>>>>>>> Stashed changes
/obj/effect/turf_decal/tile/purple{
dir = 1
},
Expand Down Expand Up @@ -55387,6 +55468,10 @@
/obj/effect/landmark/start/hangover,
/turf/open/floor/carpet,
/area/station/service/theater)
"tGn" = (
/obj/structure/lattice/catwalk,
/turf/open/space/basic,
/area/space)
"tGz" = (
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
Expand Down Expand Up @@ -56051,6 +56136,16 @@
/obj/effect/decal/cleanable/dirt,
/turf/open/floor/iron,
/area/station/security/brig)
"uql" = (
/obj/machinery/door/airlock/external{
name = "MiniSat Space Access Airlock"
},
/obj/effect/mapping_helpers/airlock/cyclelink_helper{
dir = 1
},
/obj/effect/mapping_helpers/airlock/access/any/command/minisat,
/turf/open/floor/iron/dark,
/area/station/engineering/transit_tube)
"uqH" = (
/obj/effect/turf_decal/tile/red{
dir = 1
Expand Down Expand Up @@ -92971,13 +93066,23 @@ ccw
cpa
cjc
cqo
<<<<<<< Updated upstream
gTT
niO
cOn
niO
niO
niO
niO
=======
pkP
jQr
cOn
jQr
jQr
jQr
jQr
>>>>>>> Stashed changes
aaa
aaa
fFa
Expand Down Expand Up @@ -93228,13 +93333,23 @@ ccw
ccw
cpI
ccw
<<<<<<< Updated upstream
gTT
mqt
lqO
nZi
bej
wlT
pNY
=======
pkP
mqt
lqO
nZi
kxU
kzm
uql
>>>>>>> Stashed changes
nXv
nXv
fFa
Expand Down Expand Up @@ -93485,13 +93600,23 @@ cig
cpb
ciZ
cqp
<<<<<<< Updated upstream
iQg
bfN
eCX
fnw
niO
niO
niO
=======
lmv
bfN
hoM
gTC
jQr
jQr
jQr
>>>>>>> Stashed changes
aaa
gXs
fFa
Expand Down Expand Up @@ -93742,13 +93867,21 @@ cig
cig
czg
cig
<<<<<<< Updated upstream
iQg
=======
lmv
>>>>>>> Stashed changes
iAF
qHB
xIq
vrB
sRw
<<<<<<< Updated upstream
wnU
=======
tGn
>>>>>>> Stashed changes
aaa
gXs
fFa
Expand Down Expand Up @@ -93999,11 +94132,19 @@ cig
aaa
afp
aaa
<<<<<<< Updated upstream
iQg
kEC
kEC
kEC
sRG
=======
lmv
kEC
kEC
kEC
nzM
>>>>>>> Stashed changes
aaa
mnU
aaa
Expand Down Expand Up @@ -110408,7 +110549,7 @@ diV
bry
bEE
bFY
bta
rgZ
bGG
xuS
cNX
Expand Down Expand Up @@ -111438,7 +111579,7 @@ bky
bky
cBA
bIU
spk
ocq
kVu
rAv
bLj
Expand Down

0 comments on commit 89c953f

Please sign in to comment.