Merge branch 'master' of https://github.com/tgstation/tgstation into TiredOfTheInconsistency

code/game/objects/structures/flora.dm

@@ -81,7 +81,11 @@
 
 /obj/structure/flora/tree/jungle
 	name = "tree"
+	icon_state = "tree"
 	desc = "It's seriously hampering your view of the jungle."
+	icon = 'icons/obj/flora/jungletrees.dmi'
+	pixel_x = -48
+	pixel_y = -20
 
 /obj/structure/flora/tree/jungle/Initialize()
 	icon_state = "[icon_state][rand(1, 3)]"
@@ -335,12 +339,13 @@
 /obj/structure/flora/rock/jungle
 	icon_state = "pile of rocks"
 	desc = "A pile of rocks."
+	icon_state = "rocks"
 	icon = 'icons/obj/flora/jungleflora.dmi'
 	density = FALSE
 
 /obj/structure/flora/rock/jungle/Initialize()
 	..()
-	icon_state = "[icon_state][rand(1,5)]"
+	icon_state = "[initial(icon_state)][rand(1,5)]"
 
 
 //Jungle bushes
@@ -364,9 +369,17 @@
 	icon_state = "bush"
 	icon = 'icons/obj/flora/largejungleflora.dmi'
 	pixel_x = -16
+	pixel_y = -12
 	layer = ABOVE_ALL_MOB_LAYER
 
 /obj/structure/flora/rock/pile/largejungle
 	name = "rocks"
+	icon_state = "rocks"
 	icon = 'icons/obj/flora/largejungleflora.dmi'
 	density = FALSE
+	pixel_x = -16
+	pixel_y = -16
+
+/obj/structure/flora/rock/jungle/Initialize()
+	..()
+	icon_state = "[initial(icon_state)][rand(1,3)]"

code/game/objects/structures/lattice.dm

@@ -9,7 +9,7 @@
 	obj_integrity = 50
 	max_integrity = 50
 	layer = LATTICE_LAYER //under pipes
-	var/obj/item/stack/rods/stored
+	var/number_of_rods = 1
 	canSmoothWith = list(/obj/structure/lattice,
 	/turf/open/floor,
 	/turf/closed/wall,
@@ -17,26 +17,20 @@
 	smooth = SMOOTH_MORE
 	//	flags = CONDUCT
 
-/obj/structure/lattice/New()
+/obj/structure/lattice/Initialize(mapload)
 	..()
-	for(var/obj/structure/lattice/LAT in src.loc)
+	for(var/obj/structure/lattice/LAT in loc)
 		if(LAT != src)
 			qdel(LAT)
-	stored = new/obj/item/stack/rods(src)
-
-/obj/structure/lattice/Destroy()
-	qdel(stored)
-	stored = null
-	return ..()
 
 /obj/structure/lattice/blob_act(obj/structure/blob/B)
 	return
 
 /obj/structure/lattice/ratvar_act()
 	if(IsEven(x + y))
-		new/obj/structure/lattice/clockwork(loc)
+		new /obj/structure/lattice/clockwork(loc)
 	else
-		new/obj/structure/lattice/clockwork/large(loc)
+		new /obj/structure/lattice/clockwork/large(loc)
 
 /obj/structure/lattice/attackby(obj/item/C, mob/user, params)
 	if(istype(C, /obj/item/weapon/wirecutters))
@@ -48,8 +42,7 @@
 
 /obj/structure/lattice/deconstruct(disassembled = TRUE)
 	if(!(flags & NODECONSTRUCT))
-		stored.forceMove(get_turf(src))
-		stored = null
+		new /obj/item/stack/rods(get_turf(src), amount=number_of_rods)
 	qdel(src)
 
 /obj/structure/lattice/singularity_pull(S, current_size)
@@ -61,15 +54,15 @@
 	desc = "A lightweight support lattice. These hold the Justicar's station together."
 	icon = 'icons/obj/smooth_structures/lattice_clockwork.dmi'
 
-/obj/structure/lattice/clockwork/New()
+/obj/structure/lattice/clockwork/Initialize(mapload)
 	..()
 	ratvar_act()
 
 /obj/structure/lattice/clockwork/ratvar_act()
 	if(IsOdd(x+y))
-		new/obj/structure/lattice/clockwork/large(loc)
+		new /obj/structure/lattice/clockwork/large(loc) // deletes old one
 
-/obj/structure/lattice/clockwork/large/New()
+/obj/structure/lattice/clockwork/large/Initialize(mapload)
 	..()
 	icon = 'icons/obj/smooth_structures/lattice_clockwork_large.dmi'
 	pixel_x = -9
@@ -77,7 +70,7 @@
 
 /obj/structure/lattice/clockwork/large/ratvar_act()
 	if(IsEven(x + y))
-		new/obj/structure/lattice/clockwork(loc)
+		new /obj/structure/lattice/clockwork(loc)
 
 /obj/structure/lattice/catwalk
 	name = "catwalk"
@@ -87,13 +80,12 @@
 	smooth = SMOOTH_TRUE
 	canSmoothWith = null
 
-/obj/structure/lattice/catwalk/New()
+/obj/structure/lattice/catwalk/Initialize(mapload)
 	..()
-	stored.amount++
-	stored.update_icon()
+	number_of_rods++
 
 /obj/structure/lattice/catwalk/ratvar_act()
-	new/obj/structure/lattice/catwalk/clockwork(loc)
+	new /obj/structure/lattice/catwalk/clockwork(loc)
 
 /obj/structure/lattice/catwalk/Move()
 	var/turf/T = loc
@@ -111,7 +103,7 @@
 	name = "clockwork catwalk"
 	icon = 'icons/obj/smooth_structures/catwalk_clockwork.dmi'
 
-/obj/structure/lattice/catwalk/clockwork/New()
+/obj/structure/lattice/catwalk/clockwork/Initialize(mapload)
 	..()
 	new /obj/effect/overlay/temp/ratvar/floor/catwalk(loc)
 	new /obj/effect/overlay/temp/ratvar/beam/catwalk(loc)

code/game/objects/structures/traps.dm

@@ -1,5 +1,5 @@
 /obj/structure/trap
-	name = "IT'S A TARP"
+	name = "IT'S A TRAP"
 	desc = "stepping on me is a guaranteed bad day"
 	icon = 'icons/obj/hand_of_god_structures.dmi'
 	icon_state = "trap"