diff --git a/code/game/objects/random/misc.dm b/code/game/objects/random/misc.dm index d343e9a115c..1b3c156b60d 100644 --- a/code/game/objects/random/misc.dm +++ b/code/game/objects/random/misc.dm @@ -441,7 +441,6 @@ var/obj/structure/flora/pottedplant/P = null var/list/unwanted = list( /obj/structure/flora/pottedplant, // don't want parent base obj - /obj/structure/flora/pottedplant/random, // depreciated /obj/structure/flora/pottedplant/dead2, // does not fit horizon's aesthetic /obj/structure/flora/pottedplant/empty ) diff --git a/code/modules/cargo/random_stock/t1_common.dm b/code/modules/cargo/random_stock/t1_common.dm index b7ccbd5ba03..ea213ac270d 100644 --- a/code/modules/cargo/random_stock/t1_common.dm +++ b/code/modules/cargo/random_stock/t1_common.dm @@ -372,7 +372,7 @@ STOCK_ITEM_COMMON(plant, 3.5) if (turf_clear(U)) T = U break - new /obj/structure/flora/pottedplant/random(T) + new /obj/random/pottedplant(T) STOCK_ITEM_COMMON(bag, 2) var/type = pick( \ diff --git a/code/modules/overmap/exoplanets/decor/flora/potted.dm b/code/modules/overmap/exoplanets/decor/flora/potted.dm index 18cfffc6b02..f34c97b4c7f 100644 --- a/code/modules/overmap/exoplanets/decor/flora/potted.dm +++ b/code/modules/overmap/exoplanets/decor/flora/potted.dm @@ -71,66 +71,6 @@ return 1 return ..() -/obj/structure/flora/pottedplant/random - name = "potted plant (DEPRECATED)" - desc = "use /obj/random/pottedplant/ instead" - -/obj/structure/flora/pottedplant/random/New() - ..() - name = "potted plant" - desc = "A potted plant." - var/number = rand(1,36) - if (number == 36) - if (prob(90)) // Make the weird one rarer - number = rand(1,35) - else if(!desc) - desc = "A half-sentient plant borne from a mishap in a Zeng-Hu genetics lab." - - if(!desc) - switch(number) //Wezzy's cool new plant description code. Special thanks to Sindorman. - if(3) - desc = "A bouquet of Bieselite flora." - if(4) - desc = "A bamboo plant. Used widely in Japanese crafts." - if(5) - desc = "Some kind of fern." - if(7) - desc = "A reedy plant mostly used for decoration in Skrell homes, admired for its luxuriant stalks." - if(9) - desc = "A fleshy cave dwelling plant with huge nodules for flowers." - if(9) - desc = "A scrubby cactus adapted to the Moghes deserts." - if(13) - desc = "A hardy succulent adapted to the Moghes deserts." - if(14) - desc = "That's a huge flower. Previously, the petals would be used in dyes for unathi garb. Now it's more of a decorative plant." - if(15) - desc = "A pitiful pot of stubby flowers." - if(18) - desc = "An orchid plant. As beautiful as it is delicate." - if(19) - desc = "A ropey, aquatic plant with crystaline flowers." - if(20) - desc = "A bioluminescent half-plant half-fungus hybrid. Said to come from Sedantis I." - if(22) - desc = "A cone shrub. Sadly doesn't come from Coney Island." - if(26) - desc = "A bulrush. Commonly referred to as cattail." - if(27) - desc = "A rose bush. Don't prick yourself." - if(32) - desc = "A woody shrub." - if(33) - desc = "A woody shrub. Seems to be in need of watering." - if(34) - desc = "A woody shrub. This one seems to be in bloom. It's just like one of my japanese animes." - else - desc = "Just your common, everyday houseplant." - - if (number < 10) - number = "0[number]" - icon_state = "plant-[number]" - /obj/structure/flora/pottedplant/applebush name = "decorative potted plant" desc = "This is a decorative shrub. It's been trimmed into the shape of an apple." diff --git a/html/changelogs/DreamySkrell-pottedplant-random-replace.yml b/html/changelogs/DreamySkrell-pottedplant-random-replace.yml new file mode 100644 index 00000000000..6c7f61c4aea --- /dev/null +++ b/html/changelogs/DreamySkrell-pottedplant-random-replace.yml @@ -0,0 +1,41 @@ +################################ +# 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: DreamySkrell + +# 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: "Replaces deprecated /obj/structure/flora/pottedplant/random with /obj/random/pottedplant/." diff --git a/maps/aurora/aurora-1_centcomm.dmm b/maps/aurora/aurora-1_centcomm.dmm index d2f6aaf090d..ad76645fe32 100644 --- a/maps/aurora/aurora-1_centcomm.dmm +++ b/maps/aurora/aurora-1_centcomm.dmm @@ -749,7 +749,7 @@ /turf/simulated/floor/holofloor/wood, /area/holodeck/source_courtroom) "abG" = ( -/obj/structure/flora/pottedplant/random, +/obj/random/pottedplant, /turf/simulated/floor/holofloor/wood, /area/holodeck/source_courtroom) "abH" = ( @@ -1688,7 +1688,7 @@ /area/holodeck/source_courtroom) "aeG" = ( /obj/effect/floor_decal/carpet, -/obj/structure/flora/pottedplant/random, +/obj/random/pottedplant, /turf/simulated/floor/holofloor/carpet, /area/holodeck/source_courtroom) "aeH" = ( @@ -5774,7 +5774,7 @@ /obj/effect/floor_decal/corner/red{ dir = 5 }, -/obj/structure/flora/pottedplant/random{ +/obj/random/pottedplant{ anchored = 1; pixel_y = 18 }, @@ -6904,7 +6904,7 @@ /turf/unsimulated/floor/plating, /area/shuttle/escape) "aWC" = ( -/obj/structure/flora/pottedplant/random, +/obj/random/pottedplant, /turf/simulated/floor/shuttle/dark_blue, /area/shuttle/escape) "aWD" = ( @@ -8865,7 +8865,7 @@ /turf/unsimulated/floor/plating, /area/centcom/bar) "bZd" = ( -/obj/structure/flora/pottedplant/random, +/obj/random/pottedplant, /turf/simulated/floor/wood, /area/merchant_station) "bZv" = ( @@ -9455,7 +9455,7 @@ }, /area/centcom/legion) "crN" = ( -/obj/structure/flora/pottedplant/random, +/obj/random/pottedplant, /turf/unsimulated/floor{ icon_state = "wood_light" }, @@ -10269,7 +10269,7 @@ }, /area/centcom/holding) "cUR" = ( -/obj/structure/flora/pottedplant/random{ +/obj/random/pottedplant{ pixel_y = 8 }, /obj/effect/floor_decal/corner/paleblue/full{ @@ -13084,7 +13084,7 @@ /turf/unsimulated/floor/plating, /area/shuttle/administration) "eIJ" = ( -/obj/structure/flora/pottedplant/random{ +/obj/random/pottedplant{ anchored = 1; pixel_y = 18 }, @@ -17759,7 +17759,7 @@ /turf/unsimulated/floor/plating, /area/antag/raider) "hwY" = ( -/obj/structure/flora/pottedplant/random, +/obj/random/pottedplant, /obj/structure/window/basic{ dir = 8 }, @@ -20671,7 +20671,7 @@ }, /area/antag/ninja) "juP" = ( -/obj/structure/flora/pottedplant/random{ +/obj/random/pottedplant{ anchored = 1; pixel_y = 18 }, @@ -22508,7 +22508,7 @@ /turf/unsimulated/floor, /area/centcom/holding) "kIp" = ( -/obj/structure/flora/pottedplant/random, +/obj/random/pottedplant, /turf/unsimulated/floor{ icon_state = "wood" }, @@ -23480,7 +23480,7 @@ }, /area/antag/raider) "loa" = ( -/obj/structure/flora/pottedplant/random, +/obj/random/pottedplant, /obj/effect/floor_decal/corner/paleblue/full{ dir = 4 }, @@ -24415,7 +24415,7 @@ /obj/effect/floor_decal/corner/grey{ dir = 5 }, -/obj/structure/flora/pottedplant/random{ +/obj/random/pottedplant{ anchored = 1; pixel_y = 18 }, @@ -25223,7 +25223,7 @@ /turf/simulated/floor/tiled, /area/shuttle/merchant) "mrx" = ( -/obj/structure/flora/pottedplant/random, +/obj/random/pottedplant, /obj/structure/sign/vacuum{ pixel_y = 32 }, @@ -27055,7 +27055,7 @@ /turf/simulated/floor/tiled/dark, /area/shuttle/mercenary) "nzt" = ( -/obj/structure/flora/pottedplant/random{ +/obj/random/pottedplant{ pixel_y = 8 }, /obj/effect/floor_decal/corner/paleblue/full{ @@ -28268,7 +28268,7 @@ /turf/unsimulated/floor, /area/centcom/distress_prep) "ohs" = ( -/obj/structure/flora/pottedplant/random, +/obj/random/pottedplant, /turf/unsimulated/floor, /area/antag/mercenary) "ohC" = ( @@ -28598,7 +28598,7 @@ }, /area/centcom/legion) "oww" = ( -/obj/structure/flora/pottedplant/random, +/obj/random/pottedplant, /obj/effect/floor_decal/industrial/warning, /turf/simulated/floor/tiled, /area/shuttle/merchant) @@ -28987,7 +28987,7 @@ }, /area/centcom/specops) "oNu" = ( -/obj/structure/flora/pottedplant/random, +/obj/random/pottedplant, /turf/unsimulated/floor{ icon_state = "wood" }, @@ -29117,7 +29117,7 @@ /turf/unsimulated/floor/plating, /area/shuttle/escape) "oQw" = ( -/obj/structure/flora/pottedplant/random, +/obj/random/pottedplant, /turf/unsimulated/floor{ icon_state = "wood" }, @@ -30650,7 +30650,7 @@ dir = 4; icon_state = "tube1" }, -/obj/structure/flora/pottedplant/random, +/obj/random/pottedplant, /turf/unsimulated/floor{ dir = 8; icon_state = "wood" @@ -30998,7 +30998,7 @@ /obj/effect/floor_decal/corner/paleblue{ dir = 1 }, -/obj/structure/flora/pottedplant/random, +/obj/random/pottedplant, /turf/unsimulated/floor, /area/centcom/holding) "qcl" = ( @@ -36441,7 +36441,7 @@ dir = 4; icon_state = "tube1" }, -/obj/structure/flora/pottedplant/random{ +/obj/random/pottedplant{ pixel_y = 8 }, /turf/unsimulated/floor{ @@ -39495,7 +39495,7 @@ /obj/effect/floor_decal/corner/paleblue{ dir = 6 }, -/obj/structure/flora/pottedplant/random, +/obj/random/pottedplant, /turf/unsimulated/floor, /area/centcom/spawning) "wbM" = ( @@ -39704,7 +39704,7 @@ /area/template_noop) "whV" = ( /obj/structure/table/wood, -/obj/structure/flora/pottedplant/random, +/obj/random/pottedplant, /turf/simulated/floor/holofloor/tiled/dark, /area/holodeck/source_dininghall) "whZ" = ( @@ -41001,7 +41001,7 @@ /obj/effect/floor_decal/corner/paleblue{ dir = 6 }, -/obj/structure/flora/pottedplant/random{ +/obj/random/pottedplant{ anchored = 1; pixel_y = 5 }, @@ -41188,7 +41188,7 @@ /obj/effect/floor_decal/corner/paleblue{ dir = 4 }, -/obj/structure/flora/pottedplant/random, +/obj/random/pottedplant, /turf/unsimulated/floor, /area/centcom/holding) "wXJ" = ( @@ -42336,7 +42336,7 @@ }, /area/centcom/legion/hangar5) "xEw" = ( -/obj/structure/flora/pottedplant/random, +/obj/random/pottedplant, /turf/unsimulated/floor, /area/centcom/legion) "xFd" = ( diff --git a/maps/aurora/aurora-3_sublevel.dmm b/maps/aurora/aurora-3_sublevel.dmm index 743621b9dfa..a2ee789177b 100644 --- a/maps/aurora/aurora-3_sublevel.dmm +++ b/maps/aurora/aurora-3_sublevel.dmm @@ -4289,7 +4289,7 @@ /turf/simulated/floor/tiled/dark, /area/engineering/break_room) "ajQ" = ( -/obj/structure/flora/pottedplant/random, +/obj/random/pottedplant, /turf/simulated/floor/tiled/dark, /area/engineering/break_room) "ajR" = ( @@ -4939,7 +4939,7 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/structure/table/reinforced/wood, -/obj/structure/flora/pottedplant/random, +/obj/random/pottedplant, /turf/simulated/floor/carpet, /area/engineering/break_room) "alp" = ( @@ -13148,7 +13148,7 @@ /turf/simulated/floor/plating, /area/medical/patient_wing) "azC" = ( -/obj/structure/flora/pottedplant/random, +/obj/random/pottedplant, /obj/effect/floor_decal/corner_wide/lime/full{ dir = 8 }, @@ -18639,7 +18639,7 @@ /turf/simulated/floor/tiled/white, /area/medical/morgue) "aMm" = ( -/obj/structure/flora/pottedplant/random, +/obj/random/pottedplant, /obj/machinery/light{ dir = 1 }, @@ -19516,7 +19516,7 @@ dir = 2; icon_state = "pipe-c" }, -/obj/structure/flora/pottedplant/random, +/obj/random/pottedplant, /turf/simulated/floor/tiled/white, /area/medical/patient_wing_hallway) "aOo" = ( @@ -22236,7 +22236,7 @@ /obj/item/device/radio/intercom{ pixel_y = 22 }, -/obj/structure/flora/pottedplant/random, +/obj/random/pottedplant, /obj/effect/floor_decal/corner_wide/lime/full{ dir = 8 }, @@ -31531,7 +31531,7 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 5 }, -/obj/structure/flora/pottedplant/random, +/obj/random/pottedplant, /obj/structure/cable/green{ d1 = 1; d2 = 2; @@ -31881,7 +31881,7 @@ /turf/simulated/floor/tiled/airless, /area/security/penal_colony/warden) "oki" = ( -/obj/structure/flora/pottedplant/random, +/obj/random/pottedplant, /turf/simulated/floor/tiled, /area/medical/medbay4) "olc" = ( @@ -32032,7 +32032,7 @@ /turf/simulated/floor/plating, /area/maintenance/medsublevel_port) "ozn" = ( -/obj/structure/flora/pottedplant/random, +/obj/random/pottedplant, /obj/effect/floor_decal/corner_wide/lime/full, /turf/simulated/floor/tiled/white, /area/medical/medbay4) diff --git a/maps/aurora/aurora-4_mainlevel.dmm b/maps/aurora/aurora-4_mainlevel.dmm index 76d08ef4d13..ef1d9353350 100644 --- a/maps/aurora/aurora-4_mainlevel.dmm +++ b/maps/aurora/aurora-4_mainlevel.dmm @@ -226,7 +226,7 @@ pixel_x = 10; pixel_y = 24 }, -/obj/structure/flora/pottedplant/random, +/obj/random/pottedplant, /turf/simulated/floor/tiled, /area/assembly/robotics_cyborgification) "aaF" = ( @@ -5442,7 +5442,7 @@ /turf/simulated/floor, /area/security/security_office) "akO" = ( -/obj/structure/flora/pottedplant/random, +/obj/random/pottedplant, /obj/effect/floor_decal/corner/blue{ dir = 9 }, @@ -8482,7 +8482,7 @@ /turf/simulated/floor/tiled, /area/security/security_office) "aqC" = ( -/obj/structure/flora/pottedplant/random, +/obj/random/pottedplant, /obj/effect/floor_decal/corner/blue{ dir = 10 }, @@ -9906,7 +9906,7 @@ /obj/effect/floor_decal/corner/blue/full{ dir = 8 }, -/obj/structure/flora/pottedplant/random, +/obj/random/pottedplant, /obj/machinery/ringer{ department = "Security"; id = "brig_ringer"; @@ -15576,7 +15576,7 @@ /obj/machinery/camera/network/engineering{ c_tag = "Engineering - Sublevel EVA" }, -/obj/structure/flora/pottedplant/random, +/obj/random/pottedplant, /obj/structure/extinguisher_cabinet{ pixel_x = -32 }, @@ -15624,7 +15624,7 @@ /area/engineering/foyer) "aCb" = ( /obj/item/toy/figure/journalist, -/obj/structure/flora/pottedplant/random, +/obj/random/pottedplant, /obj/machinery/alarm{ dir = 8; pixel_x = 28 @@ -18862,7 +18862,7 @@ /obj/effect/floor_decal/corner_wide/paleblue{ dir = 5 }, -/obj/structure/flora/pottedplant/random, +/obj/random/pottedplant, /obj/structure/sign/poster{ icon_state = "tcflposter2"; pixel_y = 32; @@ -20414,7 +20414,7 @@ name = "east bump"; pixel_x = 24 }, -/obj/structure/flora/pottedplant/random, +/obj/random/pottedplant, /turf/simulated/floor/tiled/dark, /area/crew_quarters/heads/hos) "aJy" = ( @@ -24187,7 +24187,7 @@ /area/crew_quarters/captain) "aPT" = ( /obj/item/toy/figure/captain, -/obj/structure/flora/pottedplant/random, +/obj/random/pottedplant, /turf/simulated/floor/wood, /area/crew_quarters/captain) "aPU" = ( @@ -24801,7 +24801,7 @@ /turf/simulated/floor/plating, /area/journalistoffice) "aRa" = ( -/obj/structure/flora/pottedplant/random, +/obj/random/pottedplant, /turf/simulated/floor/wood, /area/journalistoffice) "aRb" = ( @@ -25088,7 +25088,7 @@ /turf/simulated/floor/tiled, /area/bridge) "aRB" = ( -/obj/structure/flora/pottedplant/random, +/obj/random/pottedplant, /turf/simulated/floor/tiled, /area/bridge) "aRC" = ( @@ -31289,7 +31289,7 @@ /turf/simulated/floor/plating, /area/crew_quarters/medbreak) "bcj" = ( -/obj/structure/flora/pottedplant/random, +/obj/random/pottedplant, /obj/machinery/alarm{ pixel_y = 28 }, @@ -33602,7 +33602,7 @@ /area/medical/icu) "bgr" = ( /obj/effect/floor_decal/corner/grey/diagonal, -/obj/structure/flora/pottedplant/random, +/obj/random/pottedplant, /obj/machinery/alarm{ dir = 4; pixel_x = -28 @@ -33629,7 +33629,7 @@ /area/medical/exam_room2) "bgu" = ( /obj/effect/floor_decal/corner/grey/diagonal, -/obj/structure/flora/pottedplant/random, +/obj/random/pottedplant, /obj/machinery/power/apc{ dir = 4; name = "east bump"; @@ -36388,7 +36388,7 @@ d2 = 4; icon_state = "0-4" }, -/obj/structure/flora/pottedplant/random, +/obj/random/pottedplant, /obj/effect/floor_decal/corner_wide/orange{ dir = 5 }, @@ -36588,7 +36588,7 @@ dir = 1; icon_state = "tube1" }, -/obj/structure/flora/pottedplant/random, +/obj/random/pottedplant, /obj/effect/floor_decal/corner_wide/green{ dir = 5 }, @@ -36621,7 +36621,7 @@ name = "\improper Medical - Psych Stairway" }) "bly" = ( -/obj/structure/flora/pottedplant/random, +/obj/random/pottedplant, /obj/effect/floor_decal/corner_wide/green/full{ dir = 8 }, @@ -36673,7 +36673,7 @@ name = "\improper Medical - Psych Stairway" }) "blB" = ( -/obj/structure/flora/pottedplant/random, +/obj/random/pottedplant, /obj/machinery/camera/network/medbay{ c_tag = "Medical - Psych Stairway" }, @@ -39658,7 +39658,7 @@ /turf/simulated/floor/tiled/white, /area/medical/reception) "brI" = ( -/obj/structure/flora/pottedplant/random, +/obj/random/pottedplant, /obj/machinery/ringer_button{ id = "medbay_ringer"; pixel_x = 26 @@ -41233,11 +41233,11 @@ /obj/structure/sign/nosmoking_2{ pixel_y = 32 }, -/obj/structure/flora/pottedplant/random, +/obj/random/pottedplant, /turf/simulated/floor/tiled, /area/bridge) "buI" = ( -/obj/structure/flora/pottedplant/random, +/obj/random/pottedplant, /obj/item/device/radio/intercom{ pixel_y = 22 }, @@ -41375,7 +41375,7 @@ /turf/simulated/floor/plating, /area/medical/reception) "bvh" = ( -/obj/structure/flora/pottedplant/random, +/obj/random/pottedplant, /obj/effect/floor_decal/corner_wide/lime{ dir = 1 }, @@ -41425,7 +41425,7 @@ /turf/simulated/floor/tiled/white, /area/medical/reception) "bvo" = ( -/obj/structure/flora/pottedplant/random, +/obj/random/pottedplant, /obj/effect/floor_decal/corner_wide/lime{ dir = 4 }, @@ -41802,7 +41802,7 @@ /obj/item/device/radio/intercom{ pixel_y = 27 }, -/obj/structure/flora/pottedplant/random, +/obj/random/pottedplant, /obj/effect/floor_decal/corner_wide/lime{ dir = 5 }, @@ -43377,7 +43377,7 @@ c_tag = "Bridge - Lift Lobby"; dir = 4 }, -/obj/structure/flora/pottedplant/random, +/obj/random/pottedplant, /obj/machinery/alarm{ dir = 4; pixel_x = -28 @@ -43755,7 +43755,7 @@ "bzY" = ( /obj/effect/floor_decal/corner/white/diagonal, /obj/structure/window/reinforced, -/obj/structure/flora/pottedplant/random, +/obj/random/pottedplant, /turf/simulated/floor/tiled, /area/medical/first_responder) "bzZ" = ( @@ -44196,7 +44196,7 @@ /turf/simulated/floor/tiled, /area/medical/first_responder) "bBc" = ( -/obj/structure/flora/pottedplant/random, +/obj/random/pottedplant, /obj/machinery/alarm{ dir = 4; pixel_x = -28 @@ -45532,7 +45532,7 @@ /turf/simulated/floor/plating, /area/maintenance/medbay) "bEa" = ( -/obj/structure/flora/pottedplant/random, +/obj/random/pottedplant, /obj/machinery/light/small, /turf/simulated/floor/plating, /area/turbolift/command_sub) @@ -47882,7 +47882,7 @@ /turf/simulated/floor/plating, /area/hydroponics) "bJS" = ( -/obj/structure/flora/pottedplant/random, +/obj/random/pottedplant, /turf/simulated/floor/grass/alt, /area/hydroponics) "bJU" = ( @@ -50566,7 +50566,7 @@ /turf/simulated/floor/plating, /area/maintenance/library) "bQI" = ( -/obj/structure/flora/pottedplant/random, +/obj/random/pottedplant, /obj/machinery/firealarm/south, /obj/machinery/atmospherics/unary/vent_scrubber/on{ dir = 4 @@ -51418,7 +51418,7 @@ /turf/simulated/floor/carpet, /area/chapel/main) "bTg" = ( -/obj/structure/flora/pottedplant/random, +/obj/random/pottedplant, /turf/simulated/floor/carpet, /area/chapel/main) "bTh" = ( @@ -52539,7 +52539,7 @@ /turf/simulated/floor/wood, /area/chapel/office) "bVN" = ( -/obj/structure/flora/pottedplant/random, +/obj/random/pottedplant, /obj/machinery/power/apc{ dir = 4; name = "east bump"; @@ -53308,7 +53308,7 @@ /obj/effect/floor_decal/spline/plain{ dir = 10 }, -/obj/structure/flora/pottedplant/random{ +/obj/random/pottedplant{ pixel_x = 16; pixel_y = 16 }, @@ -59559,7 +59559,7 @@ c_tag = "Hydroponics - West"; dir = 1 }, -/obj/structure/flora/pottedplant/random, +/obj/random/pottedplant, /turf/simulated/floor/grass/alt, /area/hydroponics) "dFK" = ( @@ -60517,7 +60517,7 @@ dir = 8; pixel_x = 28 }, -/obj/structure/flora/pottedplant/random, +/obj/random/pottedplant, /turf/simulated/floor/plating, /area/maintenance/library) "ftD" = ( @@ -61013,7 +61013,7 @@ /turf/simulated/floor/plating, /area/maintenance/security_starboard) "ghU" = ( -/obj/structure/flora/pottedplant/random, +/obj/random/pottedplant, /obj/machinery/atmospherics/unary/vent_pump/on{ dir = 1 }, @@ -61155,7 +61155,7 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 5 }, -/obj/structure/flora/pottedplant/random, +/obj/random/pottedplant, /turf/simulated/floor/tiled/white, /area/crew_quarters/kitchen) "gxX" = ( @@ -62229,7 +62229,7 @@ /turf/simulated/floor/tiled/white, /area/assembly/robotics_cyborgification) "ijX" = ( -/obj/structure/flora/pottedplant/random, +/obj/random/pottedplant, /obj/machinery/firealarm/east, /turf/simulated/floor/wood, /area/journalistoffice) @@ -67227,7 +67227,7 @@ "rOK" = ( /obj/effect/decal/cleanable/dirt, /obj/effect/decal/cleanable/dirt, -/obj/structure/flora/pottedplant/random, +/obj/random/pottedplant, /obj/effect/floor_decal/corner/grey/diagonal, /turf/simulated/floor/tiled/old_white, /area/maintenance/medbay) @@ -68609,7 +68609,7 @@ /turf/simulated/floor/carpet, /area/maintenance/bar) "tZz" = ( -/obj/structure/flora/pottedplant/random, +/obj/random/pottedplant, /obj/machinery/recharger/wallcharger{ pixel_y = 22 }, @@ -69164,7 +69164,7 @@ d2 = 8; icon_state = "2-8" }, -/obj/structure/flora/pottedplant/random, +/obj/random/pottedplant, /obj/effect/floor_decal/corner_wide/paleblue{ dir = 10 }, diff --git a/maps/aurora/aurora-5_interstitial.dmm b/maps/aurora/aurora-5_interstitial.dmm index 0180715d5e4..34f28f64581 100644 --- a/maps/aurora/aurora-5_interstitial.dmm +++ b/maps/aurora/aurora-5_interstitial.dmm @@ -2409,7 +2409,7 @@ /area/security/training) "fr" = ( /obj/machinery/firealarm/west, -/obj/structure/flora/pottedplant/random, +/obj/random/pottedplant, /obj/effect/floor_decal/spline/fancy/wood, /obj/machinery/atmospherics/unary/vent_pump/on{ dir = 4 @@ -4012,7 +4012,7 @@ /obj/structure/sign/nosmoking_2{ pixel_y = 32 }, -/obj/structure/flora/pottedplant/random, +/obj/random/pottedplant, /obj/effect/floor_decal/corner_wide/green/full{ dir = 8 }, @@ -4023,7 +4023,7 @@ /obj/machinery/alarm{ pixel_y = 28 }, -/obj/structure/flora/pottedplant/random, +/obj/random/pottedplant, /obj/effect/floor_decal/corner_wide/green/full{ dir = 1 }, @@ -4814,7 +4814,7 @@ /obj/structure/sign/nosmoking_2{ pixel_y = 32 }, -/obj/structure/flora/pottedplant/random, +/obj/random/pottedplant, /obj/effect/floor_decal/corner_wide/green/full{ dir = 1 }, @@ -4995,7 +4995,7 @@ /turf/simulated/floor/tiled/white, /area/medical/psych) "my" = ( -/obj/structure/flora/pottedplant/random, +/obj/random/pottedplant, /obj/effect/floor_decal/corner_wide/green/full{ dir = 4 }, @@ -7105,7 +7105,7 @@ /turf/simulated/floor/plating, /area/maintenance/interstitial_cargo) "zQ" = ( -/obj/structure/flora/pottedplant/random, +/obj/random/pottedplant, /obj/structure/extinguisher_cabinet{ pixel_x = -28 }, @@ -8351,7 +8351,7 @@ /obj/structure/window/reinforced{ dir = 1 }, -/obj/structure/flora/pottedplant/random, +/obj/random/pottedplant, /obj/effect/floor_decal/corner/pink/full{ dir = 1 }, @@ -11311,7 +11311,7 @@ }, /area/mine/unexplored) "WF" = ( -/obj/structure/flora/pottedplant/random, +/obj/random/pottedplant, /obj/machinery/atmospherics/unary/vent_scrubber/on{ dir = 1 }, diff --git a/maps/aurora/aurora-6_surface.dmm b/maps/aurora/aurora-6_surface.dmm index 4764267f99a..155538f92f2 100644 --- a/maps/aurora/aurora-6_surface.dmm +++ b/maps/aurora/aurora-6_surface.dmm @@ -1239,7 +1239,7 @@ /obj/machinery/atmospherics/unary/vent_scrubber/on{ dir = 4 }, -/obj/structure/flora/pottedplant/random, +/obj/random/pottedplant, /turf/simulated/floor/tiled/dark, /area/crew_quarters/fitness) "aSY" = ( @@ -4020,7 +4020,7 @@ /turf/simulated/floor/tiled, /area/hallway/secondary/entry/locker) "drA" = ( -/obj/structure/flora/pottedplant/random, +/obj/random/pottedplant, /obj/effect/floor_decal/corner/paleblue/full{ dir = 8 }, @@ -7600,7 +7600,7 @@ /turf/simulated/floor/tiled, /area/hallway/secondary/entry/port) "gGx" = ( -/obj/structure/flora/pottedplant/random, +/obj/random/pottedplant, /obj/machinery/atmospherics/pipe/simple/hidden, /turf/simulated/floor/tiled, /area/hallway/secondary/entry/aft) @@ -8154,7 +8154,7 @@ /obj/machinery/atmospherics/unary/vent_scrubber/on{ dir = 4 }, -/obj/structure/flora/pottedplant/random, +/obj/random/pottedplant, /obj/machinery/alarm{ pixel_y = 28 }, @@ -11881,7 +11881,7 @@ /obj/machinery/atmospherics/unary/vent_pump/on{ dir = 1 }, -/obj/structure/flora/pottedplant/random, +/obj/random/pottedplant, /turf/simulated/floor/tiled/dark, /area/crew_quarters/fitness) "kuZ" = ( @@ -19665,7 +19665,7 @@ /obj/effect/floor_decal/corner/paleblue/full{ dir = 4 }, -/obj/structure/flora/pottedplant/random, +/obj/random/pottedplant, /obj/machinery/status_display{ pixel_y = -32 }, @@ -21465,7 +21465,7 @@ /obj/machinery/newscaster{ pixel_y = -30 }, -/obj/structure/flora/pottedplant/random, +/obj/random/pottedplant, /turf/simulated/floor/tiled, /area/hallway/secondary/entry/central) "sux" = ( @@ -21523,7 +21523,7 @@ /obj/machinery/alarm{ pixel_y = 28 }, -/obj/structure/flora/pottedplant/random, +/obj/random/pottedplant, /obj/effect/floor_decal/corner/lime{ dir = 5 }, @@ -21545,7 +21545,7 @@ /turf/simulated/floor/tiled, /area/storage/primary) "syt" = ( -/obj/structure/flora/pottedplant/random, +/obj/random/pottedplant, /obj/structure/cable/blue{ d1 = 2; d2 = 8; @@ -24718,7 +24718,7 @@ /turf/simulated/floor/plating, /area/maintenance/arrivals) "vkh" = ( -/obj/structure/flora/pottedplant/random, +/obj/random/pottedplant, /turf/simulated/floor/tiled, /area/hallway/secondary/entry/aft) "vkX" = ( @@ -25204,7 +25204,7 @@ /obj/effect/floor_decal/corner/paleblue{ dir = 8 }, -/obj/structure/flora/pottedplant/random, +/obj/random/pottedplant, /obj/machinery/light{ dir = 8; icon_state = "tube1" 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 4c206b8d4e0..7eab9d92611 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 @@ -1294,7 +1294,7 @@ /turf/simulated/floor/tiled/airless, /area/overgrown_mining_station) "WC" = ( -/obj/structure/flora/pottedplant/random, +/obj/random/pottedplant, /turf/simulated/floor/tiled/airless, /area/overgrown_mining_station) "WN" = ( diff --git a/maps/away/away_site/racers/racers.dmm b/maps/away/away_site/racers/racers.dmm index ec315236bef..531d07f4dd3 100644 --- a/maps/away/away_site/racers/racers.dmm +++ b/maps/away/away_site/racers/racers.dmm @@ -1786,7 +1786,7 @@ /turf/simulated/floor/plating, /area/racers) "iSh" = ( -/obj/structure/flora/pottedplant/random, +/obj/random/pottedplant, /turf/simulated/floor/wood, /area/racers) "iVB" = ( @@ -3297,7 +3297,7 @@ /turf/simulated/floor/plating, /area/racers) "qje" = ( -/obj/structure/flora/pottedplant/random, +/obj/random/pottedplant, /obj/structure/disposalpipe/segment{ dir = 1; icon_state = "pipe-c" diff --git a/maps/away/away_site/romanovich/grand_romanovich.dmm b/maps/away/away_site/romanovich/grand_romanovich.dmm index f82893abea0..7ea3b6c717b 100644 --- a/maps/away/away_site/romanovich/grand_romanovich.dmm +++ b/maps/away/away_site/romanovich/grand_romanovich.dmm @@ -375,7 +375,7 @@ /obj/effect/floor_decal/spline/fancy/wood/cee{ dir = 1 }, -/obj/structure/flora/pottedplant/random, +/obj/random/pottedplant, /turf/simulated/floor/wood, /area/grand_romanovich) "bl" = ( @@ -419,7 +419,7 @@ /area/grand_romanovich) "bp" = ( /obj/effect/floor_decal/spline/fancy/wood/cee, -/obj/structure/flora/pottedplant/random, +/obj/random/pottedplant, /turf/simulated/floor/wood, /area/grand_romanovich) "bu" = ( @@ -804,7 +804,7 @@ dir = 10; icon_state = "spline_fancy" }, -/obj/structure/flora/pottedplant/random, +/obj/random/pottedplant, /obj/effect/floor_decal/spline/fancy/wood/corner{ dir = 1; icon_state = "spline_fancy_corner" @@ -937,7 +937,7 @@ dir = 10; icon_state = "spline_fancy" }, -/obj/structure/flora/pottedplant/random, +/obj/random/pottedplant, /turf/simulated/floor/wood, /area/grand_romanovich) "cu" = ( @@ -1382,7 +1382,7 @@ /area/grand_romanovich) "ds" = ( /obj/effect/floor_decal/spline/fancy/wood, -/obj/structure/flora/pottedplant/random, +/obj/random/pottedplant, /obj/machinery/light{ dir = 2; icon_state = "tube1" @@ -1444,7 +1444,7 @@ dir = 9; icon_state = "spline_fancy" }, -/obj/structure/flora/pottedplant/random, +/obj/random/pottedplant, /turf/simulated/floor/wood, /area/grand_romanovich) "dA" = ( @@ -1485,7 +1485,7 @@ /area/grand_romanovich) "dF" = ( /obj/effect/floor_decal/spline/fancy/wood, -/obj/structure/flora/pottedplant/random, +/obj/random/pottedplant, /turf/simulated/floor/wood, /area/grand_romanovich) "dG" = ( @@ -2049,7 +2049,7 @@ dir = 6; icon_state = "spline_fancy" }, -/obj/structure/flora/pottedplant/random, +/obj/random/pottedplant, /turf/simulated/floor/wood, /area/grand_romanovich) "fd" = ( @@ -2099,7 +2099,7 @@ dir = 5; icon_state = "spline_fancy" }, -/obj/structure/flora/pottedplant/random, +/obj/random/pottedplant, /turf/simulated/floor/wood, /area/grand_romanovich) "fj" = ( @@ -2320,7 +2320,7 @@ dir = 10; icon_state = "spline_fancy" }, -/obj/structure/flora/pottedplant/random, +/obj/random/pottedplant, /obj/item/device/radio/intercom{ dir = 1; pixel_x = 0; @@ -2342,7 +2342,7 @@ dir = 6; icon_state = "spline_fancy" }, -/obj/structure/flora/pottedplant/random, +/obj/random/pottedplant, /obj/machinery/light{ dir = 4; icon_state = "tube1" @@ -2812,7 +2812,7 @@ /obj/effect/floor_decal/spline/fancy/wood/cee{ dir = 8 }, -/obj/structure/flora/pottedplant/random, +/obj/random/pottedplant, /obj/machinery/light{ dir = 8; icon_state = "tube1"; @@ -2937,7 +2937,7 @@ /obj/item/storage/secure/safe{ pixel_y = 32 }, -/obj/structure/flora/pottedplant/random, +/obj/random/pottedplant, /turf/simulated/floor/lino/grey, /area/grand_romanovich) "hh" = ( @@ -3055,7 +3055,7 @@ /obj/effect/floor_decal/spline/fancy/wood/cee{ dir = 8 }, -/obj/structure/flora/pottedplant/random, +/obj/random/pottedplant, /turf/simulated/floor/wood, /area/grand_romanovich) "hx" = ( @@ -3177,7 +3177,7 @@ /turf/simulated/floor/carpet/art, /area/grand_romanovich) "hK" = ( -/obj/structure/flora/pottedplant/random, +/obj/random/pottedplant, /turf/simulated/floor/tiled/dark, /area/grand_romanovich) "hL" = ( @@ -3188,7 +3188,7 @@ /area/grand_romanovich) "hM" = ( /obj/effect/floor_decal/spline/fancy/wood/cee, -/obj/structure/flora/pottedplant/random, +/obj/random/pottedplant, /obj/item/device/radio/intercom{ dir = 8; pixel_x = 24 @@ -3196,7 +3196,7 @@ /turf/simulated/floor/wood, /area/grand_romanovich) "hN" = ( -/obj/structure/flora/pottedplant/random, +/obj/random/pottedplant, /obj/machinery/light{ dir = 8; icon_state = "tube1"; @@ -3635,7 +3635,7 @@ dir = 1; icon_state = "spline_fancy" }, -/obj/structure/flora/pottedplant/random, +/obj/random/pottedplant, /turf/simulated/floor/wood, /area/grand_romanovich) "jj" = ( @@ -3670,7 +3670,7 @@ icon_state = "spline_fancy" }, /obj/effect/floor_decal/spline/fancy/wood/corner, -/obj/structure/flora/pottedplant/random, +/obj/random/pottedplant, /turf/simulated/floor/wood, /area/grand_romanovich) "jp" = ( @@ -4292,7 +4292,7 @@ /turf/simulated/floor/tiled/dark, /area/grand_romanovich) "lv" = ( -/obj/structure/flora/pottedplant/random, +/obj/random/pottedplant, /obj/effect/floor_decal/corner/yellow{ dir = 9; icon_state = "corner_white" @@ -4348,7 +4348,7 @@ /turf/simulated/floor/tiled/dark, /area/grand_romanovich) "lB" = ( -/obj/structure/flora/pottedplant/random, +/obj/random/pottedplant, /obj/effect/floor_decal/corner/yellow/full{ dir = 8; icon_state = "corner_white_full" @@ -4360,7 +4360,7 @@ /turf/simulated/floor/tiled/dark, /area/grand_romanovich) "lD" = ( -/obj/structure/flora/pottedplant/random, +/obj/random/pottedplant, /obj/effect/floor_decal/corner/yellow{ dir = 6; icon_state = "corner_white" @@ -4394,7 +4394,7 @@ /turf/simulated/floor/tiled/dark, /area/grand_romanovich) "lI" = ( -/obj/structure/flora/pottedplant/random, +/obj/random/pottedplant, /obj/effect/floor_decal/corner/yellow{ dir = 5; icon_state = "corner_white" @@ -4945,7 +4945,7 @@ /turf/simulated/floor/wood, /area/grand_romanovich) "mY" = ( -/obj/structure/flora/pottedplant/random, +/obj/random/pottedplant, /obj/effect/floor_decal/corner/yellow/full{ dir = 1; icon_state = "corner_white_full" @@ -5024,7 +5024,7 @@ /turf/simulated/floor/tiled/dark, /area/grand_romanovich) "nk" = ( -/obj/structure/flora/pottedplant/random, +/obj/random/pottedplant, /obj/effect/floor_decal/corner/yellow/full{ dir = 4; icon_state = "corner_white_full" @@ -5433,7 +5433,7 @@ /obj/machinery/atm{ pixel_y = -32 }, -/obj/structure/flora/pottedplant/random, +/obj/random/pottedplant, /obj/effect/floor_decal/corner/yellow/full{ dir = 4; icon_state = "corner_white_full" @@ -5865,7 +5865,7 @@ icon_state = "tube1"; pixel_y = 0 }, -/obj/structure/flora/pottedplant/random, +/obj/random/pottedplant, /turf/simulated/floor/carpet/art, /area/grand_romanovich) "ub" = ( @@ -6656,7 +6656,7 @@ /turf/simulated/floor/wood, /area/grand_romanovich) "FQ" = ( -/obj/structure/flora/pottedplant/random, +/obj/random/pottedplant, /turf/simulated/floor/tiled/freezer, /area/grand_romanovich) "FR" = ( @@ -6803,7 +6803,7 @@ /turf/simulated/floor/wood, /area/grand_romanovich) "Iz" = ( -/obj/structure/flora/pottedplant/random, +/obj/random/pottedplant, /obj/effect/floor_decal/corner/yellow/full{ icon_state = "corner_white_full" }, @@ -6877,7 +6877,7 @@ dir = 6; icon_state = "spline_fancy" }, -/obj/structure/flora/pottedplant/random, +/obj/random/pottedplant, /obj/machinery/light{ dir = 4; icon_state = "tube1" @@ -7455,7 +7455,7 @@ /turf/simulated/floor/wood, /area/grand_romanovich) "Sg" = ( -/obj/structure/flora/pottedplant/random, +/obj/random/pottedplant, /obj/effect/floor_decal/spline/fancy/wood{ dir = 10; icon_state = "spline_fancy" diff --git a/maps/away/away_site/sensor_relay/sensor_relay.dmm b/maps/away/away_site/sensor_relay/sensor_relay.dmm index b1ed3d6cf48..ddca6a610e9 100644 --- a/maps/away/away_site/sensor_relay/sensor_relay.dmm +++ b/maps/away/away_site/sensor_relay/sensor_relay.dmm @@ -662,7 +662,7 @@ /obj/machinery/light{ dir = 1 }, -/obj/structure/flora/pottedplant/random, +/obj/random/pottedplant, /turf/simulated/floor/carpet/rubber, /area/sensor_relay) "kYx" = ( diff --git a/maps/away/away_site/space_bar/space_bar.dmm b/maps/away/away_site/space_bar/space_bar.dmm index 2c22d18d95c..9393a1881a6 100644 --- a/maps/away/away_site/space_bar/space_bar.dmm +++ b/maps/away/away_site/space_bar/space_bar.dmm @@ -407,7 +407,7 @@ /turf/simulated/floor/tiled/white, /area/space_bar) "dcL" = ( -/obj/structure/flora/pottedplant/random, +/obj/random/pottedplant, /obj/effect/floor_decal/corner_wide/beige/full{ dir = 4 }, @@ -601,7 +601,7 @@ /turf/simulated/floor/lino/grey, /area/space_bar) "gTv" = ( -/obj/structure/flora/pottedplant/random, +/obj/random/pottedplant, /obj/machinery/light{ dir = 1; icon_state = "tube1" @@ -642,7 +642,7 @@ /turf/simulated/floor/lino/grey, /area/space_bar) "hmL" = ( -/obj/structure/flora/pottedplant/random, +/obj/random/pottedplant, /obj/effect/floor_decal/corner_wide/beige/full, /turf/simulated/floor/holofloor/tiled, /area/space_bar) @@ -1008,7 +1008,7 @@ /turf/simulated/floor/tiled/freezer, /area/space_bar) "pre" = ( -/obj/structure/flora/pottedplant/random, +/obj/random/pottedplant, /obj/structure/disposalpipe/segment{ dir = 1; icon_state = "pipe-c" @@ -1365,7 +1365,7 @@ /turf/simulated/floor/holofloor/tiled, /area/space_bar) "wmd" = ( -/obj/structure/flora/pottedplant/random, +/obj/random/pottedplant, /turf/simulated/floor/wood, /area/space_bar) "wJk" = ( diff --git a/maps/away/away_site/wrecked_nt_ship/wrecked_nt_ship.dmm b/maps/away/away_site/wrecked_nt_ship/wrecked_nt_ship.dmm index c1f6b4a072c..f219d5aa877 100644 --- a/maps/away/away_site/wrecked_nt_ship/wrecked_nt_ship.dmm +++ b/maps/away/away_site/wrecked_nt_ship/wrecked_nt_ship.dmm @@ -1229,7 +1229,7 @@ /area/wrecked_nt_ship) "Ao" = ( /obj/item/trash/spitgum, -/obj/structure/flora/pottedplant/random, +/obj/random/pottedplant, /turf/simulated/floor/tiled/steel/airless, /area/wrecked_nt_ship) "AD" = ( @@ -1520,7 +1520,7 @@ /area/wrecked_nt_ship) "HS" = ( /obj/item/trash/grease, -/obj/structure/flora/pottedplant/random, +/obj/random/pottedplant, /turf/simulated/floor/tiled/steel/airless, /area/wrecked_nt_ship) "Ih" = ( @@ -1833,7 +1833,7 @@ /turf/simulated/floor/airless, /area/wrecked_nt_ship) "Px" = ( -/obj/structure/flora/pottedplant/random, +/obj/random/pottedplant, /turf/simulated/floor/tiled/steel/airless, /area/wrecked_nt_ship) "Py" = ( diff --git a/maps/away/ships/casino/casino.dmm b/maps/away/ships/casino/casino.dmm index 5e60e9dff9e..a55032ca9a5 100644 --- a/maps/away/ships/casino/casino.dmm +++ b/maps/away/ships/casino/casino.dmm @@ -243,7 +243,7 @@ name = "west bump"; pixel_x = -24 }, -/obj/structure/flora/pottedplant/random, +/obj/random/pottedplant, /turf/simulated/floor/tiled, /area/casino/casino_bridge) "aW" = ( @@ -3077,7 +3077,7 @@ /area/casino/casino_mainfloor) "iS" = ( /obj/machinery/light, -/obj/structure/flora/pottedplant/random, +/obj/random/pottedplant, /turf/simulated/floor/carpet/fancybrown, /area/casino/casino_mainfloor) "iT" = ( @@ -3706,7 +3706,7 @@ /obj/machinery/light{ dir = 1 }, -/obj/structure/flora/pottedplant/random, +/obj/random/pottedplant, /obj/item/ammo_casing/pistol/magnum/used{ pixel_x = -10; pixel_y = -11 @@ -5132,7 +5132,7 @@ /turf/simulated/floor/tiled/steel, /area/shuttle/casino_cutter) "zl" = ( -/obj/structure/flora/pottedplant/random, +/obj/random/pottedplant, /turf/simulated/floor/carpet/fancybrown, /area/casino/casino_mainfloor) "zL" = ( @@ -5239,7 +5239,7 @@ /area/casino/casino_kitchen) "Ck" = ( /obj/random/spacecash, -/obj/structure/flora/pottedplant/random, +/obj/random/pottedplant, /turf/simulated/floor/carpet/fancybrown, /area/casino/casino_mainfloor) "CL" = ( diff --git a/maps/away/ships/iac/iac_rescue_ship.dmm b/maps/away/ships/iac/iac_rescue_ship.dmm index 5d2c6774867..6b86aa294c6 100644 --- a/maps/away/ships/iac/iac_rescue_ship.dmm +++ b/maps/away/ships/iac/iac_rescue_ship.dmm @@ -1114,7 +1114,7 @@ /turf/simulated/floor, /area/ship/iac_rescue_ship/portengine) "fqs" = ( -/obj/structure/flora/pottedplant/random, +/obj/random/pottedplant, /turf/simulated/floor/tiled/dark, /area/ship/iac_rescue_ship/hallway) "fqz" = ( @@ -2875,7 +2875,7 @@ /turf/simulated/floor, /area/ship/iac_rescue_ship/portengine) "rmz" = ( -/obj/structure/flora/pottedplant/random, +/obj/random/pottedplant, /obj/structure/cable, /obj/machinery/power/apc{ dir = 8; diff --git a/maps/away/ships/kataphracts/kataphract_ship.dmm b/maps/away/ships/kataphracts/kataphract_ship.dmm index da9bb401f9f..fc402c448e8 100644 --- a/maps/away/ships/kataphracts/kataphract_ship.dmm +++ b/maps/away/ships/kataphracts/kataphract_ship.dmm @@ -8260,7 +8260,7 @@ /turf/simulated/wall/r_wall, /area/shuttle/kataphract_shuttle/main_compartment) "Cp" = ( -/obj/structure/flora/pottedplant/random, +/obj/random/pottedplant, /turf/simulated/floor/tiled, /area/kataphract_chapter/entry) "Cx" = ( @@ -8551,7 +8551,7 @@ /area/kataphract_chapter/cic) "Fc" = ( /obj/structure/table/steel, -/obj/structure/flora/pottedplant/random{ +/obj/random/pottedplant{ pixel_y = 5 }, /obj/machinery/atmospherics/unary/vent_scrubber/on{ diff --git a/maps/away/ships/sol_ssmd/ssmd_ship.dmm b/maps/away/ships/sol_ssmd/ssmd_ship.dmm index 3b452e20b28..36dd9d956e3 100644 --- a/maps/away/ships/sol_ssmd/ssmd_ship.dmm +++ b/maps/away/ships/sol_ssmd/ssmd_ship.dmm @@ -995,7 +995,7 @@ /area/ship/ssmd_corvette/dorms) "cVG" = ( /obj/effect/floor_decal/corner_wide/green/full, -/obj/structure/flora/pottedplant/random, +/obj/random/pottedplant, /obj/machinery/light/colored/blue, /turf/simulated/floor/tiled/white, /area/ship/ssmd_corvette/medbay) diff --git a/maps/away/ships/tajara/circus/adhomian_circus.dmm b/maps/away/ships/tajara/circus/adhomian_circus.dmm index 56eeb6f0f13..8368ede96d2 100644 --- a/maps/away/ships/tajara/circus/adhomian_circus.dmm +++ b/maps/away/ships/tajara/circus/adhomian_circus.dmm @@ -581,7 +581,7 @@ }, /area/adhomian_circus/clown) "cJz" = ( -/obj/structure/flora/pottedplant/random, +/obj/random/pottedplant, /obj/machinery/atmospherics/unary/vent_pump/on{ dir = 8 }, diff --git a/maps/event/generic_dock/generic_dock-1.dmm b/maps/event/generic_dock/generic_dock-1.dmm index 7695f9e95c4..71e9d76c53f 100644 --- a/maps/event/generic_dock/generic_dock-1.dmm +++ b/maps/event/generic_dock/generic_dock-1.dmm @@ -1479,7 +1479,7 @@ /obj/effect/floor_decal/corner/red{ dir = 5 }, -/obj/structure/flora/pottedplant/random{ +/obj/random/pottedplant{ anchored = 1; pixel_y = 18 }, @@ -2019,7 +2019,7 @@ /turf/unsimulated/floor/plating, /area/shuttle/escape) "aWC" = ( -/obj/structure/flora/pottedplant/random, +/obj/random/pottedplant, /turf/simulated/floor/shuttle/dark_blue, /area/shuttle/escape) "aWD" = ( @@ -4940,7 +4940,7 @@ /turf/unsimulated/floor/plating, /area/shuttle/administration) "eIJ" = ( -/obj/structure/flora/pottedplant/random{ +/obj/random/pottedplant{ anchored = 1; pixel_y = 18 }, @@ -8704,7 +8704,7 @@ /turf/unsimulated/floor, /area/tdome/tdomeadmin) "juP" = ( -/obj/structure/flora/pottedplant/random{ +/obj/random/pottedplant{ anchored = 1; pixel_y = 18 }, @@ -10625,7 +10625,7 @@ /obj/effect/floor_decal/corner/grey{ dir = 5 }, -/obj/structure/flora/pottedplant/random{ +/obj/random/pottedplant{ anchored = 1; pixel_y = 18 }, @@ -12719,7 +12719,7 @@ /turf/unsimulated/floor/plating, /area/shuttle/escape) "oQw" = ( -/obj/structure/flora/pottedplant/random, +/obj/random/pottedplant, /turf/unsimulated/floor{ icon_state = "wood" }, @@ -13632,7 +13632,7 @@ /obj/effect/floor_decal/corner/paleblue{ dir = 1 }, -/obj/structure/flora/pottedplant/random, +/obj/random/pottedplant, /turf/unsimulated/floor, /area/centcom/holding) "qcl" = ( @@ -16985,7 +16985,7 @@ /obj/effect/floor_decal/corner/paleblue{ dir = 6 }, -/obj/structure/flora/pottedplant/random, +/obj/random/pottedplant, /turf/unsimulated/floor, /area/centcom/spawning) "wbN" = ( @@ -17599,7 +17599,7 @@ /obj/effect/floor_decal/corner/paleblue{ dir = 6 }, -/obj/structure/flora/pottedplant/random{ +/obj/random/pottedplant{ anchored = 1; pixel_y = 5 }, @@ -17688,7 +17688,7 @@ /obj/effect/floor_decal/corner/paleblue{ dir = 4 }, -/obj/structure/flora/pottedplant/random, +/obj/random/pottedplant, /turf/unsimulated/floor, /area/centcom/holding) "wYn" = ( diff --git a/maps/event/idris_cruise/idris_cruise-1.dmm b/maps/event/idris_cruise/idris_cruise-1.dmm index 2d5a4e756c3..e6eea486a0b 100644 --- a/maps/event/idris_cruise/idris_cruise-1.dmm +++ b/maps/event/idris_cruise/idris_cruise-1.dmm @@ -31,7 +31,7 @@ layer = 4.1; opacity = 0 }, -/obj/structure/flora/pottedplant/random, +/obj/random/pottedplant, /obj/effect/floor_decal/spline/fancy/wood, /turf/unsimulated/floor{ icon_state = "wood_light" @@ -509,7 +509,7 @@ /obj/structure/railing/mapped{ dir = 8 }, -/obj/structure/flora/pottedplant/random, +/obj/random/pottedplant, /turf/unsimulated/floor{ icon_state = "wood_birch" }, @@ -1513,7 +1513,7 @@ layer = 4.1; opacity = 0 }, -/obj/structure/flora/pottedplant/random, +/obj/random/pottedplant, /obj/effect/floor_decal/spline/fancy/wood, /turf/unsimulated/floor{ dir = 8; @@ -1868,7 +1868,7 @@ }, /area/cruise/main_bar/aft) "bog" = ( -/obj/structure/flora/pottedplant/random, +/obj/random/pottedplant, /obj/machinery/light{ dir = 1 }, @@ -1925,7 +1925,7 @@ }, /area/cruise/pool) "boX" = ( -/obj/structure/flora/pottedplant/random, +/obj/random/pottedplant, /obj/machinery/light{ dir = 8 }, @@ -2460,7 +2460,7 @@ }, /area/cruise/pool) "bOl" = ( -/obj/structure/flora/pottedplant/random, +/obj/random/pottedplant, /turf/unsimulated/floor{ icon_state = "dark" }, @@ -3632,7 +3632,7 @@ /area/cruise/arcade) "cOM" = ( /obj/effect/floor_decal/spline/fancy/wood/full, -/obj/structure/flora/pottedplant/random, +/obj/random/pottedplant, /turf/unsimulated/floor{ icon_state = "wood_birch" }, @@ -3998,7 +3998,7 @@ }, /area/cruise/library) "dcL" = ( -/obj/structure/flora/pottedplant/random, +/obj/random/pottedplant, /obj/machinery/light, /turf/unsimulated/floor{ icon_state = "wood_birch" @@ -4062,7 +4062,7 @@ /area/cruise/arcade) "dek" = ( /obj/effect/floor_decal/spline/fancy/wood/full, -/obj/structure/flora/pottedplant/random, +/obj/random/pottedplant, /turf/unsimulated/floor{ icon_state = "wood_birch" }, @@ -4185,7 +4185,7 @@ /obj/structure/window/reinforced{ dir = 1 }, -/obj/structure/flora/pottedplant/random, +/obj/random/pottedplant, /obj/structure/window/reinforced{ dir = 4 }, @@ -4967,7 +4967,7 @@ /obj/structure/railing/mapped{ dir = 4 }, -/obj/structure/flora/pottedplant/random, +/obj/random/pottedplant, /obj/effect/floor_decal/corner/beige/diagonal, /obj/machinery/light{ dir = 8 @@ -7529,7 +7529,7 @@ /area/template_noop) "fXe" = ( /obj/effect/floor_decal/spline/fancy/wood/full, -/obj/structure/flora/pottedplant/random, +/obj/random/pottedplant, /obj/machinery/light{ dir = 1 }, @@ -7675,7 +7675,7 @@ /area/cruise/beach) "gbW" = ( /obj/effect/floor_decal/spline/fancy/wood/full, -/obj/structure/flora/pottedplant/random, +/obj/random/pottedplant, /turf/unsimulated/floor{ icon_state = "wood_birch" }, @@ -10407,7 +10407,7 @@ /obj/structure/railing/mapped{ dir = 8 }, -/obj/structure/flora/pottedplant/random, +/obj/random/pottedplant, /obj/machinery/light{ dir = 1 }, @@ -11570,7 +11570,7 @@ }, /area/cruise/main_bar/aft) "jfO" = ( -/obj/structure/flora/pottedplant/random, +/obj/random/pottedplant, /obj/machinery/light/small, /turf/unsimulated/floor{ icon_state = "lino_grey" @@ -11966,7 +11966,7 @@ }, /area/cruise/beach) "jvf" = ( -/obj/structure/flora/pottedplant/random, +/obj/random/pottedplant, /turf/unsimulated/floor{ icon_state = "dark" }, @@ -12351,7 +12351,7 @@ }, /area/cruise/pool/sauna1) "jRv" = ( -/obj/structure/flora/pottedplant/random, +/obj/random/pottedplant, /obj/structure/sign/flag/idris{ pixel_y = 32 }, @@ -12366,7 +12366,7 @@ /obj/structure/window/reinforced{ dir = 1 }, -/obj/structure/flora/pottedplant/random, +/obj/random/pottedplant, /obj/structure/window/reinforced{ dir = 8 }, @@ -13024,7 +13024,7 @@ /area/cruise/security) "ksy" = ( /obj/effect/floor_decal/spline/fancy/wood/full, -/obj/structure/flora/pottedplant/random, +/obj/random/pottedplant, /obj/effect/decal/fake_object{ desc = "A descriptive sign."; icon = 'icons/effects/ship_idris_cruise.dmi'; @@ -14194,7 +14194,7 @@ }, /area/cruise/security) "loo" = ( -/obj/structure/flora/pottedplant/random, +/obj/random/pottedplant, /turf/unsimulated/floor{ icon_state = "dark2" }, @@ -14260,7 +14260,7 @@ /obj/structure/window/reinforced{ dir = 1 }, -/obj/structure/flora/pottedplant/random, +/obj/random/pottedplant, /obj/machinery/light{ dir = 4 }, @@ -15329,7 +15329,7 @@ /area/cruise/centerline) "mdJ" = ( /obj/effect/floor_decal/spline/fancy/wood/full, -/obj/structure/flora/pottedplant/random, +/obj/random/pottedplant, /turf/unsimulated/floor{ icon_state = "wood_birch" }, @@ -16729,7 +16729,7 @@ /area/cruise/virtual_reality) "nfM" = ( /obj/effect/floor_decal/spline/fancy/wood/full, -/obj/structure/flora/pottedplant/random, +/obj/random/pottedplant, /obj/machinery/light{ dir = 4 }, @@ -16967,7 +16967,7 @@ }, /area/cruise/hangar) "nvO" = ( -/obj/structure/flora/pottedplant/random, +/obj/random/pottedplant, /obj/structure/railing/mapped, /obj/structure/railing/mapped{ dir = 4 @@ -17889,7 +17889,7 @@ }, /area/cruise/virtual_reality) "oeV" = ( -/obj/structure/flora/pottedplant/random, +/obj/random/pottedplant, /obj/machinery/light{ dir = 4 }, @@ -17958,7 +17958,7 @@ }, /area/cruise/escort) "ojt" = ( -/obj/structure/flora/pottedplant/random, +/obj/random/pottedplant, /obj/structure/sign/flag/idris{ pixel_y = 32 }, @@ -18090,7 +18090,7 @@ }, /area/template_noop) "omS" = ( -/obj/structure/flora/pottedplant/random, +/obj/random/pottedplant, /obj/structure/sign/flag/idris{ pixel_y = 32 }, @@ -18183,7 +18183,7 @@ name = "elevator button"; pixel_y = 34 }, -/obj/structure/flora/pottedplant/random, +/obj/random/pottedplant, /obj/machinery/light{ dir = 4 }, @@ -18266,7 +18266,7 @@ }, /area/cruise/fore_s) "otQ" = ( -/obj/structure/flora/pottedplant/random, +/obj/random/pottedplant, /turf/unsimulated/floor{ icon_state = "dark2" }, @@ -18716,7 +18716,7 @@ }, /area/template_noop) "oQb" = ( -/obj/structure/flora/pottedplant/random, +/obj/random/pottedplant, /turf/unsimulated/floor{ icon_state = "turquoise" }, @@ -19454,7 +19454,7 @@ }, /obj/structure/window/reinforced, /obj/structure/railing/mapped, -/obj/structure/flora/pottedplant/random, +/obj/random/pottedplant, /turf/unsimulated/floor{ icon_state = "tiles_small" }, @@ -19592,7 +19592,7 @@ /obj/structure/railing/mapped{ dir = 8 }, -/obj/structure/flora/pottedplant/random, +/obj/random/pottedplant, /obj/effect/floor_decal/corner/beige/diagonal, /turf/unsimulated/floor{ icon_state = "dark2" @@ -20130,7 +20130,7 @@ layer = 4.1; opacity = 0 }, -/obj/structure/flora/pottedplant/random, +/obj/random/pottedplant, /obj/effect/floor_decal/spline/fancy/wood, /turf/unsimulated/floor{ icon_state = "wood_cherry" @@ -21722,7 +21722,7 @@ }, /area/cruise/jungle) "rtn" = ( -/obj/structure/flora/pottedplant/random, +/obj/random/pottedplant, /obj/effect/floor_decal/spline/fancy{ dir = 8 }, @@ -21945,7 +21945,7 @@ /area/cruise/e_supplies) "rEV" = ( /obj/structure/railing/mapped, -/obj/structure/flora/pottedplant/random, +/obj/random/pottedplant, /obj/machinery/light/small{ dir = 4 }, @@ -22460,7 +22460,7 @@ /obj/structure/railing/mapped{ dir = 4 }, -/obj/structure/flora/pottedplant/random, +/obj/random/pottedplant, /obj/machinery/light{ dir = 1 }, @@ -24185,7 +24185,7 @@ }, /area/cruise/virtual_reality) "tul" = ( -/obj/structure/flora/pottedplant/random, +/obj/random/pottedplant, /obj/machinery/light{ dir = 8 }, @@ -24777,7 +24777,7 @@ }, /area/template_noop) "tQP" = ( -/obj/structure/flora/pottedplant/random, +/obj/random/pottedplant, /obj/machinery/atm{ pixel_y = 28 }, @@ -24800,7 +24800,7 @@ }, /area/cruise/dining_hall) "tRu" = ( -/obj/structure/flora/pottedplant/random, +/obj/random/pottedplant, /obj/item/device/radio/intercom{ dir = 4; pixel_x = -24 @@ -25141,7 +25141,7 @@ }, /area/cruise/e_supplies) "ucr" = ( -/obj/structure/flora/pottedplant/random, +/obj/random/pottedplant, /turf/unsimulated/floor{ icon_state = "wood_birch" }, @@ -25418,7 +25418,7 @@ /obj/structure/window/reinforced{ dir = 4 }, -/obj/structure/flora/pottedplant/random, +/obj/random/pottedplant, /turf/unsimulated/floor{ icon_state = "tiles_small" }, @@ -26488,7 +26488,7 @@ }, /area/cruise/library) "vdp" = ( -/obj/structure/flora/pottedplant/random, +/obj/random/pottedplant, /obj/machinery/light, /turf/unsimulated/floor{ icon_state = "dark" @@ -27127,14 +27127,14 @@ /area/template_noop) "vIP" = ( /obj/effect/floor_decal/spline/fancy/wood/full, -/obj/structure/flora/pottedplant/random, +/obj/random/pottedplant, /turf/unsimulated/floor{ icon_state = "wood_birch" }, /area/cruise/aft) "vJi" = ( /obj/effect/floor_decal/spline/fancy/wood/full, -/obj/structure/flora/pottedplant/random, +/obj/random/pottedplant, /obj/machinery/light{ dir = 4 }, @@ -27311,7 +27311,7 @@ }, /area/cruise/escort) "vSy" = ( -/obj/structure/flora/pottedplant/random, +/obj/random/pottedplant, /obj/machinery/light{ dir = 8 }, @@ -28959,7 +28959,7 @@ /obj/structure/railing/mapped{ dir = 4 }, -/obj/structure/flora/pottedplant/random, +/obj/random/pottedplant, /obj/machinery/light/small{ dir = 1 }, @@ -29169,7 +29169,7 @@ }, /area/cruise/virtual_reality) "xqd" = ( -/obj/structure/flora/pottedplant/random, +/obj/random/pottedplant, /obj/machinery/light, /turf/unsimulated/floor{ icon_state = "wood_cherry" diff --git a/maps/event/rooftop/rooftop-1.dmm b/maps/event/rooftop/rooftop-1.dmm index 714513a1d19..d51d728ea49 100644 --- a/maps/event/rooftop/rooftop-1.dmm +++ b/maps/event/rooftop/rooftop-1.dmm @@ -42,7 +42,7 @@ /turf/simulated/floor/wood, /area/city/mendell/interior) "am" = ( -/obj/structure/flora/pottedplant/random, +/obj/random/pottedplant, /turf/unsimulated/floor{ icon_state = "wood_light" }, @@ -156,7 +156,7 @@ /obj/machinery/light/small{ dir = 8 }, -/obj/structure/flora/pottedplant/random, +/obj/random/pottedplant, /turf/simulated/floor/lino/grey, /area/city/mendell/interior) "aW" = ( @@ -245,7 +245,7 @@ /area/city/mendell/interior) "bu" = ( /obj/effect/floor_decal/spline/fancy/wood/full, -/obj/structure/flora/pottedplant/random, +/obj/random/pottedplant, /obj/structure/railing/mapped{ dir = 1 }, @@ -832,7 +832,7 @@ /area/city/mendell/interior) "eA" = ( /obj/effect/floor_decal/spline/fancy/wood/full, -/obj/structure/flora/pottedplant/random, +/obj/random/pottedplant, /obj/effect/decal/fake_object{ desc = "It's used to monitor rooms."; dir = 8; @@ -1632,7 +1632,7 @@ /area/city/mendell) "is" = ( /obj/effect/floor_decal/spline/fancy/wood/full, -/obj/structure/flora/pottedplant/random, +/obj/random/pottedplant, /turf/simulated/floor/wood, /area/city/mendell) "iu" = ( @@ -2072,7 +2072,7 @@ /area/city/mendell) "kY" = ( /obj/effect/floor_decal/spline/fancy/wood/full, -/obj/structure/flora/pottedplant/random, +/obj/random/pottedplant, /turf/simulated/floor/wood, /area/city/mendell/interior) "kZ" = ( @@ -2099,7 +2099,7 @@ }, /area/city/mendell/interior) "lc" = ( -/obj/structure/flora/pottedplant/random, +/obj/random/pottedplant, /turf/simulated/floor/marble/dark, /area/city/mendell/interior) "le" = ( @@ -2429,7 +2429,7 @@ /obj/machinery/light/small{ dir = 4 }, -/obj/structure/flora/pottedplant/random, +/obj/random/pottedplant, /turf/simulated/floor/lino/grey, /area/city/mendell/interior) "nm" = ( @@ -2462,7 +2462,7 @@ /turf/simulated/floor/marble/dark, /area/city/mendell/interior) "nu" = ( -/obj/structure/flora/pottedplant/random, +/obj/random/pottedplant, /obj/effect/floor_decal/spline/fancy/wood/full, /turf/simulated/floor/wood, /area/city/mendell/interior) @@ -2500,7 +2500,7 @@ pixel_x = 25; req_access = list(101) }, -/obj/structure/flora/pottedplant/random, +/obj/random/pottedplant, /obj/effect/floor_decal/spline/fancy/wood/full, /turf/simulated/floor/wood, /area/city/mendell/interior) @@ -2973,7 +2973,7 @@ dir = 1 }, /obj/effect/floor_decal/spline/fancy/wood/full, -/obj/structure/flora/pottedplant/random, +/obj/random/pottedplant, /turf/simulated/floor/wood, /area/city/mendell/interior) "qX" = ( @@ -4730,7 +4730,7 @@ /turf/simulated/floor/lino/grey, /area/city/mendell/interior) "AN" = ( -/obj/structure/flora/pottedplant/random, +/obj/random/pottedplant, /obj/machinery/light/small, /turf/unsimulated/floor{ icon_state = "wood_cherry" @@ -4747,7 +4747,7 @@ /area/city/mendell) "AU" = ( /obj/effect/floor_decal/spline/fancy/wood/full, -/obj/structure/flora/pottedplant/random, +/obj/random/pottedplant, /obj/structure/railing/mapped{ dir = 8 }, @@ -4850,7 +4850,7 @@ /area/city/mendell/interior) "BI" = ( /obj/effect/floor_decal/spline/fancy/wood/full, -/obj/structure/flora/pottedplant/random, +/obj/random/pottedplant, /obj/structure/railing/mapped{ dir = 4 }, @@ -6434,7 +6434,7 @@ /area/city/mendell/interior) "Lx" = ( /obj/effect/floor_decal/spline/fancy/wood/full, -/obj/structure/flora/pottedplant/random, +/obj/random/pottedplant, /obj/structure/window/reinforced{ dir = 1 }, @@ -6939,7 +6939,7 @@ name = "shelf"; pixel_y = 35 }, -/obj/structure/flora/pottedplant/random, +/obj/random/pottedplant, /turf/simulated/floor/wood, /area/city/mendell/interior) "NN" = ( @@ -7480,7 +7480,7 @@ /area/city/mendell/interior) "Qu" = ( /obj/effect/floor_decal/spline/fancy/wood/full, -/obj/structure/flora/pottedplant/random, +/obj/random/pottedplant, /obj/machinery/light/small{ dir = 1 }, @@ -8180,7 +8180,7 @@ }, /area/city/mendell/interior) "Us" = ( -/obj/structure/flora/pottedplant/random, +/obj/random/pottedplant, /turf/unsimulated/floor{ icon_state = "wood_cherry" }, @@ -8866,7 +8866,7 @@ /turf/simulated/floor/carpet, /area/city/mendell/interior) "YD" = ( -/obj/structure/flora/pottedplant/random, +/obj/random/pottedplant, /obj/effect/decal/fake_object{ desc = "A nondescript vent."; icon = 'icons/effects/city.dmi'; diff --git a/maps/random_ruins/exoplanets/adhomai/abandoned_village.dmm b/maps/random_ruins/exoplanets/adhomai/abandoned_village.dmm index 88386d205d8..6cd1156f932 100644 --- a/maps/random_ruins/exoplanets/adhomai/abandoned_village.dmm +++ b/maps/random_ruins/exoplanets/adhomai/abandoned_village.dmm @@ -311,7 +311,7 @@ }, /area/exoplanet/adhomai) "Ic" = ( -/obj/structure/flora/pottedplant/random, +/obj/random/pottedplant, /turf/simulated/floor/wood{ temperature = 268.15 }, diff --git a/maps/random_ruins/exoplanets/adhomai/adhomai_bar.dmm b/maps/random_ruins/exoplanets/adhomai/adhomai_bar.dmm index b4ff1137599..b6ca48b43c2 100644 --- a/maps/random_ruins/exoplanets/adhomai/adhomai_bar.dmm +++ b/maps/random_ruins/exoplanets/adhomai/adhomai_bar.dmm @@ -283,7 +283,7 @@ }, /area/adhomai_bar) "mw" = ( -/obj/structure/flora/pottedplant/random, +/obj/random/pottedplant, /turf/simulated/floor/wood{ temperature = 268.15 }, diff --git a/maps/random_ruins/exoplanets/adhomai/adhomai_raskariim_hideout.dmm b/maps/random_ruins/exoplanets/adhomai/adhomai_raskariim_hideout.dmm index adc61b300ce..81e985bac95 100644 --- a/maps/random_ruins/exoplanets/adhomai/adhomai_raskariim_hideout.dmm +++ b/maps/random_ruins/exoplanets/adhomai/adhomai_raskariim_hideout.dmm @@ -242,7 +242,7 @@ }, /area/adhomai_raskariim_hideout) "rg" = ( -/obj/structure/flora/pottedplant/random, +/obj/random/pottedplant, /turf/simulated/floor/wood{ temperature = 268.15 }, diff --git a/maps/random_ruins/exoplanets/adhomai/adhomai_village.dmm b/maps/random_ruins/exoplanets/adhomai/adhomai_village.dmm index 6c1ffc1ac38..5cc2751b808 100644 --- a/maps/random_ruins/exoplanets/adhomai/adhomai_village.dmm +++ b/maps/random_ruins/exoplanets/adhomai/adhomai_village.dmm @@ -678,7 +678,7 @@ }, /area/adhomai_village) "Ic" = ( -/obj/structure/flora/pottedplant/random, +/obj/random/pottedplant, /turf/simulated/floor/wood{ temperature = 268.15 }, diff --git a/maps/runtime/runtime-2.dmm b/maps/runtime/runtime-2.dmm index fa50b0d34f5..6bcb39535db 100644 --- a/maps/runtime/runtime-2.dmm +++ b/maps/runtime/runtime-2.dmm @@ -29,7 +29,7 @@ }, /area/tcommsat/computer) "bl" = ( -/obj/structure/flora/pottedplant/random{ +/obj/random/pottedplant{ desc = "I like moster truck"; name = "walter" }, diff --git a/maps/sccv_horizon/sccv_horizon-1_deck_1.dmm b/maps/sccv_horizon/sccv_horizon-1_deck_1.dmm index 5d2f69c659a..4ef73f73e9f 100644 --- a/maps/sccv_horizon/sccv_horizon-1_deck_1.dmm +++ b/maps/sccv_horizon/sccv_horizon-1_deck_1.dmm @@ -28,7 +28,7 @@ /obj/effect/floor_decal/corner/brown/full{ dir = 4 }, -/obj/structure/flora/pottedplant/random, +/obj/random/pottedplant, /turf/simulated/floor/tiled, /area/operations/storage) "acn" = ( @@ -21024,7 +21024,7 @@ /turf/simulated/floor/tiled, /area/hangar/intrepid) "oQa" = ( -/obj/structure/flora/pottedplant/random, +/obj/random/pottedplant, /obj/effect/floor_decal/spline/fancy/wood/full, /obj/structure/railing/mapped{ dir = 8 @@ -23127,7 +23127,7 @@ /obj/structure/railing/mapped{ dir = 1 }, -/obj/structure/flora/pottedplant/random, +/obj/random/pottedplant, /turf/simulated/floor/grass/alt, /area/hallway/primary/aft) "qog" = ( @@ -27962,7 +27962,7 @@ /obj/machinery/light/spot{ dir = 1 }, -/obj/structure/flora/pottedplant/random, +/obj/random/pottedplant, /obj/structure/railing/mapped{ dir = 8 }, @@ -28655,7 +28655,7 @@ pixel_y = 37; req_one_access = list(1,19) }, -/obj/structure/flora/pottedplant/random, +/obj/random/pottedplant, /obj/structure/railing/mapped{ dir = 8 }, diff --git a/maps/sccv_horizon/sccv_horizon-2_deck_2.dmm b/maps/sccv_horizon/sccv_horizon-2_deck_2.dmm index 7a64f425527..9c753a28f2d 100644 --- a/maps/sccv_horizon/sccv_horizon-2_deck_2.dmm +++ b/maps/sccv_horizon/sccv_horizon-2_deck_2.dmm @@ -27,7 +27,7 @@ /obj/machinery/light{ dir = 4 }, -/obj/structure/flora/pottedplant/random, +/obj/random/pottedplant, /obj/structure/extinguisher_cabinet{ pixel_x = 32 }, @@ -468,7 +468,7 @@ /obj/effect/floor_decal/corner/green/full{ dir = 1 }, -/obj/structure/flora/pottedplant/random, +/obj/random/pottedplant, /turf/simulated/floor/tiled, /area/horizon/hallway/deck_two/fore) "amI" = ( @@ -5680,7 +5680,7 @@ /obj/machinery/light{ dir = 8 }, -/obj/structure/flora/pottedplant/random, +/obj/random/pottedplant, /turf/simulated/floor/wood, /area/medical/psych) "cMc" = ( @@ -7261,7 +7261,7 @@ /obj/effect/floor_decal/corner/brown{ dir = 6 }, -/obj/structure/flora/pottedplant/random, +/obj/random/pottedplant, /turf/simulated/floor/tiled, /area/operations/lobby) "dBX" = ( @@ -9215,7 +9215,7 @@ /obj/effect/floor_decal/corner_wide/lime{ dir = 10 }, -/obj/structure/flora/pottedplant/random, +/obj/random/pottedplant, /turf/simulated/floor/tiled/white, /area/medical/reception) "eCR" = ( @@ -16033,7 +16033,7 @@ c_tag = "Second Deck - Dinner Entrance 1"; dir = 4 }, -/obj/structure/flora/pottedplant/random, +/obj/random/pottedplant, /turf/simulated/floor/tiled, /area/horizon/hallway/deck_two/fore) "hGJ" = ( @@ -17797,7 +17797,7 @@ /obj/effect/floor_decal/corner/brown{ dir = 5 }, -/obj/structure/flora/pottedplant/random, +/obj/random/pottedplant, /turf/simulated/floor/tiled, /area/operations/office) "iDt" = ( @@ -20179,7 +20179,7 @@ c_tag = "Service - Deck 2 - Dining Hall 2"; dir = 8 }, -/obj/structure/flora/pottedplant/random, +/obj/random/pottedplant, /turf/simulated/floor/lino/grey, /area/horizon/crew_quarters/lounge/bar) "jHd" = ( @@ -25110,7 +25110,7 @@ /obj/effect/floor_decal/corner_wide/lime{ dir = 9 }, -/obj/structure/flora/pottedplant/random, +/obj/random/pottedplant, /obj/machinery/computer/guestpass{ pixel_x = -32 }, @@ -25414,7 +25414,7 @@ /turf/simulated/floor/tiled/white, /area/horizon/crew_quarters/washroom/central) "mqR" = ( -/obj/structure/flora/pottedplant/random, +/obj/random/pottedplant, /obj/effect/floor_decal/corner_wide/green/full, /turf/simulated/floor/tiled/white, /area/medical/exam) @@ -29825,7 +29825,7 @@ /obj/machinery/light{ dir = 4 }, -/obj/structure/flora/pottedplant/random, +/obj/random/pottedplant, /obj/effect/floor_decal/corner_wide/green/full{ dir = 4 }, @@ -30191,7 +30191,7 @@ /obj/effect/floor_decal/spline/fancy/wood{ dir = 5 }, -/obj/structure/flora/pottedplant/random, +/obj/random/pottedplant, /obj/machinery/atmospherics/unary/vent_scrubber/on{ dir = 8 }, @@ -31139,7 +31139,7 @@ /obj/effect/floor_decal/corner/brown/full{ dir = 8 }, -/obj/structure/flora/pottedplant/random, +/obj/random/pottedplant, /turf/simulated/floor/tiled, /area/operations/office) "pfb" = ( @@ -31285,7 +31285,7 @@ /obj/effect/floor_decal/spline/fancy/wood{ dir = 9 }, -/obj/structure/flora/pottedplant/random, +/obj/random/pottedplant, /turf/simulated/floor/wood, /area/horizon/bar) "piz" = ( @@ -31347,7 +31347,7 @@ /turf/simulated/floor/tiled/full, /area/hallway/primary/central_one) "pjK" = ( -/obj/structure/flora/pottedplant/random, +/obj/random/pottedplant, /obj/machinery/newscaster/security_unit{ pixel_y = -30 }, @@ -32184,7 +32184,7 @@ /turf/simulated/floor/tiled, /area/operations/office) "pHJ" = ( -/obj/structure/flora/pottedplant/random, +/obj/random/pottedplant, /obj/effect/floor_decal/corner_wide/lime{ dir = 10 }, @@ -33550,7 +33550,7 @@ /turf/simulated/floor/plating, /area/maintenance/wing/starboard) "qrK" = ( -/obj/structure/flora/pottedplant/random, +/obj/random/pottedplant, /obj/effect/floor_decal/corner/green/full{ dir = 8 }, @@ -35262,7 +35262,7 @@ /turf/simulated/wall/r_wall, /area/operations/lower/machinist) "rgc" = ( -/obj/structure/flora/pottedplant/random, +/obj/random/pottedplant, /obj/effect/floor_decal/spline/fancy/wood{ dir = 10 }, @@ -36377,7 +36377,7 @@ /turf/simulated/floor/wood, /area/horizon/bar) "rJn" = ( -/obj/structure/flora/pottedplant/random, +/obj/random/pottedplant, /obj/machinery/power/apc{ dir = 8; name = "west bump"; @@ -37292,7 +37292,7 @@ dir = 8; pixel_x = 28 }, -/obj/structure/flora/pottedplant/random, +/obj/random/pottedplant, /turf/simulated/floor/wood, /area/medical/psych) "seZ" = ( @@ -38696,7 +38696,7 @@ /obj/machinery/light{ dir = 8 }, -/obj/structure/flora/pottedplant/random, +/obj/random/pottedplant, /turf/simulated/floor/wood, /area/horizon/crew_quarters/lounge/bar) "sUI" = ( @@ -43018,7 +43018,7 @@ /obj/effect/floor_decal/spline/fancy/wood{ dir = 1 }, -/obj/structure/flora/pottedplant/random, +/obj/random/pottedplant, /turf/simulated/floor/wood, /area/horizon/bar) "uUz" = ( @@ -43148,7 +43148,7 @@ /turf/simulated/open/airless, /area/horizon/exterior) "uZh" = ( -/obj/structure/flora/pottedplant/random, +/obj/random/pottedplant, /turf/simulated/floor/tiled/dark, /area/horizon/bar/backroom) "uZi" = ( @@ -46385,7 +46385,7 @@ /obj/effect/floor_decal/spline/fancy/wood{ dir = 8 }, -/obj/structure/flora/pottedplant/random, +/obj/random/pottedplant, /turf/simulated/floor/wood, /area/hallway/engineering) "wzM" = ( @@ -49804,7 +49804,7 @@ /turf/simulated/floor/tiled, /area/horizon/security/hallway) "yct" = ( -/obj/structure/flora/pottedplant/random, +/obj/random/pottedplant, /obj/machinery/light{ dir = 4 }, diff --git a/maps/sccv_horizon/sccv_horizon-3_deck_3.dmm b/maps/sccv_horizon/sccv_horizon-3_deck_3.dmm index f11f8d340b9..c011185e559 100644 --- a/maps/sccv_horizon/sccv_horizon-3_deck_3.dmm +++ b/maps/sccv_horizon/sccv_horizon-3_deck_3.dmm @@ -224,7 +224,7 @@ c_tag = "Third Deck - Journalist Office"; dir = 1 }, -/obj/structure/flora/pottedplant/random, +/obj/random/pottedplant, /obj/machinery/light{ dir = 8 }, @@ -284,7 +284,7 @@ /turf/simulated/floor/tiled, /area/horizon/hallway/deck_three/primary/central) "agZ" = ( -/obj/structure/flora/pottedplant/random, +/obj/random/pottedplant, /obj/effect/floor_decal/spline/fancy/wood{ dir = 10 }, @@ -542,7 +542,7 @@ /turf/simulated/floor/tiled/dark, /area/bridge/aibunker) "aqY" = ( -/obj/structure/flora/pottedplant/random, +/obj/random/pottedplant, /obj/effect/floor_decal/spline/fancy/wood{ dir = 6 }, @@ -712,7 +712,7 @@ /obj/effect/floor_decal/spline/fancy{ dir = 6 }, -/obj/structure/flora/pottedplant/random, +/obj/random/pottedplant, /turf/simulated/floor/carpet/rubber, /area/bridge/controlroom) "aBq" = ( @@ -870,7 +870,7 @@ /obj/effect/floor_decal/spline/fancy{ dir = 1 }, -/obj/structure/flora/pottedplant/random, +/obj/random/pottedplant, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/carpet/rubber, /area/bridge/controlroom) @@ -3344,7 +3344,7 @@ /obj/effect/floor_decal/corner/blue{ dir = 9 }, -/obj/structure/flora/pottedplant/random, +/obj/random/pottedplant, /turf/simulated/floor/tiled/dark, /area/bridge/controlroom) "cYs" = ( @@ -4960,7 +4960,7 @@ /turf/simulated/floor/tiled, /area/horizon/hallway/deck_three/primary/starboard) "end" = ( -/obj/structure/flora/pottedplant/random, +/obj/random/pottedplant, /obj/effect/floor_decal/corner/green/full{ dir = 8 }, @@ -5482,7 +5482,7 @@ /obj/machinery/atmospherics/unary/vent_scrubber/on{ dir = 8 }, -/obj/structure/flora/pottedplant/random, +/obj/random/pottedplant, /obj/machinery/light{ dir = 4 }, @@ -6048,7 +6048,7 @@ /area/bridge) "fey" = ( /obj/effect/floor_decal/corner/brown/diagonal, -/obj/structure/flora/pottedplant/random, +/obj/random/pottedplant, /obj/structure/extinguisher_cabinet{ pixel_y = 32 }, @@ -6104,7 +6104,7 @@ pixel_x = -24; pixel_y = 9 }, -/obj/structure/flora/pottedplant/random, +/obj/random/pottedplant, /turf/simulated/floor/wood, /area/bridge/meeting_room) "fgF" = ( @@ -6871,7 +6871,7 @@ /obj/effect/floor_decal/spline/fancy/wood{ dir = 10 }, -/obj/structure/flora/pottedplant/random, +/obj/random/pottedplant, /turf/simulated/floor/wood, /area/crew_quarters/lounge/secondary) "fDI" = ( @@ -7592,7 +7592,7 @@ c_tag = "Bridge - Corridor Camera 1" }, /obj/effect/floor_decal/corner/blue/diagonal, -/obj/structure/flora/pottedplant/random, +/obj/random/pottedplant, /turf/simulated/floor/tiled, /area/bridge) "ggJ" = ( @@ -9016,7 +9016,7 @@ /obj/machinery/atmospherics/unary/vent_scrubber/on{ dir = 8 }, -/obj/structure/flora/pottedplant/random, +/obj/random/pottedplant, /turf/simulated/floor/tiled, /area/horizon/security/investigations_hallway) "hja" = ( @@ -9712,7 +9712,7 @@ /obj/effect/floor_decal/corner_wide/paleblue/full{ dir = 4 }, -/obj/structure/flora/pottedplant/random, +/obj/random/pottedplant, /obj/machinery/light{ dir = 4 }, @@ -9844,7 +9844,7 @@ /obj/effect/floor_decal/corner/green/full{ dir = 8 }, -/obj/structure/flora/pottedplant/random, +/obj/random/pottedplant, /turf/simulated/floor/tiled, /area/horizon/hallway/deck_three/primary/central) "hQq" = ( @@ -10442,7 +10442,7 @@ dir = 4 }, /obj/machinery/light, -/obj/structure/flora/pottedplant/random, +/obj/random/pottedplant, /turf/simulated/floor/tiled/white, /area/horizon/security/forensic_laboratory) "iwi" = ( @@ -11798,7 +11798,7 @@ /obj/machinery/atmospherics/unary/vent_pump/on{ dir = 1 }, -/obj/structure/flora/pottedplant/random, +/obj/random/pottedplant, /turf/simulated/floor/reinforced, /area/bridge/controlroom) "jxS" = ( @@ -14366,7 +14366,7 @@ /obj/effect/floor_decal/corner/green/full{ dir = 4 }, -/obj/structure/flora/pottedplant/random, +/obj/random/pottedplant, /turf/simulated/floor/tiled, /area/horizon/hallway/deck_three/primary/starboard) "lou" = ( @@ -16908,7 +16908,7 @@ /obj/effect/floor_decal/corner/blue/full{ dir = 4 }, -/obj/structure/flora/pottedplant/random, +/obj/random/pottedplant, /turf/simulated/floor/tiled/dark, /area/horizon/security/interrogation/monitoring) "nnC" = ( @@ -17166,7 +17166,7 @@ /obj/effect/floor_decal/corner/blue{ dir = 1 }, -/obj/structure/flora/pottedplant/random, +/obj/random/pottedplant, /obj/machinery/status_display{ layer = 4; pixel_y = -32 @@ -19359,7 +19359,7 @@ /obj/machinery/atmospherics/unary/vent_pump/on{ dir = 1 }, -/obj/structure/flora/pottedplant/random, +/obj/random/pottedplant, /turf/simulated/floor/reinforced, /area/bridge/controlroom) "piX" = ( @@ -19522,7 +19522,7 @@ /obj/effect/floor_decal/corner/blue{ dir = 6 }, -/obj/structure/flora/pottedplant/random, +/obj/random/pottedplant, /turf/simulated/floor/tiled/dark, /area/bridge/controlroom) "psa" = ( @@ -19817,7 +19817,7 @@ /turf/simulated/floor, /area/maintenance/security_starboard) "pNE" = ( -/obj/structure/flora/pottedplant/random, +/obj/random/pottedplant, /obj/effect/floor_decal/spline/fancy/wood{ dir = 10 }, @@ -20240,7 +20240,7 @@ /obj/effect/floor_decal/corner/blue{ dir = 5 }, -/obj/structure/flora/pottedplant/random, +/obj/random/pottedplant, /turf/simulated/floor/tiled, /area/bridge/controlroom) "qhK" = ( @@ -21186,7 +21186,7 @@ "qUG" = ( /obj/machinery/firealarm/north, /obj/machinery/atmospherics/unary/vent_pump/on, -/obj/structure/flora/pottedplant/random, +/obj/random/pottedplant, /turf/simulated/floor/lino/grey, /area/horizon/security/investigators_office) "qUP" = ( @@ -21385,7 +21385,7 @@ /obj/effect/floor_decal/corner/blue/full{ dir = 8 }, -/obj/structure/flora/pottedplant/random, +/obj/random/pottedplant, /obj/machinery/camera/network/security{ c_tag = "Security - Corridor Camera 6" }, @@ -21642,7 +21642,7 @@ /turf/simulated/floor, /area/horizon/maintenance/deck_three/aft/starboard) "rqN" = ( -/obj/structure/flora/pottedplant/random, +/obj/random/pottedplant, /obj/effect/floor_decal/spline/fancy/wood/cee{ dir = 1 }, @@ -21943,7 +21943,7 @@ /obj/effect/floor_decal/spline/fancy/wood{ dir = 10 }, -/obj/structure/flora/pottedplant/random, +/obj/random/pottedplant, /turf/simulated/floor/wood, /area/bridge/meeting_room) "rBA" = ( @@ -22102,7 +22102,7 @@ /obj/effect/floor_decal/corner/blue/full{ dir = 1 }, -/obj/structure/flora/pottedplant/random, +/obj/random/pottedplant, /turf/simulated/floor/tiled/dark, /area/horizon/security/evidence_storage) "rIg" = ( @@ -22526,7 +22526,7 @@ /obj/effect/floor_decal/corner/blue{ dir = 5 }, -/obj/structure/flora/pottedplant/random, +/obj/random/pottedplant, /obj/machinery/camera/network/command{ c_tag = "Bridge - Port 1" }, @@ -23031,7 +23031,7 @@ /area/template_noop) "slT" = ( /obj/machinery/firealarm/west, -/obj/structure/flora/pottedplant/random, +/obj/random/pottedplant, /obj/effect/floor_decal/spline/fancy/wood{ dir = 10 }, @@ -23175,7 +23175,7 @@ dir = 8 }, /obj/structure/table/standard, -/obj/structure/flora/pottedplant/random{ +/obj/random/pottedplant{ pixel_y = 12 }, /obj/effect/floor_decal/corner/blue/full{ @@ -26495,7 +26495,7 @@ /turf/simulated/floor/tiled/white, /area/horizon/crew_quarters/fitness/changing) "uXA" = ( -/obj/structure/flora/pottedplant/random, +/obj/random/pottedplant, /obj/machinery/light{ dir = 8 }, @@ -26982,7 +26982,7 @@ /area/bridge/selfdestruct) "vob" = ( /obj/machinery/firealarm/south, -/obj/structure/flora/pottedplant/random, +/obj/random/pottedplant, /turf/simulated/floor/tiled/dark, /area/medical/smoking) "vpB" = ( @@ -27745,7 +27745,7 @@ /obj/effect/floor_decal/spline/fancy/wood{ dir = 6 }, -/obj/structure/flora/pottedplant/random, +/obj/random/pottedplant, /turf/simulated/floor/wood, /area/crew_quarters/lounge/secondary) "vTU" = ( @@ -29684,7 +29684,7 @@ /turf/simulated/floor/lino/grey, /area/horizon/cafeteria) "xrV" = ( -/obj/structure/flora/pottedplant/random, +/obj/random/pottedplant, /obj/effect/floor_decal/spline/fancy/wood/full, /turf/simulated/floor/wood, /area/horizon/hallway/deck_three/primary/central) @@ -30360,7 +30360,7 @@ pixel_x = 25; pixel_y = 26 }, -/obj/structure/flora/pottedplant/random, +/obj/random/pottedplant, /obj/effect/floor_decal/spline/fancy/wood{ dir = 4 }, diff --git a/maps/sccv_horizon/sccv_horizon-4_centcomm.dmm b/maps/sccv_horizon/sccv_horizon-4_centcomm.dmm index 38ccbfa11f4..59cf682f5d1 100644 --- a/maps/sccv_horizon/sccv_horizon-4_centcomm.dmm +++ b/maps/sccv_horizon/sccv_horizon-4_centcomm.dmm @@ -241,7 +241,7 @@ }, /area/centcom/control) "aaQ" = ( -/obj/structure/flora/pottedplant/random{ +/obj/random/pottedplant{ anchored = 1; pixel_y = 18 }, @@ -740,7 +740,7 @@ /obj/effect/floor_decal/corner/grey{ dir = 5 }, -/obj/structure/flora/pottedplant/random{ +/obj/random/pottedplant{ anchored = 1; pixel_y = 18 }, @@ -777,7 +777,7 @@ /turf/unsimulated/floor, /area/centcom/control) "acs" = ( -/obj/structure/flora/pottedplant/random{ +/obj/random/pottedplant{ anchored = 1; pixel_y = 18 }, @@ -6105,7 +6105,7 @@ /turf/simulated/floor/tiled/dark/full, /area/merchant_station) "ant" = ( -/obj/structure/flora/pottedplant/random, +/obj/random/pottedplant, /turf/simulated/floor/wood, /area/merchant_station) "anu" = ( @@ -8604,7 +8604,7 @@ /turf/simulated/floor/carpet/blue, /area/shuttle/merchant) "auX" = ( -/obj/structure/flora/pottedplant/random, +/obj/random/pottedplant, /turf/simulated/floor/lino/grey, /area/merchant_station) "auY" = ( @@ -12328,7 +12328,7 @@ }, /area/centcom/specops) "aDe" = ( -/obj/structure/flora/pottedplant/random, +/obj/random/pottedplant, /turf/unsimulated/floor{ icon_state = "wood" }, @@ -13801,7 +13801,7 @@ /obj/effect/floor_decal/corner/paleblue{ dir = 4 }, -/obj/structure/flora/pottedplant/random, +/obj/random/pottedplant, /turf/unsimulated/floor, /area/centcom/holding) "aHd" = ( @@ -13815,7 +13815,7 @@ /obj/effect/floor_decal/corner/paleblue{ dir = 1 }, -/obj/structure/flora/pottedplant/random, +/obj/random/pottedplant, /turf/unsimulated/floor, /area/centcom/holding) "aHe" = ( @@ -15302,7 +15302,7 @@ /obj/effect/floor_decal/corner/red{ dir = 5 }, -/obj/structure/flora/pottedplant/random{ +/obj/random/pottedplant{ anchored = 1; pixel_y = 18 }, @@ -16058,7 +16058,7 @@ /obj/effect/floor_decal/corner/paleblue{ dir = 6 }, -/obj/structure/flora/pottedplant/random, +/obj/random/pottedplant, /turf/unsimulated/floor, /area/centcom/spawning) "aOg" = ( @@ -16394,7 +16394,7 @@ /obj/effect/floor_decal/corner/paleblue{ dir = 6 }, -/obj/structure/flora/pottedplant/random{ +/obj/random/pottedplant{ anchored = 1; pixel_y = 5 }, @@ -18515,7 +18515,7 @@ }, /area/centcom/legion/hangar5) "aUb" = ( -/obj/structure/flora/pottedplant/random, +/obj/random/pottedplant, /turf/unsimulated/floor{ icon_state = "wood_light" }, @@ -21039,7 +21039,7 @@ /turf/unsimulated/floor, /area/centcom/legion) "aZr" = ( -/obj/structure/flora/pottedplant/random, +/obj/random/pottedplant, /obj/effect/floor_decal/corner/paleblue/full{ dir = 4 }, @@ -22605,7 +22605,7 @@ }, /area/antag/burglar) "bcL" = ( -/obj/structure/flora/pottedplant/random, +/obj/random/pottedplant, /turf/unsimulated/floor{ icon_state = "wood" }, @@ -24664,7 +24664,7 @@ /turf/unsimulated/floor, /area/antag/burglar) "bgx" = ( -/obj/structure/flora/pottedplant/random, +/obj/random/pottedplant, /turf/unsimulated/floor, /area/centcom/legion) "bgy" = ( @@ -26634,7 +26634,7 @@ /turf/unsimulated/floor, /area/antag/mercenary) "blc" = ( -/obj/structure/flora/pottedplant/random, +/obj/random/pottedplant, /turf/unsimulated/floor, /area/antag/mercenary) "bld" = ( @@ -28580,7 +28580,7 @@ }, /area/antag/raider) "bpm" = ( -/obj/structure/flora/pottedplant/random, +/obj/random/pottedplant, /turf/unsimulated/floor{ icon_state = "wood" }, @@ -29097,7 +29097,7 @@ dir = 4; icon_state = "tube1" }, -/obj/structure/flora/pottedplant/random{ +/obj/random/pottedplant{ pixel_y = 8 }, /turf/unsimulated/floor{ @@ -30842,7 +30842,7 @@ dir = 4; icon_state = "tube1" }, -/obj/structure/flora/pottedplant/random, +/obj/random/pottedplant, /turf/unsimulated/floor{ dir = 8; icon_state = "wood" @@ -31808,7 +31808,7 @@ /turf/simulated/floor/plating, /area/shuttle/skipjack) "bwh" = ( -/obj/structure/flora/pottedplant/random{ +/obj/random/pottedplant{ pixel_y = 8 }, /obj/effect/floor_decal/corner/paleblue/full{ @@ -31817,7 +31817,7 @@ /turf/unsimulated/floor, /area/centcom/distress_prep) "bwi" = ( -/obj/structure/flora/pottedplant/random{ +/obj/random/pottedplant{ pixel_y = 8 }, /obj/effect/floor_decal/corner/paleblue/full{ @@ -34191,7 +34191,7 @@ /turf/simulated/floor/holofloor/carpet/rubber, /area/horizon/holodeck/source_gym) "bFS" = ( -/obj/structure/flora/pottedplant/random, +/obj/random/pottedplant, /turf/simulated/floor/holofloor/lino, /area/horizon/holodeck/source_meetinghall) "bFT" = ( @@ -34252,7 +34252,7 @@ /obj/effect/floor_decal/corner/grey{ dir = 5 }, -/obj/structure/flora/pottedplant/random, +/obj/random/pottedplant, /turf/simulated/floor/marble, /area/horizon/holodeck/source_trinary) "bFX" = ( @@ -34300,7 +34300,7 @@ name = "Dominian Empire flag"; pixel_x = -30 }, -/obj/structure/flora/pottedplant/random, +/obj/random/pottedplant, /turf/simulated/floor/marble/dark, /area/horizon/holodeck/source_tribunal) "bGd" = ( @@ -34911,7 +34911,7 @@ /turf/simulated/floor/holofloor/reinforced, /area/horizon/holodeck/source_jupiter) "bHC" = ( -/obj/structure/flora/pottedplant/random, +/obj/random/pottedplant, /turf/simulated/floor/tiled/dark, /area/horizon/holodeck/source_pool) "bHD" = ( @@ -35873,7 +35873,7 @@ /turf/simulated/floor/holofloor/lino, /area/horizon/holodeck/source_meetinghall) "bKu" = ( -/obj/structure/flora/pottedplant/random, +/obj/random/pottedplant, /turf/simulated/floor/holofloor/tiled, /area/horizon/holodeck/source_boxingcourt) "bKv" = ( @@ -36863,7 +36863,7 @@ /turf/simulated/floor/plating/snow, /area/centcom/shared_dream) "cWp" = ( -/obj/structure/flora/pottedplant/random, +/obj/random/pottedplant, /turf/simulated/floor/holofloor/tiled, /area/horizon/holodeck/source_battlemonsters) "cWC" = ( @@ -37070,7 +37070,7 @@ }, /area/horizon/holodeck/source_moghes) "dMF" = ( -/obj/structure/flora/pottedplant/random, +/obj/random/pottedplant, /turf/simulated/floor/holofloor/wood, /area/horizon/holodeck/source_dininghall) "dMG" = ( @@ -37141,7 +37141,7 @@ /obj/effect/floor_decal/spline/plain{ dir = 10 }, -/obj/structure/flora/pottedplant/random, +/obj/random/pottedplant, /obj/structure/window/reinforced/holowindow{ dir = 8 }, @@ -37590,7 +37590,7 @@ name = "post"; pixel_y = -4 }, -/obj/structure/flora/pottedplant/random, +/obj/random/pottedplant, /obj/effect/decal/fake_object{ dir = 4; icon = 'icons/effects/props/holodeck/konyang/32x32.dmi'; @@ -39055,7 +39055,7 @@ }, /area/horizon/holodeck/source_desert) "lDX" = ( -/obj/structure/flora/pottedplant/random, +/obj/random/pottedplant, /obj/effect/floor_decal/spline/fancy/wood{ dir = 8 }, @@ -39703,7 +39703,7 @@ name = "post"; pixel_y = -4 }, -/obj/structure/flora/pottedplant/random, +/obj/random/pottedplant, /obj/effect/decal/fake_object{ dir = 4; icon = 'icons/effects/props/holodeck/konyang/32x32.dmi'; @@ -39822,7 +39822,7 @@ /turf/simulated/floor/holofloor/tiled, /area/horizon/holodeck/source_gym) "oPh" = ( -/obj/structure/flora/pottedplant/random, +/obj/random/pottedplant, /obj/effect/floor_decal/spline/fancy/wood{ dir = 6 }, @@ -40269,7 +40269,7 @@ /obj/effect/floor_decal/corner/grey{ dir = 5 }, -/obj/structure/flora/pottedplant/random, +/obj/random/pottedplant, /turf/simulated/floor/marble, /area/horizon/holodeck/source_trinary) "qHa" = ( @@ -40574,7 +40574,7 @@ /obj/effect/floor_decal/spline/plain{ dir = 6 }, -/obj/structure/flora/pottedplant/random, +/obj/random/pottedplant, /obj/structure/window/reinforced/holowindow{ dir = 4 }, @@ -40784,7 +40784,7 @@ /turf/simulated/floor/exoplanet/grass, /area/centcom/shared_dream) "sZZ" = ( -/obj/structure/flora/pottedplant/random, +/obj/random/pottedplant, /obj/effect/floor_decal/spline/fancy/wood/full, /turf/simulated/floor/holofloor/wood, /area/horizon/holodeck/source_sauna) @@ -41231,7 +41231,7 @@ /turf/simulated/floor/marble/dark, /area/horizon/holodeck/source_tribunal) "uGe" = ( -/obj/structure/flora/pottedplant/random, +/obj/random/pottedplant, /turf/simulated/floor/holofloor/lino, /area/horizon/holodeck/source_chapel) "uHb" = ( @@ -41718,7 +41718,7 @@ }, /area/horizon/holodeck/source_moghes) "xbL" = ( -/obj/structure/flora/pottedplant/random, +/obj/random/pottedplant, /obj/effect/floor_decal/spline/fancy/wood{ dir = 6 },