Merge pull request #13881 from BlueWildrose/APubbyChristmas

A Pubby Christmas
This commit is contained in:
silicons
2020-12-27 05:50:38 -07:00
committed by GitHub
+16 -10
View File
@@ -807,6 +807,11 @@
},
/turf/open/floor/plasteel/cafeteria,
/area/crew_quarters/fitness/pool)
"abU" = (
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
/obj/effect/landmark/xmastree,
/turf/open/floor/plasteel/dark,
/area/crew_quarters/bar)
"abV" = (
/obj/effect/turf_decal/stripes/corner,
/turf/open/floor/plasteel/white,
@@ -824,6 +829,13 @@
"abY" = (
/turf/open/floor/plasteel/white,
/area/ai_monitored/turret_protected/ai)
"abZ" = (
/obj/structure/flora/ausbushes/ywflowers,
/obj/structure/flora/ausbushes/ppflowers,
/obj/structure/flora/ausbushes/sparsegrass,
/obj/effect/landmark/xmastree,
/turf/open/floor/grass,
/area/hydroponics/garden/monastery)
"acc" = (
/obj/effect/turf_decal/stripes/line{
dir = 4
@@ -47489,12 +47501,6 @@
},
/turf/open/floor/plasteel/dark,
/area/chapel/main/monastery)
"cgj" = (
/obj/structure/flora/ausbushes/ywflowers,
/obj/structure/flora/ausbushes/ppflowers,
/obj/structure/flora/ausbushes/sparsegrass,
/turf/open/floor/grass,
/area/hydroponics/garden/monastery)
"cgk" = (
/obj/structure/flora/ausbushes/ywflowers,
/obj/structure/flora/ausbushes/sparsegrass,
@@ -79792,7 +79798,7 @@ cuE
cgK
cgJ
cgH
cgj
abZ
cvj
bWV
cfn
@@ -94890,7 +94896,7 @@ aYg
aZd
beB
bbq
beB
abU
bdx
beB
bft
@@ -110827,7 +110833,7 @@ bcQ
aaa
aaa
aaa
abN
bBW
aaa
aEj
aEj
@@ -111084,7 +111090,7 @@ bcQ
aaa
aaa
aaa
aaa
cFB
aaa
aEl
bnl