Skip to content

Commit

Permalink
Total plantz resprite (#13710)
Browse files Browse the repository at this point in the history
* Total plantz resprite

* name and description fix

* dead plant fix

* monkeytree fix
  • Loading branch information
WatlerJe authored Jan 20, 2025
1 parent b3efde5 commit e5bf8c2
Show file tree
Hide file tree
Showing 10 changed files with 25 additions and 25 deletions.
16 changes: 8 additions & 8 deletions code/game/objects/structures/flora.dm
Original file line number Diff line number Diff line change
Expand Up @@ -95,9 +95,9 @@
desc = "This is some kind of tropical plant. It reeks of rotten eggs."
icon_state = "plant-14"

/obj/item/weapon/flora/pottedplant/small
/obj/item/weapon/flora/pottedplant/rafflesia
name = "small potted plant"
desc = "This is a pot of assorted small flora. Some look familiar."
desc = "This is a stinking corpse lily. It's a species of flowering plant in the parasitic genus Rafflesia."
icon_state = "plant-15"

/obj/item/weapon/flora/pottedplant/aquatic
Expand All @@ -115,9 +115,9 @@
desc = "This is a slim plant. Sweet smelling flowers are supported by spindly stems."
icon_state = "plant-18"

/obj/item/weapon/flora/pottedplant/crystal
name = "crystalline potted plant"
desc = "These are rather cubic plants. Odd crystal formations grow on the end."
/obj/item/weapon/flora/pottedplant/blueleaf
name = "blue potted plant"
desc = "These are rather blue plants. They have strange twisted leaves grow on the end."
icon_state = "plant-19"

/obj/item/weapon/flora/pottedplant/subterranean
Expand Down Expand Up @@ -149,9 +149,9 @@
desc = "This is some kind of tropical plant. It hasn't begun to flower yet."
icon_state = "plant-24"

/obj/item/weapon/flora/pottedplant/dead
name = "dead potted plant"
desc = "This is the dried up remains of a dead plant. Someone should replace it."
/obj/item/weapon/flora/pottedplant/cactus
name = "big potted cactus"
desc = "This is a big cactus. It's round and sharp"
icon_state = "plant-25"

/obj/item/weapon/flora/pottedplant/large
Expand Down
Binary file modified icons/obj/flora/plants.dmi
Binary file not shown.
2 changes: 1 addition & 1 deletion maps/RandomZLevels/spacebattle.dmm
Original file line number Diff line number Diff line change
Expand Up @@ -7532,7 +7532,7 @@
},
/area/awaymission/spacebattle/secret)
"tg" = (
/obj/item/weapon/flora/pottedplant/crystal,
/obj/item/weapon/flora/pottedplant/blueleaf,
/turf/simulated/floor{
icon_state = "alienvault"
},
Expand Down
2 changes: 1 addition & 1 deletion maps/boxstation/boxstation.dmm
Original file line number Diff line number Diff line change
Expand Up @@ -36134,7 +36134,7 @@
/area/station/cargo/office)
"bma" = (
/obj/structure/table/reinforced,
/obj/item/weapon/flora/pottedplant/crystal{
/obj/item/weapon/flora/pottedplant/blueleaf{
pixel_y = 12
},
/obj/machinery/light/small,
Expand Down
2 changes: 1 addition & 1 deletion maps/centcom/centcom.dmm
Original file line number Diff line number Diff line change
Expand Up @@ -12172,7 +12172,7 @@
/area/centcom/prison)
"aBg" = (
/obj/effect/decal/cleanable/cobweb,
/obj/item/weapon/flora/pottedplant/crystal,
/obj/item/weapon/flora/pottedplant/blueleaf,
/turf/unsimulated/floor{
icon_state = "wood"
},
Expand Down
8 changes: 4 additions & 4 deletions maps/gamma/gamma.dmm
Original file line number Diff line number Diff line change
Expand Up @@ -49317,7 +49317,7 @@
/turf/simulated/floor/plating,
/area/station/maintenance/brig)
"iRD" = (
/obj/item/weapon/flora/pottedplant/dead,
/obj/item/weapon/flora/pottedplant/cactus,
/obj/effect/decal/cleanable/cobweb,
/obj/effect/decal/turf_decal{
dir = 8;
Expand Down Expand Up @@ -65526,7 +65526,7 @@
/turf/simulated/floor,
/area/station/hallway/secondary/entry)
"mcB" = (
/obj/item/weapon/flora/pottedplant/dead,
/obj/item/weapon/flora/pottedplant/cactus,
/turf/simulated/floor/plating,
/area/station/maintenance/brig)
"mcD" = (
Expand Down Expand Up @@ -106494,7 +106494,7 @@
/area/station/medical/cryo)
"ufu" = (
/obj/effect/decal/cleanable/dirt,
/obj/item/weapon/flora/pottedplant/dead,
/obj/item/weapon/flora/pottedplant/cactus,
/obj/effect/decal/cleanable/cobweb2,
/turf/simulated/floor,
/area/station/maintenance/science)
Expand Down Expand Up @@ -115870,7 +115870,7 @@
},
/area/station/cargo/recycleroffice)
"vVT" = (
/obj/item/weapon/flora/pottedplant/dead,
/obj/item/weapon/flora/pottedplant/cactus,
/obj/effect/decal/cleanable/dirt,
/turf/simulated/floor{
icon_state = "dark"
Expand Down
4 changes: 2 additions & 2 deletions maps/prometheus/prometheus.dmm
Original file line number Diff line number Diff line change
Expand Up @@ -26074,7 +26074,7 @@
},
/area/station/security/execution)
"fJv" = (
/obj/item/weapon/flora/pottedplant/dead,
/obj/item/weapon/flora/pottedplant/cactus,
/obj/item/stack/sheet/wood,
/obj/machinery/newscaster{
pixel_x = -28
Expand Down Expand Up @@ -99753,7 +99753,7 @@
/area/station/medical/cryo)
"xXT" = (
/obj/structure/table/reinforced,
/obj/item/weapon/flora/pottedplant/crystal{
/obj/item/weapon/flora/pottedplant/blueleaf{
pixel_y = 12
},
/turf/simulated/floor{
Expand Down
10 changes: 5 additions & 5 deletions maps/templates/space_structures/old_station.dmm
Original file line number Diff line number Diff line change
Expand Up @@ -3130,7 +3130,7 @@
/turf/simulated/floor/glass/reinforced,
/area/space_structures/old_station/central/brig)
"ta" = (
/obj/item/weapon/flora/pottedplant/dead,
/obj/item/weapon/flora/pottedplant/cactus,
/turf/simulated/floor{
dir = 9;
icon_state = "darkblue"
Expand Down Expand Up @@ -3697,7 +3697,7 @@
/turf/simulated/floor/plating,
/area/space_structures/old_station/central)
"wt" = (
/obj/item/weapon/flora/pottedplant/dead,
/obj/item/weapon/flora/pottedplant/cactus,
/turf/simulated/floor{
dir = 5;
icon_state = "darkblue"
Expand Down Expand Up @@ -3923,7 +3923,7 @@
"xx" = (
/obj/effect/decal/cleanable/dirt,
/obj/effect/decal/cleanable/dirt,
/obj/item/weapon/flora/pottedplant/dead,
/obj/item/weapon/flora/pottedplant/cactus,
/turf/simulated/floor{
dir = 6;
icon_state = "darkred"
Expand Down Expand Up @@ -7161,7 +7161,7 @@
/area/space_structures/old_station/central)
"PW" = (
/obj/effect/decal/cleanable/dirt,
/obj/item/weapon/flora/pottedplant/dead,
/obj/item/weapon/flora/pottedplant/cactus,
/turf/simulated/floor{
dir = 6;
icon_state = "neutral"
Expand Down Expand Up @@ -7264,7 +7264,7 @@
},
/area/space_structures/old_station/satellite)
"QP" = (
/obj/item/weapon/flora/pottedplant/dead,
/obj/item/weapon/flora/pottedplant/cactus,
/turf/simulated/floor/airless{
icon_state = "yellow";
dir = 8
Expand Down
2 changes: 1 addition & 1 deletion maps/templates/space_structures/robostation.dmm
Original file line number Diff line number Diff line change
Expand Up @@ -401,7 +401,7 @@
/turf/simulated/floor/greengrid,
/area/space_structures/robostatoin)
"bC" = (
/obj/item/weapon/flora/pottedplant/crystal,
/obj/item/weapon/flora/pottedplant/blueleaf,
/turf/simulated/floor/greengrid,
/area/space_structures/robostatoin)
"bD" = (
Expand Down
4 changes: 2 additions & 2 deletions maps/templates/space_structures/robostation2.dmm
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,7 @@
/turf/simulated/floor/plating,
/area/space_structures/robostation2)
"cw" = (
/obj/item/weapon/flora/pottedplant/crystal,
/obj/item/weapon/flora/pottedplant/blueleaf,
/turf/simulated/floor/greengrid,
/area/space_structures/robostation2)
"cL" = (
Expand Down Expand Up @@ -944,7 +944,7 @@
},
/area/space_structures/robostation2)
"Ra" = (
/obj/item/weapon/flora/pottedplant/crystal,
/obj/item/weapon/flora/pottedplant/blueleaf,
/turf/simulated/floor/plating,
/area/space_structures/robostation2)
"Rj" = (
Expand Down

0 comments on commit e5bf8c2

Please sign in to comment.