Skip to content

Commit

Permalink
Bitrunner PR post merge fixes (#2112)
Browse files Browse the repository at this point in the history 
* deleted oil stain under bit den door on boxstation

* visitation pipe fix

* deleted some pointless airlocks to allow easier access to the escape pod, moved some doors around too

* forgor

* fixed a backwards bench on delta

* training toolboxes in ragecage

* another bench fix

* meteorite protection in meta bitrunning

* sends a message in sec channel when prisoners are done bitrunning

* soup bowls in tram permabrig

* floor

* emergency 02 lockers in delta perma

* light replacements in every perma, fixed disposals being blocked by a grille in delta

* ghost spawners in perma (kilo in other pr)

* upgrade

* general kilo updates

---------

Co-authored-by: KnighTheThrasher <[email protected]>
  • Loading branch information
@KnigTheThrasher
KnigTheThrasher and KnigTheThrasher authored Jun 24, 2024
1 parent fe85697 commit ec95c58
Show file tree
Hide file tree
Showing 8 changed files with 3,543 additions and 3,432 deletions.
162 changes: 85 additions & 77 deletions _maps/map_files/BoxStation/BoxStation.dmm
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6112,29 +6112,6 @@
/obj/effect/landmark/start/head_of_personnel,
/turf/open/floor/iron/dark,
/area/station/command/meeting_room)
"caj" = (
/obj/effect/turf_decal/trimline/green/filled/line,
/obj/structure/table/glass,
/obj/item/healthanalyzer,
/obj/item/clothing/glasses/hud/health,
/obj/item/clothing/gloves/latex,
/obj/item/storage/box/beakers,
/obj/item/storage/box/syringes{
pixel_x = 4;
pixel_y = 4
},
/obj/item/storage/box/tube{
pixel_y = 4;
pixel_x = -2
},
/obj/machinery/firealarm/directional/south,
/obj/item/storage/box/monkeycubes/mousecubes,
/obj/item/storage/box/monkeycubes/mousecubes{
pixel_x = 6;
pixel_y = 4
},
/turf/open/floor/iron/white,
/area/station/medical/virology)
"cau" = (
/obj/structure/lattice/catwalk,
/turf/open/space/basic,
Expand Down Expand Up @@ -14346,6 +14323,12 @@
},
/turf/open/floor/iron,
/area/station/hallway/secondary/service)
"eNH" = (
/obj/structure/cable,
/obj/machinery/duct,
/obj/structure/ghost_critter_spawn,
/turf/open/floor/plating,
/area/station/security/prison)
"eNK" = (
/obj/effect/turf_decal/trimline/brown/filled/warning,
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
Expand Down Expand Up @@ -23272,14 +23255,6 @@
/obj/effect/landmark/start/assistant,
/turf/open/floor/iron,
/area/station/hallway/primary/aft)
"hLe" = (
/obj/structure/rack,
/obj/item/mop,
/obj/item/reagent_containers/cup/bottle/ammonia,
/obj/item/tank/internals/emergency_oxygen,
/obj/item/clothing/mask/breath,
/turf/open/floor/plating,
/area/station/security/prison)
"hLt" = (
/obj/effect/turf_decal/trimline/dark_blue/filled/line{
dir = 9
Expand Down Expand Up @@ -24640,6 +24615,29 @@
},
/turf/open/floor/iron/dark/textured,
/area/station/hallway/primary/central)
"ilj" = (
/obj/effect/turf_decal/trimline/green/filled/line,
/obj/structure/table/glass,
/obj/item/healthanalyzer,
/obj/item/clothing/glasses/hud/health,
/obj/item/clothing/gloves/latex,
/obj/item/storage/box/beakers,
/obj/item/storage/box/syringes{
pixel_x = 4;
pixel_y = 4
},
/obj/item/storage/box/tube{
pixel_y = 4;
pixel_x = -2
},
/obj/machinery/newscaster/directional/south,
/obj/item/storage/box/monkeycubes/mousecubes,
/obj/item/storage/box/monkeycubes/mousecubes{
pixel_x = 6;
pixel_y = 4
},
/turf/open/floor/iron/white,
/area/station/medical/virology)
"iln" = (
/obj/machinery/atmospherics/components/unary/vent_pump/on{
dir = 1
Expand Down Expand Up @@ -26174,29 +26172,6 @@
/obj/structure/sign/departments/security/directional/north,
/turf/open/floor/iron/dark,
/area/station/hallway/primary/fore)
"iIn" = (
/obj/effect/turf_decal/trimline/green/filled/line,
/obj/structure/table/glass,
/obj/item/healthanalyzer,
/obj/item/clothing/glasses/hud/health,
/obj/item/clothing/gloves/latex,
/obj/item/storage/box/beakers,
/obj/item/storage/box/syringes{
pixel_x = 4;
pixel_y = 4
},
/obj/item/storage/box/tube{
pixel_y = 4;
pixel_x = -2
},
/obj/machinery/newscaster/directional/south,
/obj/item/storage/box/monkeycubes/mousecubes,
/obj/item/storage/box/monkeycubes/mousecubes{
pixel_x = 6;
pixel_y = 4
},
/turf/open/floor/iron/white,
/area/station/medical/virology)
"iIr" = (
/obj/effect/turf_decal/trimline/blue/filled/line{
dir = 9
Expand Down Expand Up @@ -31112,6 +31087,15 @@
dir = 4
},
/area/station/cargo/miningoffice)
"kqX" = (
/obj/machinery/door/airlock/grunge{
name = "Bitrunner Den"
},
/obj/structure/cable,
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
/turf/open/floor/iron/showroomfloor,
/area/station/security/bitden)
"krD" = (
/obj/machinery/camera/autoname/directional/west,
/obj/machinery/atmospherics/components/unary/passive_vent{
Expand Down Expand Up @@ -37306,16 +37290,6 @@
},
/turf/open/floor/catwalk_floor/iron_dark,
/area/station/engineering/transit_tube)
"mtq" = (
/obj/effect/decal/cleanable/oil/slippery,
/obj/machinery/door/airlock/grunge{
name = "Bitrunner Den"
},
/obj/structure/cable,
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
/turf/open/floor/iron/showroomfloor,
/area/station/security/bitden)
"mtH" = (
/obj/machinery/atmospherics/pipe/smart/simple/cyan/visible/layer2{
dir = 5
Expand Down Expand Up @@ -37830,6 +37804,13 @@
"mDv" = (
/turf/closed/wall/r_wall,
/area/station/maintenance/department/engine)
"mDz" = (
/obj/structure/window/reinforced/tinted{
dir = 4
},
/obj/item/kirbyplants/random/dead,
/turf/open/floor/iron/vaporwave,
/area/station/command/heads_quarters/rd)
"mDR" = (
/obj/effect/decal/cleanable/dirt,
/obj/effect/spawner/random/trash/graffiti,
Expand Down Expand Up @@ -44808,6 +44789,29 @@
/obj/structure/table/wood/fancy/black,
/turf/open/floor/carpet,
/area/station/service/chapel)
"oTl" = (
/obj/effect/turf_decal/trimline/green/filled/line,
/obj/structure/table/glass,
/obj/item/healthanalyzer,
/obj/item/clothing/glasses/hud/health,
/obj/item/clothing/gloves/latex,
/obj/item/storage/box/beakers,
/obj/item/storage/box/syringes{
pixel_x = 4;
pixel_y = 4
},
/obj/item/storage/box/tube{
pixel_y = 4;
pixel_x = -2
},
/obj/machinery/firealarm/directional/south,
/obj/item/storage/box/monkeycubes/mousecubes,
/obj/item/storage/box/monkeycubes/mousecubes{
pixel_x = 6;
pixel_y = 4
},
/turf/open/floor/iron/white,
/area/station/medical/virology)
"oTy" = (
/obj/effect/turf_decal/trimline/red/filled/line,
/obj/effect/turf_decal/trimline/red/line{
Expand Down Expand Up @@ -46930,6 +46934,17 @@
/obj/structure/chair,
/turf/open/floor/iron/dark,
/area/station/service/chapel/office)
"pDL" = (
/obj/structure/rack,
/obj/item/mop,
/obj/item/reagent_containers/cup/bottle/ammonia,
/obj/item/tank/internals/emergency_oxygen,
/obj/item/clothing/mask/breath,
/obj/item/storage/box/lights/mixed{
pixel_x = 7
},
/turf/open/floor/plating,
/area/station/security/prison)
"pDN" = (
/obj/effect/turf_decal/tile/neutral/fourcorners,
/obj/structure/sign/warning/radiation/directional/east,
Expand Down Expand Up @@ -58034,13 +58049,6 @@
dir = 1
},
/area/station/security/prison/workout)
"ttC" = (
/obj/structure/window/reinforced/tinted{
dir = 4
},
/obj/item/kirbyplants/random/dead,
/turf/open/floor/iron/vaporwave,
/area/station/command/heads_quarters/rd)
"ttD" = (
/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{
dir = 1
Expand Down Expand Up @@ -90948,7 +90956,7 @@ qgq
cbB
uoF
iBo
hLe
pDL
ybj
ksa
xXP
Expand Down Expand Up @@ -91203,7 +91211,7 @@ xAx
jou
rDd
lfm
bhf
eNH
bhf
lBB
ybj
Expand Down Expand Up @@ -95555,7 +95563,7 @@ kFk
apg
vIP
uQv
mtq
kqX
mcU
jhR
ybm
Expand Down Expand Up @@ -110266,7 +110274,7 @@ jEw
mVt
yjH
dUx
ttC
mDz
kaP
qvC
mkl
Expand Down Expand Up @@ -111099,7 +111107,7 @@ gCT
exJ
gzt
fJd
caj
oTl
oqK
oqK
oqK
Expand Down Expand Up @@ -111877,7 +111885,7 @@ mGb
sNb
lYg
mGb
iIn
ilj
oqK
wGN
nCa
Expand Down
Loading

0 comments on commit ec95c58

Please sign in to comment.