Adds new cafe garden (take two) (#14430)

code/game/objects/structures/flora.dm

@@ -2,7 +2,7 @@
 /obj/structure/flora/tree
 	name = "tree"
 	anchored = 1
-	density = 1
+	density = TRUE
 	pixel_x = -16
 	layer = 9
 
@@ -45,6 +45,22 @@
 	pixel_x = -32
 	icon = 'icons/obj/flora/jungletreesmall.dmi'
 
+/obj/structure/flora/tree/jungle/small/patience
+	layer = 3
+	density = FALSE
+	icon_state = "patiencebottom"
+
+/obj/structure/flora/tree/jungle/small/patience_top
+	pixel_y = -32
+	density = TRUE
+	icon_state = "patiencetop"
+
+/obj/structure/flora/tree/jungle/small/patience/Initialize()
+	. = ..()
+	var/turf/T = get_step(src, NORTH)
+	if(T)
+		new /obj/structure/flora/tree/jungle/small/patience_top(T)
+
 //Jungle grass
 /obj/structure/flora/grass/jungle
 	name = "jungle grass"

html/changelogs/doc - new cafe garden+stargazer move.yml

@@ -0,0 +1,42 @@
+################################
+# Example Changelog File
+#
+# Note: This file, and files beginning with ".", and files that don't end in ".yml" will not be read. If you change this file, you will look really dumb.
+#
+# Your changelog will be merged with a master changelog. (New stuff added only, and only on the date entry for the day it was merged.)
+# When it is, any changes listed below will disappear.
+#
+# Valid Prefixes:
+#   bugfix
+#   wip (For works in progress)
+#   tweak
+#   soundadd
+#   sounddel
+#   rscadd (general adding of nice things)
+#   rscdel (general deleting of nice things)
+#   imageadd
+#   imagedel
+#   maptweak
+#   spellcheck (typo fixes)
+#   experiment
+#   balance
+#   admin
+#   backend
+#   security
+#   refactor
+#################################
+
+# Your name.
+author: Doc
+
+# Optional: Remove this file after generating master changelog.  Useful for PR changelogs that won't get used again.
+delete-after: True
+
+# Any changes you've made.  See valid prefix list above.
+# INDENT WITH TWO SPACES.  NOT TABS.  SPACES.
+# SCREW THIS UP AND IT WON'T WORK.
+# Also, all entries are changed into a single [] after a master changelog generation. Just remove the brackets when you add new entries.
+# Please surround your changes in  double quotes ("), as certain characters otherwise screws up compiling. The quotes will not show up in the changelog.
+changes:
+  - maptweak: "Added a new garden area attached to the third deck cafe, featuring Patience."
+  - maptweak: "Moved Stargazer to the central ring."

maps/sccv_horizon/sccv_horizon-2_deck_2.dmm

@@ -196,14 +196,6 @@
 /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
 /turf/simulated/floor/wood,
 /area/horizon/library)
