Merge branch 'master' of https://github.com/tgstation/-tg-station into FixAlienStructureProjDodge

Conflicts:
	code/game/objects/structures/aliens.dm

code/game/objects/structures/aliens.dm

@@ -110,7 +110,7 @@
 		if(3)
 			take_damage(50, BRUTE, 0)
 
-/obj/structure/alien/blob_act()
+/obj/structure/alien/blob_act(obj/effect/blob/B)
 	take_damage(50, BRUTE, 0)
 
 /obj/structure/alien/resin/hitby(atom/movable/AM)

code/game/objects/structures/beds_chairs/chair.dm

@@ -253,7 +253,7 @@
 		if(istype(A,/obj/structure/chair))
 			user << "<span class='danger'>There is already a chair here.</span>"
 			return
-		if(A.density)
+		if(A.density && !(A.flags & ON_BORDER))
 			user << "<span class='danger'>There is already something here.</span>"
 			return
 

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

@@ -206,7 +206,7 @@
 		visible_message("<span class='danger'>[user] destroys \the [src].</span>")
 		qdel(src)
 
-/obj/structure/closet/blob_act()
+/obj/structure/closet/blob_act(obj/effect/blob/B)
 	if(prob(75))
 		qdel(src)
 
@@ -266,13 +266,19 @@
 		return
 	if(user == O) //try to climb onto it
 		return ..()
-	if(!opened || istype(O, /obj/structure/closet))
+	if(!opened)
+		return
+	if(!isturf(O.loc))
 		return
 
+	var/actuallyismob = 0
+	if(isliving(O))
+		actuallyismob = 1
+	else if(!istype(O, /obj/item))
+		return
+	var/turf/T = get_turf(src)
 	var/list/targets = list(O, src)
 	add_fingerprint(user)
-	var/mob/living/L = O
-	var/actuallyismob = istype(L)
 	user.visible_message("<span class='warning'>[user] [actuallyismob ? "tries to ":""]stuff [O] into [src].</span>", \
 				 	 	"<span class='warning'>You [actuallyismob ? "try to ":""]stuff [O] into [src].</span>", \
 				 	 	"<span class='italics'>You hear clanging.</span>")
@@ -281,12 +287,13 @@
 			user.visible_message("<span class='notice'>[user] stuffs [O] into [src].</span>", \
 							 	 "<span class='notice'>You stuff [O] into [src].</span>", \
 							 	 "<span class='italics'>You hear a loud metal bang.</span>")
+			var/mob/living/L = O
 			if(!issilicon(L))
 				L.Weaken(2)
-			O.forceMove(get_turf(src))
+			O.forceMove(T)
 			close()
 	else
-		O.forceMove(get_turf(src))
+		O.forceMove(T)
 	return 1
 
 /obj/structure/closet/relaymove(mob/user)

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

@@ -120,7 +120,7 @@
 	if(user.environment_smash)
 		shatter()
 
-/obj/structure/closet/statue/blob_act()
+/obj/structure/closet/statue/blob_act(obj/effect/blob/B)
 	shatter()
 
 /obj/structure/closet/statue/attacked_by(obj/item/I, mob/living/user)

code/game/objects/structures/displaycase.dm

@@ -48,7 +48,7 @@
 		showpiece.loc = src.loc
 		showpiece = null
 
-/obj/structure/displaycase/blob_act()
+/obj/structure/displaycase/blob_act(obj/effect/blob/B)
 	if (prob(75))
 		new /obj/item/weapon/shard( src.loc )
 		dump()

code/game/objects/structures/fireaxe.dm

@@ -82,7 +82,7 @@
 	take_damage(P.damage, P.damage_type, 0)
 
 
-/obj/structure/fireaxecabinet/blob_act()
+/obj/structure/fireaxecabinet/blob_act(obj/effect/blob/B)
 	if(fireaxe)
 		fireaxe.loc = src.loc
 	qdel(src)

code/game/objects/structures/girders.dm

@@ -261,7 +261,7 @@
 		var/atom/movable/mover = caller
 		. = . || mover.checkpass(PASSGRILLE)
 
