diff --git a/code/modules/overmap/exoplanets/decor/flora/potted_big.dm b/code/modules/overmap/exoplanets/decor/flora/potted_big.dm index 4ba0961aa71e..429e3cc4c288 100644 --- a/code/modules/overmap/exoplanets/decor/flora/potted_big.dm +++ b/code/modules/overmap/exoplanets/decor/flora/potted_big.dm @@ -149,9 +149,9 @@ . = ..() set_light(l_range = 2, l_power = 2, l_color = "#007fff") -/obj/structure/flora/pottedplant/orientaltree - name = "potted oriental tree" - desc = "This is a rather oriental style tree. It's flowers are bright pink." +/obj/structure/flora/pottedplant/cherrytree + name = "potted cherry blossom tree" + desc = "A beautiful kwanzan cherry blossom tree. A notably ornamental tree, appreciated for its lack of fruit.." icon_state = "plant-10" /obj/structure/flora/pottedplant/smallcactus diff --git a/html/changelogs/courierbravo-cherrytreechange.yml b/html/changelogs/courierbravo-cherrytreechange.yml new file mode 100644 index 000000000000..300dbe178559 --- /dev/null +++ b/html/changelogs/courierbravo-cherrytreechange.yml @@ -0,0 +1,58 @@ +################################ +# 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 +# - (fixes bugs) +# wip +# - (work in progress) +# qol +# - (quality of life) +# soundadd +# - (adds a sound) +# sounddel +# - (removes a sound) +# rscadd +# - (adds a feature) +# rscdel +# - (removes a feature) +# imageadd +# - (adds an image or sprite) +# imagedel +# - (removes an image or sprite) +# spellcheck +# - (fixes spelling or grammar) +# experiment +# - (experimental change) +# balance +# - (balance changes) +# code_imp +# - (misc internal code change) +# refactor +# - (refactors code) +# config +# - (makes a change to the config files) +# admin +# - (makes changes to administrator tools) +# server +# - (miscellaneous changes to server) +################################# + +# Your name. +author: CourierBravo + +# 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, this gets changed to [] after reading. Just remove the brackets when you add new shit. +# Please surround your changes in double quotes ("). It works without them, but if you use certain characters it screws up compiling. The quotes will not show up in the changelog. +changes: + - rscdel: "Changed the potted oriental tree's name and description to now be a potted Kwanzan cherry tree." diff --git a/maps/away/away_site/konyang/point_verdant/point_verdant.dmm b/maps/away/away_site/konyang/point_verdant/point_verdant.dmm index 5d3e30fe163b..cfe75ef0c80a 100644 --- a/maps/away/away_site/konyang/point_verdant/point_verdant.dmm +++ b/maps/away/away_site/konyang/point_verdant/point_verdant.dmm @@ -35118,7 +35118,7 @@ /turf/simulated/floor/roofing_tiles, /area/point_verdant/interior/arcade) "usD" = ( -/obj/structure/flora/pottedplant/orientaltree, +/obj/structure/flora/pottedplant/cherrytree, /obj/effect/floor_decal/corner_wide/mauve{ dir = 5 }, diff --git a/maps/away/away_site/overgrown_mining_station/overgrown_mining_station.dmm b/maps/away/away_site/overgrown_mining_station/overgrown_mining_station.dmm index b33a7b2d8f36..0581db5cd9bd 100644 --- a/maps/away/away_site/overgrown_mining_station/overgrown_mining_station.dmm +++ b/maps/away/away_site/overgrown_mining_station/overgrown_mining_station.dmm @@ -2051,7 +2051,7 @@ icon_state = "coil2" }, /obj/effect/floor_decal/corner_wide/lime/diagonal, -/obj/structure/flora/pottedplant/orientaltree, +/obj/structure/flora/pottedplant/cherrytree, /turf/simulated/floor/tiled/white/airless, /area/overgrown_mining_station) "TE" = ( diff --git a/maps/away/ships/biesel/tcaf_corvette/tcaf_corvette.dmm b/maps/away/ships/biesel/tcaf_corvette/tcaf_corvette.dmm index eb5167278bc4..028a38e1ef8b 100644 --- a/maps/away/ships/biesel/tcaf_corvette/tcaf_corvette.dmm +++ b/maps/away/ships/biesel/tcaf_corvette/tcaf_corvette.dmm @@ -4419,7 +4419,7 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 5 }, -/obj/structure/flora/pottedplant/orientaltree, +/obj/structure/flora/pottedplant/cherrytree, /obj/effect/decal/cleanable/dirt, /turf/simulated/floor/tiled, /area/tcaf_corvette/lounge) diff --git a/maps/away/ships/konyang/kasf_ship/kasf_ship.dmm b/maps/away/ships/konyang/kasf_ship/kasf_ship.dmm index ec2d9ffcbaf6..affa6be6d064 100644 --- a/maps/away/ships/konyang/kasf_ship/kasf_ship.dmm +++ b/maps/away/ships/konyang/kasf_ship/kasf_ship.dmm @@ -8717,7 +8717,7 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 6 }, -/obj/structure/flora/pottedplant/orientaltree, +/obj/structure/flora/pottedplant/cherrytree, /turf/simulated/floor/tiled, /area/ship/kasf_corvette/mainhall) "XU" = ( diff --git a/maps/away/ships/yacht_civ/yacht_civ.dmm b/maps/away/ships/yacht_civ/yacht_civ.dmm index 5dcb79b8e924..e179325f14cd 100644 --- a/maps/away/ships/yacht_civ/yacht_civ.dmm +++ b/maps/away/ships/yacht_civ/yacht_civ.dmm @@ -5139,7 +5139,7 @@ /area/ship/yacht_civ/lounge) "Tl" = ( /obj/structure/flora/ausbushes/ppflowers, -/obj/structure/flora/pottedplant/orientaltree, +/obj/structure/flora/pottedplant/cherrytree, /turf/simulated/floor/exoplanet/grass, /area/ship/yacht_civ/hallway_mid) "Tw" = (