Merge remote-tracking branch 'ParadiseSS13/master' into depot

code/game/objects/items/weapons/storage/boxes.dm

@@ -26,6 +26,7 @@
 	item_state = "syringe_kit"
 	burn_state = FLAMMABLE
 	var/foldable = /obj/item/stack/sheet/cardboard
+	var/amt = 1
 
 /obj/item/storage/box/attack_self(mob/user)
 	..()
@@ -49,7 +50,7 @@
 		return
 
 	to_chat(user, "<span class='notice'>You fold [src] flat.</span>")
-	var/obj/item/I = new foldable(get_turf(src))
+	var/obj/item/stack/I = new foldable(get_turf(src), amt)
 	user.put_in_hands(I)
 	qdel(src)
 
@@ -59,6 +60,7 @@
 	icon_state = "largebox"
 	w_class = 42 // Big, bulky.
 	foldable = /obj/item/stack/sheet/cardboard
+	amt = 4
 	storage_slots = 21
 	max_combined_w_class = 42 // 21*2
 

code/game/objects/items/weapons/weaponry.dm

@@ -179,7 +179,7 @@ obj/item/wirerod/attackby(obj/item/I, mob/user, params)
 		return
 	to_chat(user, "<span class='warning'>You begin gathering strength...</span>")
 	playsound(get_turf(src), 'sound/magic/lightning_chargeup.ogg', 65, 1)
-	if(do_after(user, 90, target = src))
+	if(do_after(user, 90, target = user))
 		to_chat(user, "<span class='userdanger'>You gather power! Time for a home run!</span>")
 		homerun_ready = 1
 	..()

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

@@ -10,6 +10,7 @@
 	burntime = 20
 	sound = 'sound/effects/rustle2.ogg'
 	material_drop = /obj/item/stack/sheet/cardboard
+	var/amt = 4
 	cutting_sound = 'sound/items/poster_ripped.ogg'
 	var/move_delay = 0
 	var/egged = 0
@@ -60,7 +61,7 @@
 			return
 		if(istype(W, /obj/item/wirecutters))
 			var/obj/item/wirecutters/WC = W
-			new /obj/item/stack/sheet/cardboard(src.loc)
+			new /obj/item/stack/sheet/cardboard(src.loc, amt)
 			for(var/mob/M in viewers(src))
 				M.show_message("<span class='notice'>\The [src] has been cut apart by [user] with \the [WC].</span>", 3, "You hear cutting.", 2)
 			qdel(src)

code/game/objects/structures/stool_bed_chair_nest/chairs.dm

@@ -186,7 +186,7 @@
 	buildstackamount = 1
 
 /obj/structure/stool/bed/chair/sofa
-	name = "old ratty sofa"
+	name = "sofa"
 	icon_state = "sofamiddle"
 	anchored = 1
 	buildstackamount = 1