Merge remote-tracking branch 'upstream/master' into botany-rework

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

@@ -16,6 +16,7 @@
 	var/cutting_sound = 'sound/items/Welder.ogg'
 	var/storage_capacity = 30 //This is so that someone can't pack hundreds of items in a locker/crate then open it in a populated area to crash clients.
 	var/material_drop = /obj/item/stack/sheet/metal
+	var/material_drop_amount = 2
 
 /obj/structure/closet/New()
 	..()
@@ -49,28 +50,13 @@
 	return 1
 
 /obj/structure/closet/proc/dump_contents()
-	//Cham Projector Exception
-	for(var/obj/effect/dummy/chameleon/AD in src)
-		AD.forceMove(loc)
-
-	for(var/obj/I in src)
-		I.forceMove(loc)
-
-	for(var/mob/M in src)
-		moveMob(M, loc)
-
-/obj/structure/closet/proc/moveMob(var/mob/M, var/atom/destination)
-	loc.Exited(M)
-	M.loc = destination
-	M.reset_perspective(destination)
-	if(isturf(loc))
-		loc.Entered(M, src, ignoreRest = 1)
-	else
-		loc.Entered(M, src)
-	for(var/atom/movable/AM in loc)
-		if(istype(AM, /obj/item))
-			continue
-		AM.Crossed(M)
+	var/turf/T = get_turf(src)
+	for(var/atom/movable/AM in src)
+		AM.forceMove(T)
+		if(throwing) // you keep some momentum when getting out of a thrown closet
+			step(AM, dir)
+	if(throwing)
+		throwing = 0
 
 /obj/structure/closet/proc/open()
 	if(src.opened)
@@ -120,7 +106,7 @@
 		if(M.buckled)
 			continue
 
-		moveMob(M, src)
+		M.forceMove(src)
 		itemcount++
 
 	src.icon_state = src.icon_closed
@@ -271,7 +257,7 @@
 									"<span class='notice'>You cut \the [src] apart with \the [WT].</span>",
 									"<span class='italics'>You hear welding.</span>")
 					var/turf/T = get_turf(src)
-					new material_drop(T)
+					new material_drop(T, material_drop_amount)
 					qdel(src)
 					return
 		if(isrobot(user))
@@ -425,4 +411,4 @@
 
 /obj/structure/closet/get_remote_view_fullscreens(mob/user)
 	if(user.stat == DEAD || !(user.sight & (SEEOBJS|SEEMOBS)))
-		user.overlay_fullscreen("remote_view", /obj/screen/fullscreen/impaired, 1)
+		user.overlay_fullscreen("remote_view", /obj/screen/fullscreen/impaired, 1)

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

@@ -57,10 +57,9 @@
 		qdel(src)
 
 /obj/structure/closet/statue/dump_contents()
-
-	if(istype(src.loc, /mob/living/simple_animal/hostile/statue))
-		var/mob/living/simple_animal/hostile/statue/S = src.loc
-		src.loc = S.loc
+	if(istype(loc, /mob/living/simple_animal/hostile/statue))
+		var/mob/living/simple_animal/hostile/statue/S = loc
+		forceMove(S.loc)
 		if(S.mind)
 			for(var/mob/M in contents)
 				S.mind.transfer_to(M)
@@ -68,21 +67,16 @@
 				break
 		qdel(S)
 
-
-	for(var/obj/O in src)
-		O.loc = src.loc
-
 	for(var/mob/living/M in src)
 		M.forceMove(loc)
 		M.disabilities -= MUTE
 		M.take_overall_damage((M.health - health - 100),0) //any new damage the statue incurred is transfered to the mob
-
+			
+	..()
 
 /obj/structure/closet/statue/open()
 	return
 
-
-
 /obj/structure/closet/statue/open()
 	return
 
@@ -158,4 +152,4 @@ obj/structure/statue/angel
 	icon_state = "angelseen"
 
 obj/structure/statue/corgi
-	icon_state = "corgi"
+	icon_state = "corgi"

code/game/objects/structures/flora.dm

@@ -36,6 +36,14 @@
 	..()
 	icon_state = "tree_[rand(1, 6)]"
 
+/obj/structure/flora/tree/palm
+	icon = 'icons/misc/beach2.dmi'
+	icon_state = "palm1"
+
+/obj/structure/flora/tree/palm/New()
+	..()
+	icon_state = pick("palm1","palm2")
+	pixel_x = 0	
 
 //grass
 /obj/structure/flora/grass