mirror of
https://github.com/CHOMPStation2/CHOMPStation2.git
synced 2025-12-10 18:22:39 +00:00
Merge pull request #8492 from Rykka-Stormheart/shep-dev-kitchen-pass-dos
Minor Map Changes to Service, Add Second Arcade Machine
This commit is contained in:
@@ -11084,22 +11084,15 @@
|
|||||||
/turf/simulated/floor/tiled/white,
|
/turf/simulated/floor/tiled/white,
|
||||||
/area/crew_quarters/kitchen)
|
/area/crew_quarters/kitchen)
|
||||||
"atg" = (
|
"atg" = (
|
||||||
/obj/structure/cable/green{
|
|
||||||
d1 = 1;
|
|
||||||
d2 = 2;
|
|
||||||
icon_state = "1-2"
|
|
||||||
},
|
|
||||||
/obj/structure/table/standard,
|
|
||||||
/obj/machinery/microwave,
|
|
||||||
/turf/simulated/floor/tiled/white,
|
|
||||||
/area/crew_quarters/kitchen)
|
|
||||||
"ath" = (
|
|
||||||
/obj/structure/sink{
|
/obj/structure/sink{
|
||||||
dir = 4;
|
dir = 8;
|
||||||
icon_state = "sink";
|
icon_state = "sink";
|
||||||
pixel_x = 11;
|
pixel_x = -12;
|
||||||
pixel_y = 0
|
pixel_y = 2
|
||||||
},
|
},
|
||||||
|
/turf/simulated/floor/grass,
|
||||||
|
/area/hydroponics)
|
||||||
|
"ath" = (
|
||||||
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
|
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
|
||||||
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
|
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
|
||||||
/obj/machinery/vending/hydronutrients{
|
/obj/machinery/vending/hydronutrients{
|
||||||
@@ -15089,20 +15082,12 @@
|
|||||||
/turf/simulated/floor/plating,
|
/turf/simulated/floor/plating,
|
||||||
/area/tether/surfacebase/botanystorage)
|
/area/tether/surfacebase/botanystorage)
|
||||||
"azZ" = (
|
"azZ" = (
|
||||||
/obj/effect/floor_decal/corner/beige{
|
/obj/structure/cable/green{
|
||||||
dir = 10
|
d1 = 1;
|
||||||
},
|
d2 = 2;
|
||||||
/obj/effect/floor_decal/corner/beige{
|
icon_state = "1-2"
|
||||||
dir = 9
|
|
||||||
},
|
|
||||||
/obj/effect/floor_decal/spline/plain{
|
|
||||||
dir = 10
|
|
||||||
},
|
|
||||||
/obj/machinery/light{
|
|
||||||
dir = 8;
|
|
||||||
icon_state = "tube1";
|
|
||||||
pixel_y = 0
|
|
||||||
},
|
},
|
||||||
|
/obj/structure/table/standard,
|
||||||
/turf/simulated/floor/tiled/white,
|
/turf/simulated/floor/tiled/white,
|
||||||
/area/crew_quarters/kitchen)
|
/area/crew_quarters/kitchen)
|
||||||
"aAa" = (
|
"aAa" = (
|
||||||
@@ -16130,10 +16115,16 @@
|
|||||||
/turf/simulated/floor/tiled,
|
/turf/simulated/floor/tiled,
|
||||||
/area/rnd/staircase/thirdfloor)
|
/area/rnd/staircase/thirdfloor)
|
||||||
"aBx" = (
|
"aBx" = (
|
||||||
/obj/machinery/disposal,
|
/obj/structure/table/standard,
|
||||||
/obj/structure/disposalpipe/trunk,
|
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
|
||||||
/turf/simulated/floor/wood,
|
dir = 4
|
||||||
/area/crew_quarters/bar)
|
},
|
||||||
|
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
|
||||||
|
dir = 8
|
||||||
|
},
|
||||||
|
/obj/machinery/microwave,
|
||||||
|
/turf/simulated/floor/tiled/white,
|
||||||
|
/area/crew_quarters/kitchen)
|
||||||
"aBy" = (
|
"aBy" = (
|
||||||
/obj/structure/grille,
|
/obj/structure/grille,
|
||||||
/obj/structure/window/reinforced/full,
|
/obj/structure/window/reinforced/full,
|
||||||
@@ -19789,9 +19780,24 @@
|
|||||||
/turf/simulated/floor/tiled,
|
/turf/simulated/floor/tiled,
|
||||||
/area/tether/surfacebase/servicebackroom)
|
/area/tether/surfacebase/servicebackroom)
|
||||||
"aHy" = (
|
"aHy" = (
|
||||||
/obj/machinery/computer/arcade,
|
/obj/effect/floor_decal/corner/beige{
|
||||||
/turf/simulated/floor/wood,
|
dir = 10
|
||||||
/area/crew_quarters/bar)
|
},
|
||||||
|
/obj/effect/floor_decal/corner/beige{
|
||||||
|
dir = 9
|
||||||
|
},
|
||||||
|
/obj/effect/floor_decal/spline/plain{
|
||||||
|
dir = 10
|
||||||
|
},
|
||||||
|
/obj/machinery/light{
|
||||||
|
dir = 8;
|
||||||
|
icon_state = "tube1";
|
||||||
|
pixel_y = 0
|
||||||
|
},
|
||||||
|
/obj/machinery/disposal,
|
||||||
|
/obj/structure/disposalpipe/trunk,
|
||||||
|
/turf/simulated/floor/tiled/white,
|
||||||
|
/area/crew_quarters/kitchen)
|
||||||
"aHz" = (
|
"aHz" = (
|
||||||
/obj/structure/device/piano,
|
/obj/structure/device/piano,
|
||||||
/obj/effect/floor_decal/spline/plain{
|
/obj/effect/floor_decal/spline/plain{
|
||||||
@@ -32693,11 +32699,10 @@
|
|||||||
/turf/simulated/floor/tiled/techmaint,
|
/turf/simulated/floor/tiled/techmaint,
|
||||||
/area/tether/surfacebase/barbackmaintenance)
|
/area/tether/surfacebase/barbackmaintenance)
|
||||||
"bee" = (
|
"bee" = (
|
||||||
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
|
/obj/structure/disposalpipe/segment,
|
||||||
dir = 6
|
/obj/machinery/computer/arcade/orion_trail,
|
||||||
},
|
/turf/simulated/floor/wood,
|
||||||
/turf/simulated/floor/tiled/eris/steel/bar_dance,
|
/area/crew_quarters/bar)
|
||||||
/area/tether/surfacebase/barbackmaintenance)
|
|
||||||
"bef" = (
|
"bef" = (
|
||||||
/obj/machinery/light/small{
|
/obj/machinery/light/small{
|
||||||
dir = 1
|
dir = 1
|
||||||
@@ -33721,23 +33726,9 @@
|
|||||||
/turf/simulated/floor/tiled/eris/steel/bar_dance,
|
/turf/simulated/floor/tiled/eris/steel/bar_dance,
|
||||||
/area/tether/surfacebase/barbackmaintenance)
|
/area/tether/surfacebase/barbackmaintenance)
|
||||||
"bfR" = (
|
"bfR" = (
|
||||||
/obj/structure/bed/chair/comfy/beige{
|
/obj/machinery/computer/arcade/battle,
|
||||||
dir = 8;
|
/turf/simulated/floor/wood,
|
||||||
icon_state = "comfychair"
|
/area/crew_quarters/bar)
|
||||||
},
|
|
||||||
/obj/machinery/button/windowtint{
|
|
||||||
id = "secreet";
|
|
||||||
name = "Window Tint Control";
|
|
||||||
pixel_x = -32;
|
|
||||||
range = 9
|
|
||||||
},
|
|
||||||
/obj/structure/cable/green{
|
|
||||||
d1 = 4;
|
|
||||||
d2 = 8;
|
|
||||||
icon_state = "4-8"
|
|
||||||
},
|
|
||||||
/turf/simulated/floor/tiled/eris/steel/bar_light,
|
|
||||||
/area/tether/surfacebase/barbackmaintenance)
|
|
||||||
"bfS" = (
|
"bfS" = (
|
||||||
/obj/structure/cable/green{
|
/obj/structure/cable/green{
|
||||||
d1 = 1;
|
d1 = 1;
|
||||||
@@ -33913,15 +33904,39 @@
|
|||||||
/turf/simulated/floor/tiled,
|
/turf/simulated/floor/tiled,
|
||||||
/area/tether/surfacebase/servicebackroom)
|
/area/tether/surfacebase/servicebackroom)
|
||||||
"bgj" = (
|
"bgj" = (
|
||||||
/turf/simulated/floor/reinforced,
|
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
|
||||||
|
dir = 6
|
||||||
|
},
|
||||||
|
/obj/machinery/button/windowtint{
|
||||||
|
id = "secreet";
|
||||||
|
name = "Window Tint Control";
|
||||||
|
pixel_x = -32;
|
||||||
|
range = 9
|
||||||
|
},
|
||||||
|
/turf/simulated/floor/tiled/eris/steel/bar_dance,
|
||||||
|
/area/tether/surfacebase/barbackmaintenance)
|
||||||
|
"bgk" = (
|
||||||
/obj/structure/shuttle/engine/propulsion,
|
/obj/structure/shuttle/engine/propulsion,
|
||||||
|
/turf/simulated/floor/reinforced,
|
||||||
/turf/simulated/shuttle/plating/carry,
|
/turf/simulated/shuttle/plating/carry,
|
||||||
/area/shuttle/tether)
|
/area/shuttle/tether)
|
||||||
"bgk" = (
|
"bgl" = (
|
||||||
/turf/simulated/floor/reinforced,
|
/obj/structure/bed/chair/comfy/beige{
|
||||||
|
dir = 8;
|
||||||
|
icon_state = "comfychair"
|
||||||
|
},
|
||||||
|
/obj/structure/cable/green{
|
||||||
|
d1 = 4;
|
||||||
|
d2 = 8;
|
||||||
|
icon_state = "4-8"
|
||||||
|
},
|
||||||
|
/turf/simulated/floor/tiled/eris/steel/bar_light,
|
||||||
|
/area/tether/surfacebase/barbackmaintenance)
|
||||||
|
"bgm" = (
|
||||||
/obj/machinery/atmospherics/unary/engine{
|
/obj/machinery/atmospherics/unary/engine{
|
||||||
dir = 1
|
dir = 1
|
||||||
},
|
},
|
||||||
|
/turf/simulated/floor/reinforced,
|
||||||
/turf/simulated/shuttle/plating/carry,
|
/turf/simulated/shuttle/plating/carry,
|
||||||
/area/shuttle/tourbus/engines)
|
/area/shuttle/tourbus/engines)
|
||||||
"bgn" = (
|
"bgn" = (
|
||||||
@@ -33936,16 +33951,6 @@
|
|||||||
},
|
},
|
||||||
/turf/simulated/floor/tiled/white,
|
/turf/simulated/floor/tiled/white,
|
||||||
/area/crew_quarters/kitchen)
|
/area/crew_quarters/kitchen)
|
||||||
"bgo" = (
|
|
||||||
/obj/structure/table/standard,
|
|
||||||
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
|
|
||||||
dir = 4
|
|
||||||
},
|
|
||||||
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
|
|
||||||
dir = 8
|
|
||||||
},
|
|
||||||
/turf/simulated/floor/tiled/white,
|
|
||||||
/area/crew_quarters/kitchen)
|
|
||||||
"bgp" = (
|
"bgp" = (
|
||||||
/obj/effect/floor_decal/corner/grey/diagonal,
|
/obj/effect/floor_decal/corner/grey/diagonal,
|
||||||
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
|
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
|
||||||
@@ -48285,7 +48290,7 @@ jML
|
|||||||
jHw
|
jHw
|
||||||
jpB
|
jpB
|
||||||
qWU
|
qWU
|
||||||
bgk
|
bgm
|
||||||
aKU
|
aKU
|
||||||
aOI
|
aOI
|
||||||
aPb
|
aPb
|
||||||
@@ -49137,7 +49142,7 @@ caw
|
|||||||
jHw
|
jHw
|
||||||
gHh
|
gHh
|
||||||
qWU
|
qWU
|
||||||
bgk
|
bgm
|
||||||
aKU
|
aKU
|
||||||
aOI
|
aOI
|
||||||
aPb
|
aPb
|
||||||
@@ -51122,7 +51127,7 @@ aNk
|
|||||||
uSA
|
uSA
|
||||||
aNJ
|
aNJ
|
||||||
aNP
|
aNP
|
||||||
bgj
|
bgk
|
||||||
aKU
|
aKU
|
||||||
abg
|
abg
|
||||||
aOk
|
aOk
|
||||||
@@ -51264,7 +51269,7 @@ aNl
|
|||||||
aNl
|
aNl
|
||||||
aNK
|
aNK
|
||||||
aNP
|
aNP
|
||||||
bgj
|
bgk
|
||||||
aKU
|
aKU
|
||||||
abg
|
abg
|
||||||
aOk
|
aOk
|
||||||
@@ -51406,7 +51411,7 @@ aNm
|
|||||||
aNl
|
aNl
|
||||||
aNK
|
aNK
|
||||||
aNP
|
aNP
|
||||||
bgj
|
bgk
|
||||||
aKU
|
aKU
|
||||||
abg
|
abg
|
||||||
aOk
|
aOk
|
||||||
@@ -51667,8 +51672,8 @@ avD
|
|||||||
awc
|
awc
|
||||||
avi
|
avi
|
||||||
aCX
|
aCX
|
||||||
azZ
|
aHy
|
||||||
aBx
|
bee
|
||||||
aCT
|
aCT
|
||||||
aIl
|
aIl
|
||||||
aHs
|
aHs
|
||||||
@@ -51972,7 +51977,7 @@ aAl
|
|||||||
aId
|
aId
|
||||||
bdA
|
bdA
|
||||||
ayM
|
ayM
|
||||||
bee
|
bgj
|
||||||
bek
|
bek
|
||||||
bfo
|
bfo
|
||||||
bfN
|
bfN
|
||||||
@@ -52086,7 +52091,7 @@ bgc
|
|||||||
asD
|
asD
|
||||||
bev
|
bev
|
||||||
beG
|
beG
|
||||||
atg
|
azZ
|
||||||
atJ
|
atJ
|
||||||
atQ
|
atQ
|
||||||
bfd
|
bfd
|
||||||
@@ -52372,7 +52377,7 @@ aCq
|
|||||||
beH
|
beH
|
||||||
atM
|
atM
|
||||||
atL
|
atL
|
||||||
bgo
|
aBx
|
||||||
bfn
|
bfn
|
||||||
aLc
|
aLc
|
||||||
avo
|
avo
|
||||||
@@ -52387,7 +52392,7 @@ aLd
|
|||||||
bbT
|
bbT
|
||||||
bcm
|
bcm
|
||||||
aAG
|
aAG
|
||||||
aHy
|
bfR
|
||||||
aGK
|
aGK
|
||||||
ayc
|
ayc
|
||||||
bdZ
|
bdZ
|
||||||
@@ -52685,7 +52690,7 @@ ayM
|
|||||||
bef
|
bef
|
||||||
beo
|
beo
|
||||||
bfD
|
bfD
|
||||||
bfR
|
bgl
|
||||||
bfK
|
bfK
|
||||||
bfU
|
bfU
|
||||||
aac
|
aac
|
||||||
@@ -53631,7 +53636,7 @@ acV
|
|||||||
axs
|
axs
|
||||||
ayK
|
ayK
|
||||||
ash
|
ash
|
||||||
aop
|
atg
|
||||||
aSy
|
aSy
|
||||||
aop
|
aop
|
||||||
aop
|
aop
|
||||||
|
|||||||
Reference in New Issue
Block a user