Fixes omega missing a wheat fridge and runtiming pipenets
This commit is contained in:
committed by
CitadelStationBot
parent
f4a817be01
commit
d7975510e4
@@ -1267,9 +1267,6 @@
|
||||
/obj/machinery/atmospherics/pipe/simple/supply/hidden{
|
||||
dir = 4
|
||||
},
|
||||
/obj/machinery/atmospherics/pipe/simple/supply/hidden{
|
||||
dir = 4
|
||||
},
|
||||
/obj/effect/turf_decal/stripes/line{
|
||||
dir = 8
|
||||
},
|
||||
@@ -15170,7 +15167,6 @@
|
||||
/turf/open/floor/plasteel/vault/side,
|
||||
/area/crew_quarters/kitchen)
|
||||
"aCY" = (
|
||||
/obj/structure/closet/secure_closet/freezer/fridge,
|
||||
/obj/machinery/light{
|
||||
dir = 1
|
||||
},
|
||||
@@ -15180,6 +15176,7 @@
|
||||
name = "Kitchen RC";
|
||||
pixel_y = 32
|
||||
},
|
||||
/obj/structure/closet/secure_closet/freezer/kitchen,
|
||||
/turf/open/floor/plasteel/vault/side,
|
||||
/area/crew_quarters/kitchen)
|
||||
"aCZ" = (
|
||||
@@ -29411,6 +29408,7 @@
|
||||
heat_capacity = 1e+006
|
||||
},
|
||||
/area/hallway/primary/central)
|
||||
<<<<<<< HEAD
|
||||
"bgh" = (
|
||||
/obj/effect/landmark/lightsout,
|
||||
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
|
||||
@@ -29418,6 +29416,8 @@
|
||||
},
|
||||
/turf/open/floor/plasteel/neutral/side,
|
||||
/area/hallway/primary/central)
|
||||
=======
|
||||
>>>>>>> 2d5c3d5... Merge pull request #34781 from DaxDupont/please-make-waffles-for=i-am-belgian
|
||||
"bgl" = (
|
||||
/obj/machinery/vending/cola/random,
|
||||
/obj/machinery/newscaster{
|
||||
@@ -77523,7 +77523,7 @@ bed
|
||||
beI
|
||||
bff
|
||||
bfL
|
||||
bgh
|
||||
aYc
|
||||
bgU
|
||||
bhI
|
||||
blv
|
||||
|
||||
Reference in New Issue
Block a user