cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2026-08-27 23:29:10 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #882 from KillianKirilenko/kk-mapfixes

Browse Source 
Bar/Kitchen Piping Fixes
This commit is contained in:
Izac Joof Forsgren
2020-07-19 14:16:32 +02:00
committed by GitHub
parent 7fa2a0ffb1 e989500e6b
commit 1cfeb46bbb
1 changed files with 35 additions and 63 deletions
Download Patch File Download Diff File Expand all files Collapse all files
maps/yw/cryogaia-05-main.dmm
+35 -63
View File
@@ -19741,7 +19741,6 @@
/area/crew_quarters/kitchen)
"aLm" = (
/obj/effect/floor_decal/corner/grey/diagonal,
/obj/machinery/atmospherics/unary/vent_scrubber/on,
/obj/structure/table/standard,
/obj/machinery/microwave,
/turf/simulated/floor/tiled/white,
@@ -20524,6 +20523,9 @@
/obj/item/weapon/reagent_containers/glass/beaker{
pixel_x = 5
},
/obj/machinery/atmospherics/unary/vent_pump/on{
dir = 1
},
/turf/simulated/floor/tiled/white,
/area/crew_quarters/kitchen)
"aNa" = (
@@ -20539,6 +20541,7 @@
pixel_y = 25
},
/obj/machinery/cooker/grill,
/obj/machinery/atmospherics/unary/vent_scrubber/on,
/turf/simulated/floor/tiled/white,
/area/crew_quarters/kitchen)
"aNb" = (
@@ -21427,7 +21430,7 @@
/obj/machinery/light{
dir = 1
},
/obj/machinery/atmospherics/unary/vent_scrubber/on,
/obj/machinery/atmospherics/unary/vent_pump/on,
/turf/simulated/floor/tiled/white,
/area/crew_quarters/kitchen)
"aOE" = (
@@ -21444,12 +21447,10 @@
pixel_y = 21
},
/obj/effect/floor_decal/corner/grey/diagonal,
/obj/machinery/atmospherics/unary/vent_pump/on,
/turf/simulated/floor/tiled/white,
/area/crew_quarters/kitchen)
"aOG" = (
/obj/effect/floor_decal/corner/grey/diagonal,
/obj/machinery/atmospherics/unary/vent_scrubber/on,
/obj/machinery/firealarm{
dir = 2;
layer = 3.3;
@@ -21471,11 +21472,15 @@
pixel_x = 8;
pixel_y = 25
},
/obj/machinery/atmospherics/unary/vent_scrubber/on,
/turf/simulated/floor/tiled/white,
/area/crew_quarters/kitchen)
"aOI" = (
/obj/effect/floor_decal/corner/grey/diagonal,
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
dir = 10
},
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
/turf/simulated/floor/tiled/white,
/area/crew_quarters/kitchen)
"aOJ" = (
@@ -21491,11 +21496,6 @@
/obj/effect/floor_decal/corner/grey/diagonal,
/turf/simulated/floor/tiled/white,
/area/crew_quarters/kitchen)
"aOL" = (
/obj/effect/floor_decal/corner/grey/diagonal,
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
/turf/simulated/floor/tiled/white,
/area/crew_quarters/kitchen)
"aOM" = (
/obj/effect/wingrille_spawn/reinforced,
/turf/simulated/floor/tiled/steel,
@@ -21942,9 +21942,6 @@
pixel_x = 28;
pixel_y = 4
},
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
dir = 10
},
/turf/simulated/floor/wood,
/area/crew_quarters/bar)
"aPz" = (
@@ -21969,22 +21966,14 @@
c_tag = "Kitchen West";
dir = 4
},
/turf/simulated/floor/tiled/white,
/area/crew_quarters/kitchen)
"aPC" = (
/obj/effect/floor_decal/corner/grey/diagonal,
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
dir = 9
},
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
/turf/simulated/floor/tiled/white,
/area/crew_quarters/kitchen)
"aPD" = (
/obj/machinery/cooker/candy,
/obj/effect/floor_decal/corner/grey/diagonal,
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
dir = 6
},
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
/turf/simulated/floor/tiled/white,
/area/crew_quarters/kitchen)
"aPE" = (
@@ -22465,11 +22454,6 @@
/obj/machinery/chem_master/condimaster,
/turf/simulated/floor/wood,
/area/crew_quarters/bar)
"aQA" = (
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
/turf/simulated/floor/wood,
/area/crew_quarters/bar)
"aQB" = (
/obj/structure/table/woodentable,
/obj/item/weapon/storage/box/beanbags,
@@ -22478,10 +22462,10 @@
info = "This permit signifies that the Bartender is permitted to posess this firearm in the bar, and ONLY the bar. Failure to adhere to this permit will result in confiscation of the weapon and possibly arrest.";
name = "Shotgun permit"
},
/obj/machinery/atmospherics/unary/vent_scrubber/on{
dir = 1
},
/obj/machinery/light,
/obj/machinery/atmospherics/unary/vent_scrubber/on{
dir = 8
},
/turf/simulated/floor/wood,
/area/crew_quarters/bar)
"aQC" = (
@@ -23660,12 +23644,6 @@
},
/turf/simulated/floor/tiled/freezer,
/area/crew_quarters/barrestroom)
"aSI" = (
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
dir = 6
},
/turf/simulated/floor/tiled/freezer,
/area/crew_quarters/barrestroom)
"aSJ" = (
/obj/machinery/computer/security,
/obj/effect/floor_decal/industrial/outline/grey,
@@ -23740,9 +23718,7 @@
/obj/structure/mirror{
pixel_x = 28
},
/obj/machinery/atmospherics/unary/vent_scrubber/on{
dir = 8
},
/obj/machinery/atmospherics/unary/vent_scrubber/on,
/turf/simulated/floor/tiled/freezer,
/area/crew_quarters/barrestroom)
"aSS" = (
@@ -27364,12 +27340,6 @@
d2 = 8;
icon_state = "4-8"
},
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
dir = 5
},
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
dir = 6
},
/turf/simulated/floor/tiled/freezer,
/area/crew_quarters/barrestroom)
"aZf" = (
@@ -27906,12 +27876,7 @@
d2 = 8;
icon_state = "2-8"
},
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
dir = 10
},
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
dir = 10
},
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
/turf/simulated/floor/tiled/freezer,
/area/crew_quarters/barrestroom)
"aZZ" = (
@@ -31552,13 +31517,13 @@
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
dir = 5
},
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
dir = 5
},
/obj/machinery/alarm{
dir = 1;
pixel_y = -25
},
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
dir = 4
},
/turf/simulated/floor/tiled/freezer,
/area/crew_quarters/barrestroom)
"bgd" = (
@@ -31809,14 +31774,14 @@
},
/area/security/lobby)
"bgA" = (
/obj/machinery/atmospherics/unary/vent_pump/on{
dir = 1
},
/obj/item/device/radio/intercom{
dir = 8;
name = "Station Intercom (General)";
pixel_x = -21
},
/obj/machinery/atmospherics/unary/vent_pump/on{
dir = 4
},
/turf/simulated/floor/tiled/freezer,
/area/crew_quarters/barrestroom)
"bgB" = (
@@ -33009,6 +32974,9 @@
dir = 1;
pixel_y = -30
},
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
dir = 5
},
/turf/simulated/floor/tiled/white,
/area/crew_quarters/kitchen)
"biQ" = (
@@ -64287,6 +64255,10 @@
},
/turf/simulated/floor/tiled/techfloor,
/area/shuttle/security)
"keJ" = (
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
/turf/simulated/floor/wood,
/area/crew_quarters/bar)
"kfm" = (
/obj/structure/table/rack,
/obj/item/clothing/mask/breath,
@@ -99966,7 +99938,7 @@ bkj
bkl
aPs
aRv
aSI
aYO
aZe
bgA
bhu
@@ -100969,8 +100941,8 @@ aHp
aMW
aNH
aOA
keJ
aPx
aQA
aRA
aSN
aTQ
@@ -102478,9 +102450,9 @@ arq
aBb
aOC
aPz
aOL
aOL
aPC
aPz
aPz
aPz
aQC
aOE
aRD