Added defines for snow and various snowy flora, including trees, grass, and bushes.

Fixed a mis-indented update_icon in floor/attack_hand(). Asteroid floors and such should no longer change when you click them.

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@5107 316c924e-a436-60f5-8080-3fe189b3f50e
This commit is contained in:
petethegoat@gmail.com
2012-11-18 15:22:13 +00:00
parent a2764fbfc5
commit e789d6048f
5 changed files with 66 additions and 2 deletions
+58
View File
@@ -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)]"
+1 -1
View File
@@ -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)
+6 -1
View File
@@ -201,4 +201,9 @@
/turf/simulated/floor/plating/ironsand/New()
..()
name = "Iron Sand"
icon_state = "ironsand[rand(1,15)]"
icon_state = "ironsand[rand(1,15)]"
/turf/simulated/floor/plating/snow
name = "snow"
icon = 'icons/turf/snow.dmi'
icon_state = "snow"
Binary file not shown.

Before

Width:  |  Height:  |  Size: 16 KiB

After

Width:  |  Height:  |  Size: 15 KiB

+1
View File
@@ -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"