-/obj/structure/girder/blob_act()
+/obj/structure/girder/blob_act(obj/effect/blob/B)
 	if(prob(40))
 		qdel(src)
 

code/game/objects/structures/grille.dm

@@ -23,7 +23,7 @@
 		else
 			take_damage(rand(5,10), BRUTE, 0)
 
-/obj/structure/grille/blob_act()
+/obj/structure/grille/blob_act(obj/effect/blob/B)
 	qdel(src)
 
 /obj/structure/grille/Bumped(atom/user)

code/game/objects/structures/lattice.dm

@@ -28,7 +28,7 @@
 	stored = null
 	return ..()
 
-/obj/structure/lattice/blob_act()
+/obj/structure/lattice/blob_act(obj/effect/blob/B)
 	return
 
 /obj/structure/lattice/ex_act(severity, target)

code/game/objects/structures/safe.dm

@@ -164,7 +164,7 @@ FLOOR SAFES
 		return ..()
 
 
-obj/structure/safe/blob_act()
+obj/structure/safe/blob_act(obj/effect/blob/B)
 	return
 
 obj/structure/safe/ex_act(severity, target)

code/game/objects/structures/signs.dm

@@ -13,7 +13,7 @@
 /obj/structure/sign/ex_act(severity, target)
 	qdel(src)
 
-/obj/structure/sign/blob_act()
+/obj/structure/sign/blob_act(obj/effect/blob/B)
 	qdel(src)
 	return
 
@@ -107,9 +107,15 @@
 /obj/structure/sign/map/left
 	icon_state = "map-left"
 
+/obj/structure/sign/map/left/dream
+	icon_state = "map-left-DS"
+
 /obj/structure/sign/map/right
 	icon_state = "map-right"
 
+/obj/structure/sign/map/right/dream
+	icon_state = "map-right-DS"
+
 /obj/structure/sign/securearea
 	name = "\improper SECURE AREA"
 	desc = "A warning sign which reads 'SECURE AREA'."

code/game/objects/structures/tables_racks.dm

@@ -53,7 +53,7 @@
 		if(3)
 			take_damage(rand(40,80), BRUTE, 0)
 
-/obj/structure/table/blob_act()
+/obj/structure/table/blob_act(obj/effect/blob/B)
 	if(prob(75))
 		qdel(src)
 
@@ -408,7 +408,7 @@
 		if(3)
 			take_damage(rand(5,25), BRUTE, 0)
 
-/obj/structure/rack/blob_act()
+/obj/structure/rack/blob_act(obj/effect/blob/B)
 	if(prob(75))
 		qdel(src)
 	else
@@ -416,8 +416,8 @@
 
 
 /obj/structure/rack/mech_melee_attack(obj/mecha/M)
-	visible_message("<span class='danger'>[M.name] smashes [src] apart!</span>")
-	rack_destroy()
+	if(..())
+		take_damage(M.force*2)
 
 /obj/structure/rack/CanPass(atom/movable/mover, turf/target, height=0)
 	if(height==0) return 1

code/game/objects/structures/watercloset.dm

@@ -447,15 +447,11 @@
 
 	else if(istype(O, /obj/item/weapon/reagent_containers/food/snacks/monkeycube))
 		var/obj/item/weapon/reagent_containers/food/snacks/monkeycube/M = O
-		if(M.wrapped)
-			user << "<span class='notice'>You need to unwrap [src] first!</span>"
-			return
-		else
-			user << "<span class='notice'>You place [src] under a stream of water...</span>"
-			user.drop_item()
-			M.loc = get_turf(src)
-			M.Expand()
-			return
+		user << "<span class='notice'>You place [src] under a stream of water...</span>"
+		user.drop_item()
+		M.loc = get_turf(src)
+		M.Expand()
+		return
 
 	var/obj/item/I = O
 	if(!I || !istype(I))

code/game/objects/structures/window.dm

@@ -61,7 +61,7 @@
 		if(3)
 			take_damage(rand(25,75), BRUTE, 0)
 
-/obj/structure/window/blob_act()
+/obj/structure/window/blob_act(obj/effect/blob/B)
 	shatter()
 
 /obj/structure/window/narsie_act()