Merge remote-tracking branch 'upstream/master' into IPC-buffs

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

@@ -25,9 +25,13 @@
 	..()
 	spawn(1)
 		if(!opened)		// if closed, any item at the crate's loc is put in the contents
+			var/itemcount = 0
 			for(var/obj/item/I in loc)
 				if(I.density || I.anchored || I == src) continue
 				I.forceMove(src)
+				// Ensure the storage cap is respected
+				if(++itemcount >= storage_capacity)
+					break
 
 // Fix for #383 - C4 deleting fridges with corpses
 /obj/structure/closet/Destroy()
@@ -230,7 +234,7 @@
 	add_fingerprint(user)
 
 /obj/structure/closet/attack_ai(mob/user)
-	if(isrobot(user) && Adjacent(user)) //Robots can open/close it, but not the AI
+	if(isrobot(user) && Adjacent(user) && !istype(user.loc, /obj/machinery/atmospherics)) //Robots can open/close it, but not the AI
 		attack_hand(user)
 
 /obj/structure/closet/relaymove(mob/user)
@@ -354,6 +358,11 @@
 /obj/structure/closet/AllowDrop()
 	return TRUE
 
+/obj/structure/closet/force_eject_occupant()
+	// Its okay to silently teleport mobs out of lockers, since the only thing affected is their contents list.
+	return
+
+
 /obj/structure/closet/bluespace
 	name = "bluespace closet"
 	desc = "A storage unit that moves and stores through the fourth dimension."

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

@@ -69,6 +69,11 @@
 /obj/structure/closet/secure_closet/closed_item_click(mob/user)
 	togglelock(user)
 
+/obj/structure/closet/secure_closet/AltClick(mob/user)
+	..()
+	if(Adjacent(user))
+		togglelock(user)
+
 /obj/structure/closet/secure_closet/emag_act(mob/user)
 	if(!broken)
 		broken = TRUE

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

@@ -82,9 +82,8 @@
 	content_mob = /mob/living/simple_animal/pet/dog/fox
 
 /obj/structure/closet/critter/butterfly
-	name = "butterflies crate"
+	name = "butterfly crate"
 	content_mob = /mob/living/simple_animal/butterfly
-	amount = 50
 
 /obj/structure/closet/critter/deer
 	name = "deer crate"

code/game/objects/structures/dresser.dm

@@ -56,27 +56,20 @@
 
 /obj/structure/dresser/crowbar_act(mob/user, obj/item/I)
 	. = TRUE
-	if(!I.tool_start_check(src, user, 0))
+	if(!I.use_tool(src, user, 0))
 		return
 	TOOL_ATTEMPT_DISMANTLE_MESSAGE
 	if(I.use_tool(src, user, 50, volume = I.tool_volume))
 		TOOL_DISMANTLE_SUCCESS_MESSAGE
-
+		deconstruct(disassembled = TRUE)
 
 /obj/structure/dresser/wrench_act(mob/user, obj/item/I)
 	. = TRUE
-	if(!I.use_tool(src, user, 0, volume = I.tool_volume))
-		return
-	if(anchored)
-		WRENCH_UNANCHOR_MESSAGE
-		anchored = FALSE
-	else
-		if(!isfloorturf(loc))
-			user.visible_message("<span class='warning'>A floor must be present to secure [src]!</span>")
-			return
-		WRENCH_ANCHOR_MESSAGE
-		anchored = TRUE
+	default_unfasten_wrench(user, I, time = 20)
 
-/obj/structure/dresser/deconstruct(disassembled = TRUE)
-	new /obj/item/stack/sheet/wood(drop_location(), 30)
-	qdel(src)
+obj/structure/dresser/deconstruct(disassembled = FALSE)
+	var/mat_drop = 15
+	if(disassembled)
+		mat_drop = 30
+	new /obj/item/stack/sheet/wood(drop_location(), mat_drop)
+	..()

code/game/objects/structures/extinguisher.dm

@@ -40,7 +40,7 @@
 		return
 	if(!in_range(src, user))
 		return
-	if(!iscarbon(usr))
+	if(!iscarbon(usr) && !isrobot(usr))
 		return
 	playsound(loc, 'sound/machines/click.ogg', 15, TRUE, -3)
 	opened = !opened

code/game/objects/structures/foodcart.dm

@@ -40,7 +40,7 @@
 					food_slots[s]=I
 					update_icon()
 					success = 1
-					break;
+					break
 			if(!success)
 				to_chat(user, fail_msg)
 		else if(istype(I, /obj/item/reagent_containers/food/drinks))
@@ -51,7 +51,7 @@
 					drink_slots[s]=I
 					update_icon()
 					success = 1
-					break;
+					break
 			if(!success)
 				to_chat(user, fail_msg)
 		else if(istype(I, /obj/item/wrench))

code/game/objects/structures/girders.dm

@@ -76,14 +76,14 @@
 		if(istype(W,/obj/item/stack/rods))
 			var/obj/item/stack/rods/S = W
 			if(state == GIRDER_DISPLACED)
-				if(S.get_amount() < 2)
-					to_chat(user, "<span class='warning'>You need at least two rods to create a false wall!</span>")
+				if(S.get_amount() < 5)
+					to_chat(user, "<span class='warning'>You need at least five rods to create a false wall!</span>")
 					return
 				to_chat(user, "<span class='notice'>You start building a reinforced false wall...</span>")
 				if(do_after(user, 20, target = src))
-					if(!loc || !S || S.get_amount() < 2)
+					if(!loc || !S || S.get_amount() < 5)
 						return
