diff --git a/code/game/objects/structures/flora.dm b/code/game/objects/structures/flora.dm new file mode 100644 index 0000000000..1360df2348 --- /dev/null +++ b/code/game/objects/structures/flora.dm @@ -0,0 +1,58 @@ +/obj/structure/flora/tree + name = "tree" + anchored = 1 + density = 1 + pixel_x = -16 + +/obj/structure/flora/tree/pine + name = "pine tree" + icon = 'icons/obj/flora/pinetrees.dmi' + icon_state = "pine_1" + +/obj/structure/flora/tree/pine/New() + icon_state = "pine_[rand(1, 3)]" + +/obj/structure/flora/tree/pine + name = "pine tree" + icon = 'icons/obj/flora/deadtrees.dmi' + icon_state = "tree_1" + +/obj/structure/flora/tree/pine/New() + icon_state = "tree_[rand(1, 6)]" + + +/obj/structure/flora/grass + name = "grass" + icon = 'icons/obj/flora/snowflora.dmi' + +/obj/structure/flora/grass/brown + icon_state = "snowgrass1bb" + +/obj/structure/flora/grass/brown/New() + icon_state = "snowgrass[rand(1, 3)]bb" + +/obj/structure/flora/grass/green + icon_state = "snowgrass1gb" + +/obj/structure/flora/grass/brown/New() + icon_state = "snowgrass[rand(1, 3)]gb" + +/obj/structure/flora/grass/both + icon_state = "snowgrassall1" + +/obj/structure/flora/grass/brown/New() + icon_state = "snowgrassall[rand(1, 3)]" + +/obj/structure/flora/grass/both + icon_state = "snowgrassall1" + +/obj/structure/flora/grass/brown/New() + icon_state = "snowgrassall[rand(1, 3)]" + +/obj/structure/flora/bush + name = "bush" + icon = 'icons/obj/flora/snowflora.dmi' + icon_state = "snowbush1" + +/obj/structure/flora/bush/New() + icon_state = "snowbush[rand(1, 6)]" diff --git a/code/game/turfs/simulated/floor.dm b/code/game/turfs/simulated/floor.dm index 935884f1e6..66b11c9910 100644 --- a/code/game/turfs/simulated/floor.dm +++ b/code/game/turfs/simulated/floor.dm @@ -185,7 +185,7 @@ turf/simulated/floor/proc/update_icon() if (is_light_floor()) var/obj/item/stack/tile/light/T = floor_tile T.on = !T.on - update_icon() + update_icon() if ((!( user.canmove ) || user.restrained() || !( user.pulling ))) return if (user.pulling.anchored) diff --git a/code/game/turfs/simulated/floor_types.dm b/code/game/turfs/simulated/floor_types.dm index 3bab484d44..78a483d278 100644 --- a/code/game/turfs/simulated/floor_types.dm +++ b/code/game/turfs/simulated/floor_types.dm @@ -201,4 +201,9 @@ /turf/simulated/floor/plating/ironsand/New() ..() name = "Iron Sand" - icon_state = "ironsand[rand(1,15)]" \ No newline at end of file + icon_state = "ironsand[rand(1,15)]" + +/turf/simulated/floor/plating/snow + name = "snow" + icon = 'icons/turf/snow.dmi' + icon_state = "snow" \ No newline at end of file diff --git a/icons/turf/snow.dmi b/icons/turf/snow.dmi index 32f14ba3d9..acdcccb5bd 100644 Binary files a/icons/turf/snow.dmi and b/icons/turf/snow.dmi differ diff --git a/tgstation.dme b/tgstation.dme index fcc8d4a4dd..7d3a4f57e4 100644 --- a/tgstation.dme +++ b/tgstation.dme @@ -749,6 +749,7 @@ #include "code\game\objects\structures\electricchair.dm" #include "code\game\objects\structures\extinguisher.dm" #include "code\game\objects\structures\false_walls.dm" +#include "code\game\objects\structures\flora.dm" #include "code\game\objects\structures\girders.dm" #include "code\game\objects\structures\grille.dm" #include "code\game\objects\structures\kitchen_spike.dm"