-"aeT" = (
-/obj/structure/window/reinforced{
-	dir = 8
-	},
-/obj/structure/window/reinforced,
-/obj/structure/flora/ausbushes/lavendergrass,
-/turf/simulated/floor/grass/alt,
-/area/hallway/primary/central_two)
 "afe" = (
 /obj/machinery/light/small/red{
 	dir = 4
@@ -1862,11 +1854,10 @@
 /turf/simulated/floor/plating,
 /area/engineering/engine_room)
 "aST" = (
-/obj/structure/window/reinforced{
+/obj/effect/floor_decal/spline/plain/cee{
 	dir = 4
 	},
-/obj/structure/flora/ausbushes/lavendergrass,
-/turf/simulated/floor/grass/alt,
+/turf/simulated/floor/carpet/rubber,
 /area/hallway/primary/central_two)
 "aSV" = (
 /obj/effect/floor_decal/corner/blue{
@@ -2973,14 +2964,6 @@
 	},
 /turf/simulated/floor/wood,
 /area/chapel/main)
-"bve" = (
-/obj/structure/window/reinforced{
-	dir = 4
-	},
-/obj/structure/window/reinforced,
-/obj/structure/flora/ausbushes/lavendergrass,
-/turf/simulated/floor/grass/alt,
-/area/hallway/primary/central_two)
 "bvV" = (
 /obj/structure/plasticflaps/airtight,
 /obj/machinery/door/window/westleft{
@@ -9728,16 +9711,6 @@
 /obj/effect/floor_decal/industrial/outline/yellow,
 /turf/simulated/floor/reinforced,
 /area/storage/secure)
-"fsb" = (
-/obj/structure/window/reinforced{
-	dir = 4
-	},
-/obj/structure/window/reinforced{
-	dir = 1
-	},
-/obj/structure/flora/ausbushes/lavendergrass,
-/turf/simulated/floor/grass/alt,
-/area/hallway/primary/central_two)
 "fsf" = (
 /obj/structure/lattice/catwalk/indoor/grate,
 /turf/simulated/floor/plating,
@@ -11525,6 +11498,7 @@
 /obj/effect/floor_decal/spline/fancy{
 	dir = 1
 	},
+/obj/structure/railing/mapped,
 /turf/simulated/floor/reinforced,
 /area/hallway/primary/central_two)
 "glt" = (
@@ -12293,6 +12267,9 @@
 /obj/effect/floor_decal/spline/fancy{
 	dir = 8
 	},
+/obj/structure/railing/mapped{
+	dir = 4
+	},
 /turf/simulated/floor/reinforced,
 /area/hallway/primary/central_two)
 "gDq" = (
@@ -13464,14 +13441,11 @@
 /turf/simulated/floor/plating,
 /area/maintenance/wing/port)
 "hjG" = (
-/obj/structure/window/reinforced{
-	dir = 8
+/obj/structure/lattice/catwalk/indoor/grate,
+/turf/simulated/floor/bluegrid{
+	name = "cooled mainframe floor";
+	temperature = 278
 	},
-/obj/structure/window/reinforced{
-	dir = 1
-	},
-/obj/structure/flora/ausbushes/lavendergrass,
-/turf/simulated/floor/grass/alt,
 /area/hallway/primary/central_two)
 "hjI" = (
 /obj/machinery/door/firedoor,
@@ -13618,6 +13592,9 @@
 /obj/effect/floor_decal/spline/fancy{
 	dir = 4
 	},
+/obj/structure/railing/mapped{
+	dir = 8
+	},
 /turf/simulated/floor/reinforced,
 /area/hallway/primary/central_two)
 "hoa" = (
@@ -14947,6 +14924,9 @@
 /obj/effect/floor_decal/spline/fancy{
 	dir = 8
 	},
+/obj/structure/railing/mapped{
+	dir = 4
+	},
 /turf/simulated/floor/reinforced,
 /area/hallway/primary/central_two)
 "ibx" = (
@@ -16878,6 +16858,9 @@
 	dir = 1
 	},
 /obj/effect/floor_decal/spline/fancy,
+/obj/structure/railing/mapped{
+	dir = 1
+	},
 /turf/simulated/floor/reinforced,
 /area/hallway/primary/central_two)
 "jgZ" = (
@@ -17507,6 +17490,9 @@
 	dir = 1
 	},
 /obj/effect/floor_decal/spline/fancy,
+/obj/structure/railing/mapped{
+	dir = 1
+	},
 /turf/simulated/floor/reinforced,
 /area/hallway/primary/central_two)
 "jvL" = (
@@ -21698,7 +21684,18 @@
 /turf/simulated/floor/plating,
 /area/engineering/engine_room)
 "lTn" = (
-/turf/simulated/floor/grass/alt,
+/obj/machinery/stargazer,
+/obj/effect/floor_decal/spline/plain/corner{
+	dir = 4
+	},
+/obj/effect/floor_decal/spline/plain/corner,
+/obj/effect/floor_decal/spline/plain/corner{
+	dir = 1
+	},
+/obj/effect/floor_decal/spline/plain/corner{
+	dir = 8
+	},
+/turf/simulated/floor/carpet/rubber,
 /area/hallway/primary/central_two)
 "lTs" = (
 /obj/effect/floor_decal/industrial/warning{
@@ -22089,11 +22086,10 @@
 /turf/simulated/floor/tiled/white,
 /area/medical/gen_treatment)
 "meM" = (
-/obj/structure/window/reinforced{
+/obj/effect/floor_decal/spline/plain/cee{
 	dir = 8
 	},
-/obj/structure/flora/ausbushes/lavendergrass,
-/turf/simulated/floor/grass/alt,
+/turf/simulated/floor/carpet/rubber,
 /area/hallway/primary/central_two)
 "mfq" = (
 /obj/machinery/atmospherics/unary/vent_pump/on{
@@ -26737,11 +26733,10 @@
 /turf/simulated/floor/tiled/dark,
 /area/hallway/engineering)
 "oFp" = (
-/obj/structure/window/reinforced{
+/obj/effect/floor_decal/spline/plain/cee{
 	dir = 1
 	},
-/obj/structure/flora/ausbushes/lavendergrass,
-/turf/simulated/floor/grass/alt,
+/turf/simulated/floor/carpet/rubber,
 /area/hallway/primary/central_two)
 "oGm" = (
 /obj/structure/cable/green{
@@ -34134,6 +34129,9 @@
 /obj/effect/floor_decal/spline/fancy{
 	dir = 4
 	},
+/obj/structure/railing/mapped{
+	dir = 8
+	},
 /turf/simulated/floor/reinforced,
 /area/hallway/primary/central_two)
 "sFk" = (
@@ -44916,13 +44914,8 @@
 /turf/simulated/floor/tiled,
 /area/storage/primary)
 "ygu" = (
-/obj/structure/window/reinforced,
-/obj/structure/flora/tree/jungle/small{
-	desc = "A lush and healthy tree. A small golden plaque at its base reads its name, in plain text, Patience.";
-	name = "Patience";
-	pixel_y = 5
-	},
-/turf/simulated/floor/grass/alt,
+/obj/effect/floor_decal/spline/plain/cee,
+/turf/simulated/floor/carpet/rubber,
 /area/hallway/primary/central_two)
 "ygw" = (
 /obj/effect/floor_decal/corner/green{
@@ -67011,7 +67004,7 @@ tHk
 gkM
 hjG
 meM
-aeT
+hjG
 jgz
 gBE
 uXq
@@ -67413,9 +67406,9 @@ bVf
 ept
 pWR
 gkM
-fsb
+hjG
 aST
-bve
+hjG
 jgz
 gBE
 uXq