Syncs maps, and a bunch of other things that no one will care about/notice/give fucks about until they break. Welcome to conflict hell. (#2460)

* fuck pubby

* fuck you too ceres

* ree

* this is going to be a disaster isn't it

* disaster

* dme

* -_-

* tg

* woops

* proper sync

* Welcome to conflict hell.

* lets hope this fixes more things than it breaks

* gdi

* goddamnit

code/game/objects/structures/crates_lockers/closets.dm

@@ -110,17 +110,17 @@
 	return 1
 
 /obj/structure/closet/proc/dump_contents()
-	var/turf/T = get_turf(src)
+	var/atom/L = drop_location()
 	for(var/atom/movable/AM in src)
-		AM.forceMove(T)
+		AM.forceMove(L)
 		if(throwing) // you keep some momentum when getting out of a thrown closet
 			step(AM, dir)
 	if(throwing)
 		throwing.finalize(FALSE)
 
 /obj/structure/closet/proc/take_contents()
-	var/turf/T = get_turf(src)
-	for(var/atom/movable/AM in T)
+	var/atom/L = drop_location()
+	for(var/atom/movable/AM in L)
 		if(AM != src && insert(AM) == -1) // limit reached
 			break
 
@@ -448,3 +448,6 @@
 /obj/structure/closet/singularity_act()
 	dump_contents()
 	..()
+
+/obj/structure/closet/AllowDrop()
+	return TRUE

code/game/objects/structures/flora.dm

@@ -1,20 +1,19 @@
 /obj/structure/flora
 	resistance_flags = FLAMMABLE
-	obj_integrity = 150
 	max_integrity = 150
-	anchored = 1
+	anchored = TRUE
 
 //trees
 /obj/structure/flora/tree
 	name = "tree"
-	density = 1
+	density = TRUE
 	pixel_x = -16
 	layer = FLY_LAYER
 	var/cut = FALSE
 	var/log_amount = 10
 
 /obj/structure/flora/tree/attackby(obj/item/W, mob/user, params)
-	if(!cut && log_amount && (!(NODECONSTRUCT_1 in flags_1)))
+	if(!cut && log_amount && (!(flags_1 & NODECONSTRUCT_1)))
 		if(W.sharpness && W.force > 0)
 			if(W.hitsound)
 				playsound(get_turf(src), W.hitsound, 100, 0, 0)
@@ -26,7 +25,7 @@
 				playsound(get_turf(src), 'sound/effects/meteorimpact.ogg', 100 , 0, 0)
 				icon = 'icons/obj/flora/pinetrees.dmi'
 				icon_state = "tree_stump"
-				density = 0
+				density = FALSE
 				pixel_x = -16
 				name += " stump"
 				cut = TRUE
@@ -91,6 +90,11 @@
 	icon_state = "[icon_state][rand(1, 6)]"
 	. = ..()
 
+/obj/structure/flora/tree/jungle/small
+	pixel_y = 0
+	pixel_x = -32
+	icon = 'icons/obj/flora/jungletreesmall.dmi'
+
 //grass
 /obj/structure/flora/grass
 	name = "grass"
@@ -125,7 +129,7 @@
 	name = "bush"
 	icon = 'icons/obj/flora/snowflora.dmi'
 	icon_state = "snowbush1"
-	anchored = 1
+	anchored = TRUE
 
 /obj/structure/flora/bush/Initialize()
 	icon_state = "snowbush[rand(1, 6)]"
@@ -304,7 +308,7 @@
 	desc = "A volcanic rock"
 	icon = 'icons/obj/flora/rocks.dmi'
 	resistance_flags = FIRE_PROOF
-	density = 1
+	density = TRUE
 
 /obj/structure/flora/rock/Initialize()
 	. = ..()

code/game/objects/structures/window.dm

@@ -394,8 +394,8 @@
 		take_damage(round(exposed_volume / 100), BURN, 0, 0)
 	..()
 
-/obj/structure/window/storage_contents_dump_act(obj/item/storage/src_object, mob/user)
-	return 0
+/obj/structure/window/get_dumping_location(obj/item/storage/source,mob/user)
+	return null
 
 /obj/structure/window/CanAStarPass(ID, to_dir)
 	if(!density)
@@ -408,6 +408,15 @@
 /obj/structure/window/GetExplosionBlock()
 	return reinf && fulltile ? real_explosion_block : 0
 
+/obj/structure/window/spawner/east
+	dir = EAST
+
+/obj/structure/window/spawner/west
+	dir = WEST
+
+/obj/structure/window/spawner/north
+	dir = NORTH
+
 /obj/structure/window/unanchored
 	anchored = FALSE
 
@@ -422,6 +431,15 @@
 	explosion_block = 1
 	glass_type = /obj/item/stack/sheet/rglass
 
+/obj/structure/window/reinforced/spawner/east
+	dir = EAST
+
+/obj/structure/window/reinforced/spawner/west
+	dir = WEST
+
+/obj/structure/window/reinforced/spawner/north
+	dir = NORTH
+
 /obj/structure/window/reinforced/unanchored
 	anchored = FALSE
 
@@ -436,6 +454,15 @@
 	explosion_block = 1
 	glass_type = /obj/item/stack/sheet/plasmaglass
 
+/obj/structure/window/plasma/spawner/east
+	dir = EAST
+
+/obj/structure/window/plasma/spawner/west
+	dir = WEST
+
+/obj/structure/window/plasma/spawner/north
+	dir = NORTH
+
 /obj/structure/window/plasma/unanchored
 	anchored = FALSE
 
@@ -450,6 +477,15 @@
 	explosion_block = 2
 	glass_type = /obj/item/stack/sheet/plasmarglass
 
+/obj/structure/window/plasma/reinforced/spawner/east
+	dir = EAST
+
+/obj/structure/window/plasma/reinforced/spawner/west
+	dir = WEST
+
+/obj/structure/window/plasma/reinforced/spawner/north
+	dir = NORTH
+
 /obj/structure/window/plasma/reinforced/unanchored
 	anchored = FALSE