cyberpresidentvanellope/VOREStation
1
0
Fork 0
mirror of https://github.com/VOREStation/VOREStation.git synced 2026-08-26 05:27:39 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #5908 from Little-119/medbay-disposals

Browse Source 
Fixes the broken disposal bin in the morgue, adds some more disposal bins to the medbay
This commit is contained in:
Novacat
2019-09-19 10:51:48 -04:00
committed by GitHub
parent dfd9199d17 5be6d9399b
commit cee087bda9
2 changed files with 128 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
maps/tether/tether-06-station2.dmm
+96 -7
View File
@@ -10899,6 +10899,10 @@
/obj/effect/floor_decal/techfloor{
dir = 9
},
/obj/structure/disposalpipe/segment{
dir = 4;
icon_state = "pipe-c"
},
/turf/simulated/floor/tiled/techfloor,
/area/medical/morgue)
"qa" = (
@@ -11329,6 +11333,9 @@
/obj/effect/floor_decal/techfloor{
dir = 1
},
/obj/structure/disposalpipe/segment{
dir = 4
},
/turf/simulated/floor/tiled/techfloor,
/area/medical/morgue)
"qE" = (
@@ -11336,6 +11343,9 @@
/obj/effect/floor_decal/techfloor{
dir = 5
},
/obj/structure/disposalpipe/trunk{
dir = 8
},
/turf/simulated/floor/tiled/techfloor,
/area/medical/morgue)
"qF" = (
@@ -12326,6 +12336,9 @@
pixel_x = -4;
pixel_y = 26
},
/obj/structure/disposalpipe/segment{
dir = 4
},
/turf/simulated/floor/tiled/white,
/area/medical/surgery_hallway)
"sk" = (
@@ -12336,6 +12349,10 @@
/obj/effect/floor_decal/techfloor{
dir = 1
},
/obj/structure/disposalpipe/segment{
dir = 4;
icon_state = "pipe-c"
},
/turf/simulated/floor/tiled/techfloor,
/area/medical/morgue)
"sl" = (
@@ -12348,6 +12365,9 @@
/obj/effect/floor_decal/techfloor/corner{
dir = 1
},
/obj/structure/disposalpipe/segment{
dir = 4
},
/turf/simulated/floor/tiled/techfloor,
/area/medical/morgue)
"sm" = (
@@ -12361,6 +12381,9 @@
/obj/effect/floor_decal/techfloor/corner{
dir = 4
},
/obj/structure/disposalpipe/segment{
dir = 4
},
/turf/simulated/floor/tiled/techfloor,
/area/medical/morgue)
"sn" = (
@@ -12375,6 +12398,9 @@
/obj/effect/floor_decal/techfloor{
dir = 1
},
/obj/structure/disposalpipe/segment{
dir = 4
},
/turf/simulated/floor/tiled/techfloor,
/area/medical/morgue)
"so" = (
@@ -12388,6 +12414,9 @@
/obj/effect/floor_decal/techfloor{
dir = 1
},
/obj/structure/disposalpipe/segment{
dir = 4
},
/turf/simulated/floor/tiled/techfloor,
/area/medical/morgue)
"sp" = (
@@ -12530,6 +12559,10 @@
/obj/effect/floor_decal/techfloor/corner{
dir = 1
},
/obj/structure/disposalpipe/segment{
dir = 8;
icon_state = "pipe-c"
},
/turf/simulated/floor/tiled/techfloor,
/area/medical/morgue)
"sD" = (
@@ -12618,7 +12651,6 @@
d2 = 4;
icon_state = "2-4"
},
/obj/structure/disposalpipe/segment,
/obj/machinery/atmospherics/pipe/manifold/hidden/supply{
dir = 8
},
@@ -12631,6 +12663,10 @@
/obj/effect/floor_decal/steeldecal/steel_decals4{
dir = 4
},
/obj/structure/disposalpipe/junction{
dir = 2;
icon_state = "pipe-j2"
},
/turf/simulated/floor/tiled/white,
/area/medical/surgery_hallway)
"sL" = (
@@ -12663,6 +12699,9 @@
icon_state = "intact-scrubbers";
dir = 4
},
/obj/structure/disposalpipe/segment{
dir = 4
},
/turf/simulated/floor/tiled/white,
/area/medical/morgue)
"sN" = (
@@ -12682,6 +12721,10 @@
dir = 1
},
/obj/effect/floor_decal/techfloor,
/obj/structure/disposalpipe/segment{
dir = 8;
icon_state = "pipe-c"
},
/turf/simulated/floor/tiled/techfloor,
/area/medical/morgue)
"sO" = (
@@ -20640,6 +20683,18 @@
"Gw" = (
/turf/simulated/floor/tiled/dark,
/area/security/brig)
"GF" = (
/obj/effect/floor_decal/borderfloorwhite/corner{
dir = 4
},
/obj/effect/floor_decal/corner/paleblue/bordercorner{
dir = 4
},
/obj/structure/disposalpipe/segment{
dir = 4
},
/turf/simulated/floor/tiled/white,
/area/medical/surgery_hallway)
"GG" = (
/obj/machinery/atmospherics/unary/vent_scrubber/on,
/obj/structure/table/steel,
@@ -20894,6 +20949,20 @@
},
/turf/simulated/floor/tiled,
/area/security/security_cell_hallway)
"JF" = (
/obj/structure/cable/green{
d1 = 1;
d2 = 2;
icon_state = "1-2"
},
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
/obj/structure/disposalpipe/junction{
icon_state = "pipe-j2";
dir = 2
},
/turf/simulated/floor/tiled/white,
/area/medical/surgery_hallway)
"JH" = (
/obj/structure/grille,
/obj/structure/window/reinforced/full,
@@ -20973,6 +21042,13 @@
/obj/item/roller,
/turf/simulated/floor,
/area/maintenance/station/sec_lower)
"KV" = (
/obj/effect/floor_decal/techfloor{
dir = 8
},
/obj/structure/disposalpipe/segment,
/turf/simulated/floor/tiled/techfloor,
/area/medical/morgue)
"Ld" = (
/obj/machinery/door/firedoor/glass,
/obj/structure/cable/green{
@@ -21648,6 +21724,19 @@
},
/turf/simulated/floor/tiled,
/area/security/security_cell_hallway)
"QK" = (
/obj/effect/floor_decal/borderfloorwhite{
dir = 1
},
/obj/effect/floor_decal/corner/paleblue/border{
dir = 1
},
/obj/structure/disposalpipe/trunk{
dir = 8
},
/obj/machinery/disposal,
/turf/simulated/floor/tiled/white,
/area/medical/surgery_hallway)
"QN" = (
/obj/structure/closet,
/obj/item/clothing/shoes/boots/winter/medical,
@@ -32769,7 +32858,7 @@ zg
ts
ts
Aa
ts
JF
Az
ts
Bd
@@ -32911,7 +33000,7 @@ wd
wD
tS
Ab
Al
GF
AA
rw
Be
@@ -33053,7 +33142,7 @@ zh
xx
xx
Ac
Am
QK
AA
AM
Bf
@@ -33888,9 +33977,9 @@ ac
ac
uW
pZ
rn
rn
rn
KV
KV
KV
sC
tj
tv
maps/tether/tether-07-station3.dmm
+32 -4
View File
@@ -22503,6 +22503,10 @@
icon_state = "intact";
dir = 4
},
/obj/structure/disposalpipe/segment{
dir = 4;
icon_state = "pipe-c"
},
/turf/simulated/floor/tiled/white,
/area/medical/medbay_primary_storage)
"II" = (
@@ -22526,6 +22530,9 @@
dir = 10
},
/obj/effect/floor_decal/steeldecal/steel_decals4,
/obj/structure/disposalpipe/segment{
dir = 4
},
/turf/simulated/floor/tiled/white,
/area/medical/medbay_primary_storage)
"IJ" = (
@@ -22550,6 +22557,9 @@
icon_state = "intact";
dir = 4
},
/obj/structure/disposalpipe/segment{
dir = 4
},
/turf/simulated/floor/tiled/white,
/area/medical/medbay_primary_storage)
"IK" = (
@@ -22575,6 +22585,9 @@
/obj/effect/floor_decal/steeldecal/steel_decals4{
dir = 6
},
/obj/structure/disposalpipe/segment{
dir = 4
},
/turf/simulated/floor/tiled/white,
/area/medical/sleeper)
"IL" = (
@@ -22594,6 +22607,9 @@
icon_state = "intact";
dir = 4
},
/obj/structure/disposalpipe/segment{
dir = 4
},
/turf/simulated/floor/tiled/white,
/area/medical/sleeper)
"IM" = (
@@ -22613,6 +22629,9 @@
icon_state = "intact";
dir = 4
},
/obj/structure/disposalpipe/segment{
dir = 4
},
/turf/simulated/floor/tiled/white,
/area/medical/sleeper)
"IN" = (
@@ -22623,11 +22642,11 @@
icon_state = "map-scrubbers";
dir = 4
},
/obj/structure/disposalpipe/segment,
/obj/machinery/atmospherics/pipe/simple/hidden/cyan{
icon_state = "intact";
dir = 4
},
/obj/structure/disposalpipe/junction,
/turf/simulated/floor/tiled/white,
/area/medical/sleeper)
"IO" = (
@@ -22923,6 +22942,10 @@
/obj/effect/floor_decal/corner/paleblue/border,
/obj/effect/floor_decal/borderfloorwhite/corner2,
/obj/effect/floor_decal/corner/paleblue/bordercorner2,
/obj/machinery/disposal,
/obj/structure/disposalpipe/trunk{
dir = 1
},
/turf/simulated/floor/tiled/white,
/area/medical/medbay_primary_storage)
"Jt" = (
@@ -23918,6 +23941,10 @@
/obj/effect/floor_decal/corner/paleblue/bordercorner2{
dir = 8
},
/obj/structure/disposalpipe/trunk{
dir = 1
},
/obj/machinery/disposal,
/turf/simulated/floor/tiled/white,
/area/medical/sleeper)
"Lf" = (
@@ -24658,15 +24685,16 @@
icon_state = "intact-scrubbers";
dir = 4
},
/obj/structure/disposalpipe/segment{
dir = 4
},
/obj/effect/floor_decal/steeldecal/steel_decals4{
dir = 1
},
/obj/effect/floor_decal/steeldecal/steel_decals4{
dir = 6
},
/obj/structure/disposalpipe/junction{
icon_state = "pipe-j1";
dir = 4
},
/turf/simulated/floor/tiled/white,
/area/medical/sleeper)
"Mq" = (