-					S.use(2)
+					S.use(5)
 					to_chat(user, "<span class='notice'>You create a false wall. Push on it to open or close the passage.</span>")
 					var/obj/structure/falsewall/iron/FW = new (loc)
 					transfer_fingerprints_to(FW)

code/game/objects/structures/kitchen_spike.dm

@@ -69,9 +69,9 @@
 	if(isliving(G.affecting))
 		if(!has_buckled_mobs())
 			if(do_mob(user, src, 120))
-				if(spike(G.affecting))
-					G.affecting.visible_message("<span class='danger'>[user] slams [G.affecting] onto the meat spike!</span>", "<span class='userdanger'>[user] slams you onto the meat spike!</span>", "<span class='italics'>You hear a squishy wet noise.</span>")
-					qdel(G)
+				var/mob/living/affected = G.affecting
+				if(spike(affected))
+					affected.visible_message("<span class='danger'>[user] slams [affected] onto the meat spike!</span>", "<span class='userdanger'>[user] slams you onto the meat spike!</span>", "<span class='italics'>You hear a squishy wet noise.</span>")
 		return
 	return ..()
 

code/game/objects/structures/loom.dm

@@ -11,12 +11,30 @@
 	anchored = TRUE
 
 /obj/structure/loom/attackby(obj/item/I, mob/user)
-	if(default_unfasten_wrench(user, I, 5))
-		return
 	if(weave(I, user))
 		return
 	return ..()
 
+/obj/structure/loom/crowbar_act(mob/user, obj/item/I)
+	. = TRUE
+	if(!I.use_tool(src, user, 0))
+		return
+	TOOL_ATTEMPT_DISMANTLE_MESSAGE
+	if(I.use_tool(src, user, 50, volume = I.tool_volume))
+		TOOL_DISMANTLE_SUCCESS_MESSAGE
+		deconstruct(disassembled = TRUE)
+
+/obj/structure/loom/wrench_act(mob/user, obj/item/I)
+	. = TRUE
+	default_unfasten_wrench(user, I, time = 20)
+
+/obj/structure/loom/deconstruct(disassembled = FALSE)
+	var/mat_drop = 5
+	if(disassembled)
+		mat_drop = 10
+	new /obj/item/stack/sheet/wood(drop_location(), mat_drop)
+	..()
+
 ///Handles the weaving.
 /obj/structure/loom/proc/weave(obj/item/stack/sheet/cotton/W, mob/user)
 	if(!istype(W))

code/game/objects/structures/signs.dm

@@ -292,12 +292,12 @@
 
 /obj/structure/sign/directions/engineering
 	name = "\improper Engineering Department"
-	desc = "A direction sign, pointing out which way the Engineering department is."
+	desc = "A direction sign, pointing out which way the Engineering Department is."
 	icon_state = "direction_eng"
 
 /obj/structure/sign/directions/security
 	name = "\improper Security Department"
-	desc = "A direction sign, pointing out which way the Security department is."
+	desc = "A direction sign, pointing out which way the Security Department is."
 	icon_state = "direction_sec"
 
 /obj/structure/sign/directions/medical
@@ -307,12 +307,12 @@
 
 /obj/structure/sign/directions/evac
 	name = "\improper Escape Arm"
-	desc = "A direction sign, pointing out which way escape shuttle dock is."
+	desc = "A direction sign, pointing out which way Escape Shuttle Dock is."
 	icon_state = "direction_evac"
 
 /obj/structure/sign/directions/cargo
 	name = "\improper Cargo Department"
-	desc = "A direction sign, pointing out which way the Cargo department is."
+	desc = "A direction sign, pointing out which way the Cargo Department is."
 	icon_state = "direction_supply"
 
 /obj/structure/sign/explosives

code/game/objects/structures/statues.dm

@@ -288,6 +288,28 @@
 		return
 	setDir(turn(dir, 90))
 
+/obj/structure/statue/kidanstatue
+	name = "Obsidian Kidan warrior statue"
+	desc = "A beautifully carved and menacing statue of a Kidan warrior made out of obsidian. It looks very heavy."
+	icon_state = "kidan"
+	anchored = TRUE
+	oreAmount = 0
+
+/obj/structure/statue/chickenstatue
+	name = "Bronze Chickenman Statue"
+	desc = "An antique and oriental-looking statue of a Chickenman made of bronze."
+	icon_state = "chicken"
+	anchored = TRUE
+	oreAmount = 0
+
+/obj/structure/statue/russian_mulebot
+	desc = "Like a MULEbot, but more Russian and less functional.";
+	icon = 'icons/obj/aibots.dmi';
+	icon_state = "mulebot0";
+	name = "OXENbot"
+	anchored = TRUE
+	oreAmount = 10
+
 ////////////////////////////////
 
 /obj/structure/snowman
@@ -320,19 +342,3 @@
 	..()
 	qdel(src)
 
-
-/obj/structure/kidanstatue
-	name = "Obsidian Kidan warrior statue"
-	desc = "A beautifully carved and menacing statue of a Kidan warrior made out of obsidian. It looks very heavy."
-	icon = 'icons/obj/decorations.dmi'
-	icon_state = "kidanstatue"
-	anchored = 1
-	density = 1
-
-/obj/structure/chickenstatue
-	name = "Bronze Chickenman Statue"
-	desc = "An antique and oriental-looking statue of a Chickenman made of bronze."
-	icon = 'icons/obj/decorations.dmi'
-	icon_state = "chickenstatue"
-	anchored = 1
-	density = 1