diff --git a/_maps/map_files/MetaStation/MetaStation.dmm b/_maps/map_files/MetaStation/MetaStation.dmm index 75ab22a498fd..2a2ad0b01e0b 100644 --- a/_maps/map_files/MetaStation/MetaStation.dmm +++ b/_maps/map_files/MetaStation/MetaStation.dmm @@ -878,9 +878,7 @@ /obj/machinery/computer/mob_battle_terminal/red{ pixel_y = 30 }, -/obj/item/kirbyplants{ - icon_state = "plant-20" - }, +/obj/item/kirbyplants/plant20, /turf/simulated/floor/plasteel{ icon_state = "darkgrey" }, @@ -3740,9 +3738,7 @@ /turf/simulated/floor/plating, /area/station/maintenance/fpmaint) "awb" = ( -/obj/item/kirbyplants{ - icon_state = "plant-22" - }, +/obj/item/kirbyplants/plant22, /turf/simulated/floor/plasteel, /area/station/supply/office) "awe" = ( @@ -6650,9 +6646,7 @@ "aHH" = ( /obj/effect/decal/cleanable/cobweb, /obj/effect/turf_decal/delivery/hollow, -/obj/item/kirbyplants{ - icon_state = "plant-20" - }, +/obj/item/kirbyplants/plant20, /turf/simulated/floor/plasteel, /area/station/engineering/hardsuitstorage) "aHI" = ( @@ -8200,9 +8194,7 @@ name = "west bump"; pixel_x = -24 }, -/obj/item/kirbyplants{ - icon_state = "plant-25" - }, +/obj/item/kirbyplants/plant25, /turf/simulated/floor/plasteel, /area/station/supply/lobby) "aLY" = ( @@ -10471,9 +10463,7 @@ /area/station/legal/courtroom) "aTh" = ( /obj/effect/decal/cleanable/dirt, -/obj/item/kirbyplants{ - icon_state = "plant-20" - }, +/obj/item/kirbyplants/plant20, /turf/simulated/floor/plating, /area/station/maintenance/fore) "aTi" = ( @@ -11158,9 +11148,7 @@ /turf/simulated/floor/mineral/titanium/blue, /area/shuttle/pod_1) "aUX" = ( -/obj/item/kirbyplants{ - icon_state = "plant-21" - }, +/obj/item/kirbyplants/plant21, /obj/structure/sign/botany{ pixel_x = 32 }, @@ -11625,9 +11613,7 @@ name = "east bump"; pixel_x = 27 }, -/obj/item/kirbyplants{ - icon_state = "plant-11" - }, +/obj/item/kirbyplants/plant11, /turf/simulated/floor/wood, /area/station/legal/courtroom) "aWj" = ( @@ -13352,9 +13338,7 @@ name = "north bump"; pixel_y = 24 }, -/obj/item/kirbyplants{ - icon_state = "applebush" - }, +/obj/item/kirbyplants/applebush, /turf/simulated/floor/plasteel{ dir = 9; icon_state = "neutral" @@ -13537,9 +13521,7 @@ }, /area/station/command/office/ce) "bbM" = ( -/obj/item/kirbyplants{ - icon_state = "plant-18" - }, +/obj/item/kirbyplants/plant18, /obj/structure/sign/electricshock{ pixel_x = -32 }, @@ -14909,9 +14891,7 @@ name = "east bump"; pixel_x = 27 }, -/obj/item/kirbyplants{ - icon_state = "plant-16" - }, +/obj/item/kirbyplants/plant16, /obj/item/radio/intercom{ name = "north bump"; pixel_y = 28 @@ -15033,9 +15013,7 @@ /obj/effect/turf_decal/stripes/line{ dir = 10 }, -/obj/item/kirbyplants{ - level = 4.1 - }, +/obj/item/kirbyplants, /turf/simulated/floor/plasteel, /area/station/hallway/secondary/entry) "bfn" = ( @@ -15750,9 +15728,7 @@ /turf/space, /area/space/nearstation) "bgV" = ( -/obj/item/kirbyplants{ - icon_state = "plant-22" - }, +/obj/item/kirbyplants/plant22, /obj/effect/spawner/random_spawners/cobweb_left_rare, /turf/simulated/floor/wood{ icon_state = "wood-broken3" @@ -21813,9 +21789,7 @@ /turf/simulated/floor/plasteel, /area/station/hallway/primary/central) "bwp" = ( -/obj/item/kirbyplants{ - level = 4.1 - }, +/obj/item/kirbyplants, /turf/simulated/floor/wood, /area/station/service/bar) "bwq" = ( @@ -22952,9 +22926,7 @@ /turf/simulated/floor/plasteel, /area/station/hallway/secondary/entry) "bzA" = ( -/obj/item/kirbyplants{ - icon_state = "plant-18" - }, +/obj/item/kirbyplants/plant18, /obj/effect/turf_decal/stripes/line{ dir = 9 }, @@ -22962,9 +22934,7 @@ /turf/simulated/floor/plasteel, /area/station/hallway/secondary/entry) "bzB" = ( -/obj/item/kirbyplants{ - icon_state = "plant-10" - }, +/obj/item/kirbyplants/plant10, /turf/simulated/floor/plasteel{ icon_state = "grimy" }, @@ -23589,9 +23559,7 @@ }, /area/station/hallway/primary/port) "bBr" = ( -/obj/item/kirbyplants{ - icon_state = "plant-20" - }, +/obj/item/kirbyplants/plant20, /obj/effect/turf_decal/stripes/line{ dir = 9 }, @@ -25362,9 +25330,7 @@ /turf/simulated/floor/plasteel, /area/station/hallway/secondary/bridge) "bHx" = ( -/obj/item/kirbyplants{ - icon_state = "plant-22" - }, +/obj/item/kirbyplants/plant22, /turf/simulated/floor/wood, /area/station/service/library) "bHz" = ( @@ -25645,9 +25611,7 @@ }, /area/station/telecomms/computer) "bIA" = ( -/obj/item/kirbyplants{ - icon_state = "plant-21" - }, +/obj/item/kirbyplants/plant21, /turf/simulated/floor/plasteel{ icon_state = "grimy" }, @@ -29504,9 +29468,7 @@ /obj/effect/turf_decal/stripes/line{ dir = 6 }, -/obj/item/kirbyplants{ - icon_state = "plant-16" - }, +/obj/item/kirbyplants/plant16, /obj/machinery/light{ dir = 4 }, @@ -30083,9 +30045,7 @@ name = "west bump"; pixel_x = -28 }, -/obj/item/kirbyplants{ - icon_state = "plant-10" - }, +/obj/item/kirbyplants/plant10, /turf/simulated/floor/plasteel{ icon_state = "cult" }, @@ -30118,9 +30078,7 @@ /area/station/supply/office) "bXF" = ( /obj/effect/turf_decal/stripes/corner, -/obj/item/kirbyplants{ - icon_state = "plant-10" - }, +/obj/item/kirbyplants/plant10, /obj/machinery/door_control{ id = "mechbay"; name = "Mech Bay Shutters Control"; @@ -32064,9 +32022,7 @@ name = "east bump"; pixel_x = 24 }, -/obj/item/kirbyplants{ - icon_state = "plant-10" - }, +/obj/item/kirbyplants/plant10, /turf/simulated/floor/plasteel{ icon_state = "purplecorner" }, @@ -32348,9 +32304,7 @@ name = "west bump"; pixel_x = -27 }, -/obj/item/kirbyplants{ - icon_state = "applebush" - }, +/obj/item/kirbyplants/applebush, /turf/simulated/floor/plasteel{ dir = 8; icon_state = "bluecorner" @@ -36753,9 +36707,7 @@ /turf/simulated/floor/plasteel, /area/station/hallway/primary/aft) "cvJ" = ( -/obj/item/kirbyplants{ - icon_state = "plant-20" - }, +/obj/item/kirbyplants/plant20, /turf/simulated/floor/plasteel{ icon_state = "darkgreycheck" }, @@ -37067,9 +37019,7 @@ name = "west bump"; pixel_x = -24 }, -/obj/item/kirbyplants{ - icon_state = "plant-11" - }, +/obj/item/kirbyplants/plant11, /obj/machinery/light{ dir = 8 }, @@ -37288,9 +37238,7 @@ }, /area/station/medical/medbay) "cxL" = ( -/obj/item/kirbyplants{ - icon_state = "plant-10" - }, +/obj/item/kirbyplants/plant10, /turf/simulated/floor/plasteel{ dir = 6; icon_state = "whiteblue" @@ -40905,9 +40853,7 @@ }, /area/station/medical/cloning) "cKA" = ( -/obj/item/kirbyplants{ - icon_state = "plant-18" - }, +/obj/item/kirbyplants/plant18, /turf/simulated/floor/plasteel{ dir = 8; icon_state = "darkgreencorners" @@ -41135,25 +41081,6 @@ /obj/machinery/atmospherics/pipe/simple/hidden/cyan, /turf/simulated/floor/plasteel, /area/station/maintenance/aft2) -"cLm" = ( -/obj/item/kirbyplants{ - icon_state = "plant-18" - }, -/obj/machinery/light/small{ - dir = 8 - }, -/obj/structure/window/reinforced{ - dir = 1 - }, -/obj/structure/extinguisher_cabinet{ - name = "west bump"; - pixel_x = -27 - }, -/turf/simulated/floor/plasteel{ - dir = 9; - icon_state = "purple" - }, -/area/station/science/research) "cLn" = ( /obj/effect/turf_decal/delivery, /turf/simulated/floor/plasteel, @@ -41931,22 +41858,6 @@ }, /turf/simulated/floor/plating, /area/station/maintenance/aft2) -"cOk" = ( -/obj/item/kirbyplants{ - icon_state = "plant-18" - }, -/obj/machinery/light/small{ - dir = 4 - }, -/obj/structure/window/reinforced{ - dir = 1 - }, -/obj/machinery/atmospherics/unary/vent_pump/on, -/turf/simulated/floor/plasteel{ - dir = 5; - icon_state = "purple" - }, -/area/station/science/research) "cOm" = ( /obj/structure/chair/comfy/black{ dir = 4 @@ -43205,9 +43116,7 @@ /obj/machinery/light{ dir = 8 }, -/obj/item/kirbyplants{ - icon_state = "plant-24" - }, +/obj/item/kirbyplants/plant24, /obj/effect/turf_decal/stripes/line{ dir = 8 }, @@ -43376,9 +43285,7 @@ name = "east bump"; pixel_x = 27 }, -/obj/item/kirbyplants{ - icon_state = "plant-14" - }, +/obj/item/kirbyplants/plant14, /obj/effect/turf_decal/stripes/line{ dir = 4 }, @@ -48792,9 +48699,7 @@ /turf/simulated/floor/plasteel, /area/station/engineering/atmos) "etR" = ( -/obj/item/kirbyplants{ - icon_state = "plant-22" - }, +/obj/item/kirbyplants/plant22, /turf/simulated/floor/plasteel{ icon_state = "cult" }, @@ -50433,9 +50338,7 @@ /turf/simulated/floor/plasteel, /area/station/security/brig) "fdz" = ( -/obj/item/kirbyplants{ - icon_state = "plant-11" - }, +/obj/item/kirbyplants/plant11, /turf/simulated/floor/plasteel, /area/station/supply/office) "feu" = ( @@ -50552,9 +50455,7 @@ }, /area/station/engineering/atmos) "fhC" = ( -/obj/item/kirbyplants{ - icon_state = "plant-22" - }, +/obj/item/kirbyplants/plant22, /turf/simulated/floor/plasteel{ dir = 1; icon_state = "red" @@ -52017,9 +51918,7 @@ }, /area/station/science/toxins/mixing) "fKW" = ( -/obj/item/kirbyplants{ - icon_state = "plant-16" - }, +/obj/item/kirbyplants/plant16, /obj/structure/cable/yellow{ d1 = 1; d2 = 2; @@ -52229,9 +52128,7 @@ }, /area/station/engineering/break_room) "fQl" = ( -/obj/item/kirbyplants{ - icon_state = "plant-24" - }, +/obj/item/kirbyplants/plant24, /turf/simulated/floor/plasteel{ icon_state = "cafeteria" }, @@ -52846,34 +52743,6 @@ icon_state = "darkgrey" }, /area/station/science/toxins/mixing) -"geC" = ( -/obj/item/kirbyplants{ - icon_state = "plant-24" - }, -/obj/machinery/camera{ - c_tag = "Science Hallway - Research"; - network = list("Research","SS13") - }, -/obj/structure/disposalpipe/segment{ - dir = 2; - icon_state = "pipe-c" - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 10 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 10 - }, -/obj/structure/cable/yellow{ - d1 = 2; - d2 = 8; - icon_state = "2-8" - }, -/turf/simulated/floor/plasteel{ - dir = 8; - icon_state = "whitepurplecorner" - }, -/area/station/science/research) "geG" = ( /obj/machinery/economy/vending/snack, /obj/machinery/camera{ @@ -53691,18 +53560,6 @@ }, /turf/space, /area/space/nearstation) -"gzU" = ( -/obj/structure/window/reinforced{ - dir = 8 - }, -/obj/item/kirbyplants{ - icon_state = "plant-10" - }, -/turf/simulated/floor/plasteel{ - dir = 1; - icon_state = "purple" - }, -/area/station/science/xenobiology) "gAM" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 8 @@ -55034,9 +54891,7 @@ }, /area/station/medical/exam_room) "hcI" = ( -/obj/item/kirbyplants{ - icon_state = "plant-21" - }, +/obj/item/kirbyplants/plant21, /obj/machinery/light/small{ dir = 1 }, @@ -55411,9 +55266,7 @@ /area/station/command/office/cmo) "hjr" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/item/kirbyplants{ - icon_state = "plant-22" - }, +/obj/item/kirbyplants/plant22, /obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor/plasteel{ dir = 4; @@ -55853,9 +55706,7 @@ /turf/simulated/floor/plating, /area/station/maintenance/starboard) "hty" = ( -/obj/item/kirbyplants{ - icon_state = "plant-21" - }, +/obj/item/kirbyplants/plant21, /turf/simulated/floor/plasteel, /area/station/maintenance/starboard2) "htP" = ( @@ -60104,9 +59955,7 @@ c_tag = "Detective's Office"; dir = 8 }, -/obj/item/kirbyplants{ - icon_state = "plant-24" - }, +/obj/item/kirbyplants/plant24, /obj/machinery/atmospherics/unary/vent_scrubber/on, /turf/simulated/floor/carpet, /area/station/security/detective) @@ -61986,6 +61835,32 @@ }, /turf/simulated/floor/plating, /area/station/maintenance/aft2) +"kej" = ( +/obj/item/kirbyplants/plant24, +/obj/machinery/camera{ + c_tag = "Science Hallway - Research"; + network = list("Research","SS13") + }, +/obj/structure/disposalpipe/segment{ + dir = 2; + icon_state = "pipe-c" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 10 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 10 + }, +/obj/structure/cable/yellow{ + d1 = 2; + d2 = 8; + icon_state = "2-8" + }, +/turf/simulated/floor/plasteel{ + dir = 8; + icon_state = "whitepurplecorner" + }, +/area/station/science/research) "ken" = ( /obj/structure/closet/crate, /obj/effect/spawner/lootdrop/maintenance, @@ -62160,9 +62035,7 @@ }, /area/station/science/research) "kiq" = ( -/obj/item/kirbyplants{ - icon_state = "plant-21" - }, +/obj/item/kirbyplants/plant21, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 5 }, @@ -62938,9 +62811,7 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/item/kirbyplants{ - icon_state = "plant-21" - }, +/obj/item/kirbyplants/plant21, /turf/simulated/floor/plasteel, /area/station/supply/storage) "kCc" = ( @@ -63724,9 +63595,7 @@ /turf/simulated/floor/plating/airless, /area/space/nearstation) "kQx" = ( -/obj/item/kirbyplants{ - icon_state = "plant-11" - }, +/obj/item/kirbyplants/plant11, /turf/simulated/floor/wood, /area/station/legal/courtroom) "kQD" = ( @@ -64346,9 +64215,7 @@ /obj/structure/window/reinforced{ dir = 4 }, -/obj/item/kirbyplants{ - icon_state = "applebush" - }, +/obj/item/kirbyplants/applebush, /obj/effect/turf_decal/stripes/line{ dir = 6 }, @@ -65022,6 +64889,23 @@ icon_state = "white" }, /area/station/medical/medbay) +"loz" = ( +/obj/item/kirbyplants/plant18, +/obj/machinery/light/small{ + dir = 8 + }, +/obj/structure/window/reinforced{ + dir = 1 + }, +/obj/structure/extinguisher_cabinet{ + name = "west bump"; + pixel_x = -27 + }, +/turf/simulated/floor/plasteel{ + dir = 9; + icon_state = "purple" + }, +/area/station/science/research) "lpp" = ( /obj/structure/table/reinforced, /obj/structure/window/reinforced, @@ -67118,6 +67002,20 @@ icon_state = "darkblue" }, /area/station/command/office/cmo) +"mhA" = ( +/obj/item/kirbyplants/plant18, +/obj/machinery/light/small{ + dir = 4 + }, +/obj/structure/window/reinforced{ + dir = 1 + }, +/obj/machinery/atmospherics/unary/vent_pump/on, +/turf/simulated/floor/plasteel{ + dir = 5; + icon_state = "purple" + }, +/area/station/science/research) "mhS" = ( /obj/structure/sign/poster/official/random{ pixel_y = 32 @@ -74095,9 +73993,7 @@ /obj/structure/window/reinforced{ dir = 4 }, -/obj/item/kirbyplants{ - icon_state = "plant-21" - }, +/obj/item/kirbyplants/plant21, /obj/effect/turf_decal/stripes/line{ dir = 5 }, @@ -83335,9 +83231,7 @@ /obj/effect/turf_decal/woodsiding{ dir = 1 }, -/obj/item/kirbyplants{ - level = 4.1 - }, +/obj/item/kirbyplants, /obj/machinery/computer/security/telescreen/entertainment{ pixel_x = -31 }, @@ -83805,9 +83699,7 @@ }, /area/station/hallway/primary/central) "tyW" = ( -/obj/item/kirbyplants{ - icon_state = "applebush" - }, +/obj/item/kirbyplants/applebush, /obj/effect/turf_decal/stripes/corner{ dir = 4 }, @@ -84200,9 +84092,7 @@ }, /area/station/security/armory) "tKL" = ( -/obj/item/kirbyplants{ - icon_state = "plant-24" - }, +/obj/item/kirbyplants/plant24, /obj/machinery/light_switch{ dir = 4; name = "custom placement"; @@ -89963,6 +89853,16 @@ }, /turf/simulated/floor/plasteel, /area/station/engineering/atmos) +"wsf" = ( +/obj/item/kirbyplants/plant10, +/obj/structure/window/reinforced{ + dir = 8 + }, +/turf/simulated/floor/plasteel{ + dir = 1; + icon_state = "purple" + }, +/area/station/science/xenobiology) "wsu" = ( /obj/effect/turf_decal/stripes/white/line{ dir = 1 @@ -125513,7 +125413,7 @@ gvN bYq qxW cvl -geC +kej lGC nqw eZW @@ -131174,7 +131074,7 @@ cmB cOR rMb cSl -cLm +loz xXD gqQ mMv @@ -132459,7 +132359,7 @@ cmB cVo cvW cSl -cOk +mhA rHl cRH mMv @@ -137347,7 +137247,7 @@ uQm uQm uQm uQm -gzU +wsf iUe cDI mCu diff --git a/_maps/map_files/RandomRuins/SpaceRuins/oldstation.dmm b/_maps/map_files/RandomRuins/SpaceRuins/oldstation.dmm index 89e13c5fb83b..de8e02e9ab16 100644 --- a/_maps/map_files/RandomRuins/SpaceRuins/oldstation.dmm +++ b/_maps/map_files/RandomRuins/SpaceRuins/oldstation.dmm @@ -524,9 +524,7 @@ d2 = 4; icon_state = "2-4" }, -/obj/item/kirbyplants{ - icon_state = "plant-dead" - }, +/obj/item/kirbyplants/dead, /obj/effect/decal/cleanable/dirt, /turf/simulated/floor/plasteel, /area/ruin/ancientstation) @@ -566,9 +564,7 @@ /turf/simulated/floor/plasteel, /area/ruin/ancientstation) "bK" = ( -/obj/item/kirbyplants{ - icon_state = "plant-dead" - }, +/obj/item/kirbyplants/dead, /obj/effect/decal/cleanable/dirt, /turf/simulated/floor/plasteel, /area/ruin/ancientstation) @@ -813,9 +809,7 @@ /turf/simulated/floor/plasteel, /area/ruin/ancientstation/thetacorridor) "ct" = ( -/obj/item/kirbyplants{ - icon_state = "plant-dead" - }, +/obj/item/kirbyplants/dead, /obj/effect/decal/cleanable/dirt, /obj/effect/decal/cleanable/dirt, /turf/simulated/floor/plasteel, @@ -1300,9 +1294,7 @@ d2 = 4; icon_state = "2-4" }, -/obj/item/kirbyplants{ - icon_state = "plant-dead" - }, +/obj/item/kirbyplants/dead, /obj/effect/decal/cleanable/dirt, /obj/effect/decal/cleanable/dirt, /mob/living/simple_animal/hostile/hivebot/strong, @@ -1538,9 +1530,7 @@ name = "west bump"; pixel_x = -24 }, -/obj/item/kirbyplants{ - icon_state = "plant-dead" - }, +/obj/item/kirbyplants/dead, /obj/effect/decal/cleanable/dirt, /turf/simulated/floor/plasteel{ dir = 9; @@ -1707,9 +1697,7 @@ /obj/machinery/light/small{ dir = 4 }, -/obj/item/kirbyplants{ - icon_state = "plant-dead" - }, +/obj/item/kirbyplants/dead, /obj/effect/decal/cleanable/dirt, /turf/simulated/floor/plasteel{ dir = 5; @@ -3831,9 +3819,7 @@ icon_state = "1-4" }, /obj/effect/decal/cleanable/dirt, -/obj/item/kirbyplants{ - icon_state = "plant-dead" - }, +/obj/item/kirbyplants/dead, /turf/simulated/floor/plasteel, /area/ruin/ancientstation) "jd" = ( @@ -3858,9 +3844,7 @@ /area/ruin/ancientstation) "jg" = ( /obj/effect/decal/cleanable/dirt, -/obj/item/kirbyplants{ - icon_state = "plant-dead" - }, +/obj/item/kirbyplants/dead, /turf/simulated/floor/plasteel, /area/ruin/ancientstation) "jh" = ( @@ -3871,9 +3855,7 @@ tag = "90Curve" }, /obj/effect/decal/cleanable/dirt, -/obj/item/kirbyplants{ - icon_state = "plant-dead" - }, +/obj/item/kirbyplants/dead, /turf/simulated/floor/plasteel, /area/ruin/ancientstation/thetacorridor) "ji" = ( @@ -3928,9 +3910,7 @@ /area/ruin/ancientstation/thetacorridor) "jo" = ( /obj/effect/decal/cleanable/dirt, -/obj/item/kirbyplants{ - icon_state = "plant-dead" - }, +/obj/item/kirbyplants/dead, /turf/simulated/floor/plasteel, /area/ruin/ancientstation/thetacorridor) "jp" = ( diff --git a/_maps/map_files/RandomRuins/SpaceRuins/syndie_space_base.dmm b/_maps/map_files/RandomRuins/SpaceRuins/syndie_space_base.dmm index 0afd68199276..e67e39745952 100644 --- a/_maps/map_files/RandomRuins/SpaceRuins/syndie_space_base.dmm +++ b/_maps/map_files/RandomRuins/SpaceRuins/syndie_space_base.dmm @@ -1665,9 +1665,7 @@ /obj/effect/turf_decal/woodsiding{ dir = 5 }, -/obj/item/kirbyplants{ - icon_state = "plant-22" - }, +/obj/item/kirbyplants/plant22, /turf/simulated/floor/plasteel{ icon_state = "grimy" }, @@ -4493,9 +4491,7 @@ }, /area/ruin/unpowered/syndicate_space_base/arrivals) "yR" = ( -/obj/item/kirbyplants{ - icon_state = "plant-22" - }, +/obj/item/kirbyplants/plant22, /turf/simulated/floor/grass, /area/ruin/unpowered/syndicate_space_base/service) "za" = ( @@ -8576,9 +8572,7 @@ /obj/effect/turf_decal/woodsiding{ dir = 9 }, -/obj/item/kirbyplants{ - icon_state = "plant-22" - }, +/obj/item/kirbyplants/plant22, /turf/simulated/floor/plasteel{ icon_state = "cafeteria" }, diff --git a/_maps/map_files/RandomRuins/SpaceRuins/syndiecakesfactory.dmm b/_maps/map_files/RandomRuins/SpaceRuins/syndiecakesfactory.dmm index 062f5ecf81b9..e55572e89b67 100644 --- a/_maps/map_files/RandomRuins/SpaceRuins/syndiecakesfactory.dmm +++ b/_maps/map_files/RandomRuins/SpaceRuins/syndiecakesfactory.dmm @@ -1258,9 +1258,7 @@ /turf/simulated/floor/engine, /area/ruin/space/unpowered) "YE" = ( -/obj/item/kirbyplants{ - icon_state = "plant-22" - }, +/obj/item/kirbyplants/plant22, /turf/simulated/floor/grass, /area/ruin/space/unpowered) "YQ" = ( diff --git a/_maps/map_files/cerestation/cerestation.dmm b/_maps/map_files/cerestation/cerestation.dmm index 6f2c8d06e06d..d2d5c8bedf44 100644 --- a/_maps/map_files/cerestation/cerestation.dmm +++ b/_maps/map_files/cerestation/cerestation.dmm @@ -4230,9 +4230,7 @@ /turf/simulated/wall, /area/station/command/office/hos) "azX" = ( -/obj/item/kirbyplants{ - icon_state = "plant-21" - }, +/obj/item/kirbyplants/plant21, /obj/item/radio/intercom{ pixel_y = -28; name = "custom placement" @@ -5391,9 +5389,7 @@ /obj/machinery/atmospherics/pipe/manifold/hidden/supply{ dir = 8 }, -/obj/item/kirbyplants{ - icon_state = "plant-21" - }, +/obj/item/kirbyplants/plant21, /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ dir = 8 }, @@ -5659,9 +5655,7 @@ }, /area/station/security/main) "aKx" = ( -/obj/item/kirbyplants{ - icon_state = "plant-22" - }, +/obj/item/kirbyplants/plant22, /turf/simulated/floor/plasteel{ dir = 1; icon_state = "redcorner" @@ -6476,9 +6470,7 @@ }, /area/station/engineering/atmos) "aPA" = ( -/obj/item/kirbyplants{ - icon_state = "plant-22" - }, +/obj/item/kirbyplants/plant22, /turf/simulated/floor/plasteel{ icon_state = "dark" }, @@ -6557,9 +6549,7 @@ /area/station/security/lobby) "aPW" = ( /obj/machinery/light, -/obj/item/kirbyplants{ - icon_state = "plant-21" - }, +/obj/item/kirbyplants/plant21, /turf/simulated/floor/plasteel{ icon_state = "redcorner" }, @@ -6869,9 +6859,7 @@ /area/station/public/locker) "aSf" = ( /obj/machinery/light, -/obj/item/kirbyplants{ - icon_state = "plant-21" - }, +/obj/item/kirbyplants/plant21, /turf/simulated/floor/plasteel{ icon_state = "darkblue" }, @@ -8752,9 +8740,7 @@ c_tag = "Rehabilitation Dome Lobby East"; dir = 8 }, -/obj/item/kirbyplants{ - icon_state = "plant-21" - }, +/obj/item/kirbyplants/plant21, /turf/simulated/floor/plasteel, /area/station/hallway/primary/central) "bbS" = ( @@ -8882,9 +8868,7 @@ /turf/simulated/floor/grass/jungle, /area/station/hallway/secondary/garden) "bcy" = ( -/obj/item/kirbyplants{ - icon_state = "plant-22" - }, +/obj/item/kirbyplants/plant22, /obj/machinery/light/small{ dir = 1 }, @@ -9629,9 +9613,7 @@ c_tag = "Rehabilitation Dome Lobby South"; dir = 1 }, -/obj/item/kirbyplants{ - icon_state = "plant-21" - }, +/obj/item/kirbyplants/plant21, /turf/simulated/floor/plasteel, /area/station/hallway/primary/central) "bfW" = ( @@ -9914,9 +9896,7 @@ c_tag = "Dorm Commons North"; dir = 4 }, -/obj/item/kirbyplants{ - icon_state = "plant-22" - }, +/obj/item/kirbyplants/plant22, /obj/machinery/economy/vending/wallmed{ name = "Emergency NanoMed"; pixel_y = 28 @@ -10961,9 +10941,7 @@ pixel_x = 24; name = "east bump" }, -/obj/item/kirbyplants{ - icon_state = "plant-22" - }, +/obj/item/kirbyplants/plant22, /turf/simulated/floor/plasteel{ dir = 5; icon_state = "neutral" @@ -12054,9 +12032,7 @@ }, /area/station/supply/office) "brs" = ( -/obj/item/kirbyplants{ - icon_state = "plant-21" - }, +/obj/item/kirbyplants/plant21, /turf/simulated/floor/plasteel{ dir = 8; icon_state = "darkblue" @@ -13476,9 +13452,7 @@ }, /area/station/engineering/break_room) "bxv" = ( -/obj/item/kirbyplants{ - icon_state = "plant-22" - }, +/obj/item/kirbyplants/plant22, /turf/simulated/floor/plasteel{ dir = 1; icon_state = "darkyellowcorners" @@ -13556,9 +13530,7 @@ /area/station/command/office/hop) "bxG" = ( /obj/structure/disposalpipe/segment, -/obj/item/kirbyplants{ - icon_state = "plant-22" - }, +/obj/item/kirbyplants/plant22, /turf/simulated/floor/plasteel{ dir = 4; icon_state = "darkyellowcorners" @@ -16266,9 +16238,7 @@ name = "Atmospherics Desk Shutters"; pixel_x = 24 }, -/obj/item/kirbyplants{ - icon_state = "plant-13" - }, +/obj/item/kirbyplants/plant13, /turf/simulated/floor/plasteel{ dir = 4; icon_state = "darkyellow" @@ -17894,9 +17864,7 @@ /turf/simulated/floor/plasteel, /area/station/command/office/ce) "bPE" = ( -/obj/item/kirbyplants{ - icon_state = "plant-25" - }, +/obj/item/kirbyplants/plant25, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor/plasteel{ @@ -18993,9 +18961,7 @@ }, /area/station/service/chapel) "bTX" = ( -/obj/item/kirbyplants{ - icon_state = "plant-21" - }, +/obj/item/kirbyplants/plant21, /obj/machinery/recharger/wallcharger{ pixel_y = -25 }, @@ -20038,9 +20004,7 @@ }, /area/station/maintenance/fore2) "bYn" = ( -/obj/item/kirbyplants{ - icon_state = "plant-22" - }, +/obj/item/kirbyplants/plant22, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, @@ -20054,9 +20018,7 @@ /turf/simulated/wall, /area/station/maintenance/disposal/south) "bYG" = ( -/obj/item/kirbyplants{ - icon_state = "plant-21" - }, +/obj/item/kirbyplants/plant21, /obj/structure/cable/orange{ d1 = 2; d2 = 4; @@ -20919,9 +20881,7 @@ /turf/simulated/floor/plasteel, /area/station/hallway/secondary/exit) "ceR" = ( -/obj/item/kirbyplants{ - icon_state = "plant-22" - }, +/obj/item/kirbyplants/plant22, /turf/simulated/floor/plasteel{ icon_state = "bcircuit" }, @@ -22353,9 +22313,7 @@ /turf/simulated/wall/mineral/titanium, /area/shuttle/pod_2) "cnT" = ( -/obj/item/kirbyplants{ - icon_state = "plant-21" - }, +/obj/item/kirbyplants/plant21, /turf/simulated/floor/plasteel{ dir = 5; icon_state = "whitepurple" @@ -22967,9 +22925,7 @@ }, /area/station/science/hallway) "cry" = ( -/obj/item/kirbyplants{ - icon_state = "plant-25" - }, +/obj/item/kirbyplants/plant25, /turf/simulated/floor/plasteel{ icon_state = "whitepurple" }, @@ -31092,9 +31048,7 @@ }, /area/station/public/quantum/cargo) "dkK" = ( -/obj/item/kirbyplants{ - icon_state = "plant-22" - }, +/obj/item/kirbyplants/plant22, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 9 }, @@ -34837,9 +34791,7 @@ }, /area/station/hallway/primary/fore/west) "dKY" = ( -/obj/item/kirbyplants{ - icon_state = "plant-21" - }, +/obj/item/kirbyplants/plant21, /obj/machinery/light/small{ dir = 1 }, @@ -37897,9 +37849,7 @@ }, /area/station/public/vacant_office) "eQt" = ( -/obj/item/kirbyplants{ - icon_state = "plant-21" - }, +/obj/item/kirbyplants/plant21, /turf/simulated/floor/plasteel{ icon_state = "cafeteria" }, @@ -38206,9 +38156,7 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, -/obj/item/kirbyplants{ - icon_state = "plant-21" - }, +/obj/item/kirbyplants/plant21, /turf/simulated/floor/plasteel{ icon_state = "redyellowfull" }, @@ -40649,9 +40597,7 @@ }, /area/station/medical/cloning) "fUT" = ( -/obj/item/kirbyplants{ - icon_state = "plant-21" - }, +/obj/item/kirbyplants/plant21, /obj/effect/spawner/random_spawners/dirt_often, /turf/simulated/floor/plasteel{ icon_state = "redyellowfull" @@ -41923,9 +41869,7 @@ c_tag = "Telecomms Control Room"; dir = 6 }, -/obj/item/kirbyplants{ - icon_state = "plant-22" - }, +/obj/item/kirbyplants/plant22, /turf/simulated/floor/plasteel{ icon_state = "dark" }, @@ -43287,9 +43231,7 @@ }, /area/station/hallway/primary/fore) "gQP" = ( -/obj/item/kirbyplants{ - icon_state = "plant-21" - }, +/obj/item/kirbyplants/plant21, /obj/machinery/light_switch{ dir = 1; pixel_y = -24; @@ -44574,9 +44516,7 @@ }, /area/station/medical/medbay) "hoM" = ( -/obj/item/kirbyplants{ - icon_state = "plant-21" - }, +/obj/item/kirbyplants/plant21, /turf/simulated/floor/wood, /area/station/service/library) "hoU" = ( @@ -44852,9 +44792,7 @@ /turf/simulated/floor/plating, /area/station/hallway/secondary/entry/north) "htq" = ( -/obj/item/kirbyplants{ - icon_state = "plant-22" - }, +/obj/item/kirbyplants/plant22, /obj/structure/cable/orange{ d1 = 1; d2 = 2; @@ -45340,9 +45278,7 @@ }, /area/station/supply/office) "hDf" = ( -/obj/item/kirbyplants{ - icon_state = "plant-25" - }, +/obj/item/kirbyplants/plant25, /turf/simulated/floor/plasteel{ icon_state = "arrival" }, @@ -53590,9 +53526,7 @@ /turf/simulated/floor/engine, /area/station/engineering/control) "kgd" = ( -/obj/item/kirbyplants{ - icon_state = "applebush" - }, +/obj/item/kirbyplants/applebush, /turf/simulated/floor/plasteel{ dir = 9; icon_state = "darkred" @@ -55794,9 +55728,7 @@ /turf/simulated/floor/plating, /area/station/maintenance/fore) "kPx" = ( -/obj/item/kirbyplants{ - icon_state = "plant-21" - }, +/obj/item/kirbyplants/plant21, /turf/simulated/floor/wood, /area/station/command/office/ntrep) "kQc" = ( @@ -55826,9 +55758,7 @@ /turf/simulated/floor/wood, /area/station/command/office/ntrep) "kQz" = ( -/obj/item/kirbyplants{ - icon_state = "plant-21" - }, +/obj/item/kirbyplants/plant21, /turf/simulated/floor/plasteel{ dir = 6; icon_state = "darkgreen" @@ -58395,9 +58325,7 @@ "lBJ" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/item/kirbyplants{ - icon_state = "plant-22" - }, +/obj/item/kirbyplants/plant22, /turf/simulated/floor/plasteel, /area/station/public/locker) "lBX" = ( @@ -61502,9 +61430,7 @@ pixel_y = 24; name = "north bump" }, -/obj/item/kirbyplants{ - icon_state = "plant-22" - }, +/obj/item/kirbyplants/plant22, /turf/simulated/floor/wood, /area/station/service/library) "mHk" = ( @@ -71147,9 +71073,7 @@ /turf/simulated/floor/plating, /area/station/maintenance/port) "pOY" = ( -/obj/item/kirbyplants{ - icon_state = "plant-21" - }, +/obj/item/kirbyplants/plant21, /turf/simulated/floor/plasteel{ icon_state = "redyellowfull" }, @@ -76602,9 +76526,7 @@ /turf/simulated/floor/wood, /area/station/service/theatre) "rGm" = ( -/obj/item/kirbyplants{ - icon_state = "plant-22" - }, +/obj/item/kirbyplants/plant22, /obj/machinery/light_switch{ dir = 4; pixel_x = -24; @@ -80833,9 +80755,7 @@ /obj/machinery/light{ dir = 8 }, -/obj/item/kirbyplants{ - icon_state = "plant-21" - }, +/obj/item/kirbyplants/plant21, /obj/effect/spawner/random_spawners/dirt_often, /turf/simulated/floor/plasteel{ dir = 9; @@ -82619,9 +82539,7 @@ }, /area/station/engineering/gravitygenerator) "tCV" = ( -/obj/item/kirbyplants{ - icon_state = "plant-22" - }, +/obj/item/kirbyplants/plant22, /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/wood, @@ -85552,9 +85470,7 @@ /turf/simulated/floor/plating, /area/station/security/warden) "uBY" = ( -/obj/item/kirbyplants{ - icon_state = "plant-25" - }, +/obj/item/kirbyplants/plant25, /turf/simulated/floor/plasteel{ icon_state = "whitegreen" }, @@ -87776,9 +87692,7 @@ pixel_x = 24; name = "east bump" }, -/obj/item/kirbyplants{ - icon_state = "plant-25" - }, +/obj/item/kirbyplants/plant25, /turf/simulated/floor/plasteel{ dir = 6; icon_state = "darkpurple" @@ -88547,9 +88461,7 @@ /turf/simulated/floor/plating, /area/station/maintenance/fore2) "vwo" = ( -/obj/item/kirbyplants{ - icon_state = "plant-21" - }, +/obj/item/kirbyplants/plant21, /obj/machinery/light{ dir = 1 }, @@ -89312,9 +89224,7 @@ pixel_y = 24; name = "north bump" }, -/obj/item/kirbyplants{ - icon_state = "plant-21" - }, +/obj/item/kirbyplants/plant21, /turf/simulated/floor/wood, /area/station/legal/magistrate) "vIG" = ( @@ -92366,9 +92276,7 @@ pixel_x = 24; name = "east bump" }, -/obj/item/kirbyplants{ - icon_state = "plant-22" - }, +/obj/item/kirbyplants/plant22, /turf/simulated/floor/plasteel{ dir = 6; icon_state = "neutral" @@ -95993,9 +95901,7 @@ pixel_y = 24; name = "north bump" }, -/obj/item/kirbyplants{ - icon_state = "plant-21" - }, +/obj/item/kirbyplants/plant21, /obj/item/radio/intercom{ pixel_x = 28; name = "custom placement" diff --git a/code/game/objects/structures/flora.dm b/code/game/objects/structures/flora.dm index 01c0099884bc..7109ea8444b1 100644 --- a/code/game/objects/structures/flora.dm +++ b/code/game/objects/structures/flora.dm @@ -253,11 +253,11 @@ . = ..() icon_state = "fullgrass_[rand(1, 3)]" - +// Kirby plants /obj/item/kirbyplants name = "potted plant" icon = 'icons/obj/flora/plants.dmi' - icon_state = "plant-1" + icon_state = "random_plant" anchored = FALSE layer = ABOVE_MOB_LAYER w_class = WEIGHT_CLASS_HUGE @@ -270,9 +270,10 @@ /obj/item/kirbyplants/Initialize(mapload) . = ..() - icon_state = "plant-[rand(1,35)]" - if(prob(1)) - icon_state = "plant-36" + if(prob(1) && icon_state == "random_plant") + icon_state = "plant-eye" + if(icon_state == "random_plant") + icon_state = "plant-[rand(1, 34)]" AddComponent(/datum/component/two_handed, require_twohands = TRUE) /obj/item/kirbyplants/Destroy() @@ -314,10 +315,117 @@ ..() unhide_user(user) +/obj/item/kirbyplants/plant1 + icon_state = "plant-1" + +/obj/item/kirbyplants/plant2 + icon_state = "plant-2" + +/obj/item/kirbyplants/plant3 + icon_state = "plant-3" + +/obj/item/kirbyplants/plant4 + icon_state = "plant-4" + +/obj/item/kirbyplants/plant5 + icon_state = "plant-5" + +/obj/item/kirbyplants/plant6 + icon_state = "plant-6" + +/obj/item/kirbyplants/plant7 + icon_state = "plant-7" + +/obj/item/kirbyplants/plant8 + icon_state = "plant-8" + +/obj/item/kirbyplants/plant9 + icon_state = "plant-9" + +/obj/item/kirbyplants/plant10 + icon_state = "plant-10" + +/obj/item/kirbyplants/plant11 + icon_state = "plant-11" + +/obj/item/kirbyplants/plant12 + icon_state = "plant-12" + +/obj/item/kirbyplants/plant13 + icon_state = "plant-13" + +/obj/item/kirbyplants/plant14 + icon_state = "plant-14" + +/obj/item/kirbyplants/plant15 + icon_state = "plant-15" + +/obj/item/kirbyplants/plant16 + icon_state = "plant-16" + +/obj/item/kirbyplants/plant17 + icon_state = "plant-17" + +/obj/item/kirbyplants/plant18 + icon_state = "plant-18" + +/obj/item/kirbyplants/plant19 + icon_state = "plant-19" + +/obj/item/kirbyplants/plant20 + icon_state = "plant-20" + +/obj/item/kirbyplants/plant21 + icon_state = "plant-21" + +/obj/item/kirbyplants/plant22 + icon_state = "plant-22" + +/obj/item/kirbyplants/plant23 + icon_state = "plant-23" + +/obj/item/kirbyplants/plant24 + icon_state = "plant-24" + +/obj/item/kirbyplants/plant25 + icon_state = "plant-25" + +/obj/item/kirbyplants/plant26 + icon_state = "plant-26" + +/obj/item/kirbyplants/plant27 + icon_state = "plant-27" + +/obj/item/kirbyplants/plant28 + icon_state = "plant-28" + +/obj/item/kirbyplants/plant29 + icon_state = "plant-29" + +/obj/item/kirbyplants/plant30 + icon_state = "plant-30" + +/obj/item/kirbyplants/plant31 + icon_state = "plant-31" + +/obj/item/kirbyplants/plant32 + icon_state = "plant-32" + +/obj/item/kirbyplants/plant33 + icon_state = "plant-33" + +/obj/item/kirbyplants/plant34 + icon_state = "plant-34" + +/obj/item/kirbyplants/applebush + icon_state = "applebush" + /obj/item/kirbyplants/dead + icon_state = "plant-dead" + +/obj/item/kirbyplants/dead/rd name = "\improper RD's potted plant" desc = "A gift from the botanical staff, presented after the RD's reassignment. There's a tag on it that says \"Y'all come back now, y'hear?\"\nIt doesn't look very healthy..." - icon_state = "plant-dead" //a rock is flora according to where the icon file is //and now these defines diff --git a/icons/obj/flora/plants.dmi b/icons/obj/flora/plants.dmi index 45686d168bc4..cce96cbe040a 100644 Binary files a/icons/obj/flora/plants.dmi and b/icons/obj/flora/plants.dmi differ diff --git a/tools/UpdatePaths/Scripts/23376_kirbyplants.txt b/tools/UpdatePaths/Scripts/23376_kirbyplants.txt new file mode 100644 index 000000000000..c8a6e931b9cb --- /dev/null +++ b/tools/UpdatePaths/Scripts/23376_kirbyplants.txt @@ -0,0 +1,37 @@ +/obj/item/kirbyplants{icon_state="applebush"} : /obj/item/kirbyplants/applebush{@OLD;icon_state=@SKIP} +/obj/item/kirbyplants{icon_state="plant-dead"} : /obj/item/kirbyplants/dead{@OLD;icon_state=@SKIP} +/obj/item/kirbyplants{icon_state="plant-01"} : /obj/item/kirbyplants/plant1{@OLD;icon_state=@SKIP} +/obj/item/kirbyplants{icon_state="plant-02"} : /obj/item/kirbyplants/plant2{@OLD;icon_state=@SKIP} +/obj/item/kirbyplants{icon_state="plant-03"} : /obj/item/kirbyplants/plant3{@OLD;icon_state=@SKIP} +/obj/item/kirbyplants{icon_state="plant-04"} : /obj/item/kirbyplants/plant4{@OLD;icon_state=@SKIP} +/obj/item/kirbyplants{icon_state="plant-05"} : /obj/item/kirbyplants/plant5{@OLD;icon_state=@SKIP} +/obj/item/kirbyplants{icon_state="plant-06"} : /obj/item/kirbyplants/plant6{@OLD;icon_state=@SKIP} +/obj/item/kirbyplants{icon_state="plant-07"} : /obj/item/kirbyplants/plant7{@OLD;icon_state=@SKIP} +/obj/item/kirbyplants{icon_state="plant-08"} : /obj/item/kirbyplants/plant8{@OLD;icon_state=@SKIP} +/obj/item/kirbyplants{icon_state="plant-09"} : /obj/item/kirbyplants/plant9{@OLD;icon_state=@SKIP} +/obj/item/kirbyplants{icon_state="plant-10"} : /obj/item/kirbyplants/plant10{@OLD;icon_state=@SKIP} +/obj/item/kirbyplants{icon_state="plant-11"} : /obj/item/kirbyplants/plant11{@OLD;icon_state=@SKIP} +/obj/item/kirbyplants{icon_state="plant-12"} : /obj/item/kirbyplants/plant12{@OLD;icon_state=@SKIP} +/obj/item/kirbyplants{icon_state="plant-13"} : /obj/item/kirbyplants/plant13{@OLD;icon_state=@SKIP} +/obj/item/kirbyplants{icon_state="plant-14"} : /obj/item/kirbyplants/plant14{@OLD;icon_state=@SKIP} +/obj/item/kirbyplants{icon_state="plant-15"} : /obj/item/kirbyplants/plant15{@OLD;icon_state=@SKIP} +/obj/item/kirbyplants{icon_state="plant-16"} : /obj/item/kirbyplants/plant16{@OLD;icon_state=@SKIP} +/obj/item/kirbyplants{icon_state="plant-17"} : /obj/item/kirbyplants/plant17{@OLD;icon_state=@SKIP} +/obj/item/kirbyplants{icon_state="plant-18"} : /obj/item/kirbyplants/plant18{@OLD;icon_state=@SKIP} +/obj/item/kirbyplants{icon_state="plant-19"} : /obj/item/kirbyplants/plant19{@OLD;icon_state=@SKIP} +/obj/item/kirbyplants{icon_state="plant-20"} : /obj/item/kirbyplants/plant20{@OLD;icon_state=@SKIP} +/obj/item/kirbyplants{icon_state="plant-21"} : /obj/item/kirbyplants/plant21{@OLD;icon_state=@SKIP} +/obj/item/kirbyplants{icon_state="plant-22"} : /obj/item/kirbyplants/plant22{@OLD;icon_state=@SKIP} +/obj/item/kirbyplants{icon_state="plant-23"} : /obj/item/kirbyplants/plant23{@OLD;icon_state=@SKIP} +/obj/item/kirbyplants{icon_state="plant-24"} : /obj/item/kirbyplants/plant24{@OLD;icon_state=@SKIP} +/obj/item/kirbyplants{icon_state="plant-25"} : /obj/item/kirbyplants/plant25{@OLD;icon_state=@SKIP} +/obj/item/kirbyplants{icon_state="plant-26"} : /obj/item/kirbyplants/plant26{@OLD;icon_state=@SKIP} +/obj/item/kirbyplants{icon_state="plant-27"} : /obj/item/kirbyplants/plant27{@OLD;icon_state=@SKIP} +/obj/item/kirbyplants{icon_state="plant-28"} : /obj/item/kirbyplants/plant28{@OLD;icon_state=@SKIP} +/obj/item/kirbyplants{icon_state="plant-29"} : /obj/item/kirbyplants/plant29{@OLD;icon_state=@SKIP} +/obj/item/kirbyplants{icon_state="plant-30"} : /obj/item/kirbyplants/plant30{@OLD;icon_state=@SKIP} +/obj/item/kirbyplants{icon_state="plant-31"} : /obj/item/kirbyplants/plant31{@OLD;icon_state=@SKIP} +/obj/item/kirbyplants{icon_state="plant-32"} : /obj/item/kirbyplants/plant32{@OLD;icon_state=@SKIP} +/obj/item/kirbyplants{icon_state="plant-33"} : /obj/item/kirbyplants/plant33{@OLD;icon_state=@SKIP} +/obj/item/kirbyplants{icon_state="plant-34"} : /obj/item/kirbyplants/plant34{@OLD;icon_state=@SKIP} +/obj/item/kirbyplants{icon_state="plant-35"} : /obj/item/kirbyplants{@OLD;icon_state=@SKIP}