Merge pull request #3912 from Citadel-Station-13/upstream-merge-32482

[MIRROR] Improves the deep fryer
This commit is contained in:
LetterJay
2017-11-15 11:13:56 -06:00
committed by GitHub
22 changed files with 187 additions and 62 deletions
+12 -4
View File
@@ -15141,6 +15141,9 @@
req_access_txt = "28"
},
/obj/effect/turf_decal/delivery,
/obj/structure/window/reinforced{
dir = 8
},
/turf/open/floor/plasteel,
/area/crew_quarters/kitchen)
"aKW" = (
@@ -15604,9 +15607,6 @@
/obj/machinery/chem_master/condimaster{
name = "CondiMaster Neo"
},
/obj/machinery/camera{
c_tag = "Kitchen Cold Room"
},
/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden{
dir = 8
},
@@ -60595,6 +60595,14 @@
/obj/item/device/flashlight,
/turf/open/floor/plasteel/black,
/area/engine/engineering)
"QoL" = (
/obj/machinery/camera{
c_tag = "Kitchen Cold Room"
},
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
/obj/structure/reagent_dispensers/cooking_oil,
/turf/open/floor/plasteel/showroomfloor,
/area/crew_quarters/kitchen)
(1,1,1) = {"
aaa
@@ -99259,7 +99267,7 @@ alP
aGL
aHY
aQj
aQj
QoL
aMk
aNK
aOM
@@ -21904,14 +21904,10 @@
/turf/open/floor/plasteel,
/area/crew_quarters/kitchen)
"aWJ" = (
/obj/structure/sink/kitchen{
desc = "A sink used for washing one's hands and face. It looks rusty and home-made";
name = "sink";
pixel_y = 28
},
/obj/effect/turf_decal/stripes/line{
dir = 10
},
/obj/structure/reagent_dispensers/cooking_oil,
/turf/open/floor/plasteel,
/area/crew_quarters/kitchen)
"aWK" = (
@@ -53396,6 +53396,7 @@
dir = 4;
pixel_x = 28
},
/obj/structure/reagent_dispensers/cooking_oil,
/turf/open/floor/plasteel/showroomfloor,
/area/crew_quarters/kitchen)
"cgG" = (
@@ -18585,17 +18585,13 @@
/turf/open/floor/plasteel,
/area/crew_quarters/kitchen)
"aIW" = (
/obj/structure/sink/kitchen{
desc = "A sink used for washing one's hands and face. It looks rusty and home-made";
name = "sink";
pixel_y = 28
},
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
dir = 4
},
/obj/effect/turf_decal/stripes/line{
dir = 6
},
/obj/structure/reagent_dispensers/cooking_oil,
/turf/open/floor/plasteel,
/area/crew_quarters/kitchen)
"aIX" = (
@@ -19097,6 +19097,7 @@
dir = 8;
pixel_x = 23
},
/obj/structure/reagent_dispensers/cooking_oil,
/turf/open/floor/plasteel/showroomfloor,
/area/crew_quarters/kitchen)
"aVc" = (