Revert "12/21 modernizations from TG live"

code/modules/paperwork/paperbin.dm

@@ -5,42 +5,24 @@
 	icon_state = "paper_bin1"
 	item_state = "sheet-metal"
 	throwforce = 0
-	w_class = WEIGHT_CLASS_NORMAL
+	w_class = 3
 	throw_speed = 3
 	throw_range = 7
 	pressure_resistance = 8
-	var/total_paper = 30
-	var/list/papers = list()
-	var/obj/item/weapon/pen/bin_pen
+	burn_state = FLAMMABLE
+	var/amount = 30					//How much paper is in the bin.
+	var/list/papers = new/list()	//List of papers put in the bin for reference.
 
-/obj/item/weapon/paper_bin/initialize()
-	var/obj/item/weapon/pen/P = locate(/obj/item/weapon/pen) in src.loc
-	if(P && !bin_pen)
-		P.loc = src
-		bin_pen = P
-		update_icon()
-		var/static/warned = FALSE
-		if(!warned)
-			warning("one or more paperbins ate a pen duing initialize()")
-			warned = TRUE
-
-/obj/item/weapon/paper_bin/fire_act(exposed_temperature, exposed_volume)
-	if(!total_paper)
+/obj/item/weapon/paper_bin/fire_act()
+	if(!amount)
 		return
 	..()
 
-/obj/item/weapon/paper_bin/Destroy()
-	if(papers)
-		for(var/i in papers)
-			qdel(i)
-		papers = null
-	. = ..()
-
-/obj/item/weapon/paper_bin/fire_act(exposed_temperature, exposed_volume)
-	if(total_paper)
-		total_paper = 0
-		update_icon()
-	..()
+/obj/item/weapon/paper_bin/burn()
+	amount = 0
+	extinguish()
+	update_icon()
+	return
 
 /obj/item/weapon/paper_bin/MouseDrop(atom/over_object)
 	var/mob/living/M = usr
@@ -55,7 +37,11 @@
 		if(!remove_item_from_storage(M))
 			if(!M.unEquip(src))
 				return
-		M.put_in_hand(src, H.held_index)
+		switch(H.slot_id)
+			if(slot_r_hand)
+				M.put_in_r_hand(src)
+			if(slot_l_hand)
+				M.put_in_l_hand(src)
 
 	add_fingerprint(M)
 
@@ -68,19 +54,12 @@
 	if(user.lying)
 		return
 	user.changeNext_move(CLICK_CD_MELEE)
-	if(bin_pen)
-		var/obj/item/weapon/pen/P = bin_pen
-		P.loc = user.loc
-		user.put_in_hands(P)
-		user << "<span class='notice'>You take [P] out of \the [src].</span>"
-		bin_pen = null
+	if(amount >= 1)
+		amount--
 		update_icon()
-	else if(total_paper >= 1)
-		total_paper--
-		update_icon()
-		// If there's any custom paper on the stack, use that instead of creating a new paper.
+
 		var/obj/item/weapon/paper/P
-		if(papers.len > 0)
+		if(papers.len > 0)	//If there's any custom paper on the stack, use that instead of creating a new paper.
 			P = papers[papers.len]
 			papers.Remove(P)
 		else
@@ -108,32 +87,21 @@
 		P.loc = src
 		user << "<span class='notice'>You put [P] in [src].</span>"
 		papers.Add(P)
-		total_paper++
-		update_icon()
-	else if(istype(I, /obj/item/weapon/pen))
-		var/obj/item/weapon/pen/P = I
-		if(!user.unEquip(P))
-			return
-		P.loc = src
-		user << "<span class='notice'>You put [P] in [src].</span>"
-		bin_pen = P
+		amount++
 		update_icon()
 	else
 		return ..()
 
 /obj/item/weapon/paper_bin/examine(mob/user)
 	..()
-	if(total_paper)
-		user << "It contains " + (total_paper > 1 ? "[total_paper] papers" : " one paper")+"."
+	if(amount)
+		user << "It contains " + (amount > 1 ? "[amount] papers" : " one paper")+"."
 	else
 		user << "It doesn't contain anything."
 
 
 /obj/item/weapon/paper_bin/update_icon()
-	if(total_paper < 1)
+	if(amount < 1)
 		icon_state = "paper_bin0"
 	else
 		icon_state = "paper_bin1"
-	cut_overlays()
-	if(bin_pen)
-		add_overlay(image(icon=bin_pen.icon,icon_state=bin_pen.icon_state))