From d86bdf2150b1875daaae50a29da943200d1722b3 Mon Sep 17 00:00:00 2001
From: deathride58 <deathride58@users.noreply.github.com>
Date: Wed, 22 Nov 2017 14:44:09 -0500
Subject: [PATCH] Update trash.dm

---
 code/game/objects/items/trash.dm | 87 ++------------------------------
 1 file changed, 4 insertions(+), 83 deletions(-)

diff --git a/code/game/objects/items/trash.dm b/code/game/objects/items/trash.dm
index ef1d377831..c9552a3d39 100644
--- a/code/game/objects/items/trash.dm
+++ b/code/game/objects/items/trash.dm
@@ -1,86 +1,8 @@
-//Added by Jack Rost
-/obj/item/trash
-	icon = 'icons/obj/janitor.dmi'
+//Added by Jack Rost
+/obj/item/trash
+	icon = 'icons/obj/janitor.dmi'
 	lefthand_file = 'icons/mob/inhands/misc/food_lefthand.dmi'
 	righthand_file = 'icons/mob/inhands/misc/food_righthand.dmi'
-<<<<<<< HEAD
-	desc = "This is rubbish."
-	w_class = WEIGHT_CLASS_TINY
-	resistance_flags = FLAMMABLE
-
-/obj/item/trash/raisins
-	name = "\improper 4no raisins"
-	icon_state= "4no_raisins"
-
-/obj/item/trash/candy
-	name = "candy"
-	icon_state= "candy"
-
-/obj/item/trash/cheesie
-	name = "cheesie honkers"
-	icon_state = "cheesie_honkers"
-
-/obj/item/trash/chips
-	name = "chips"
-	icon_state = "chips"
-
-/obj/item/trash/popcorn
-	name = "popcorn"
-	icon_state = "popcorn"
-
-/obj/item/trash/sosjerky
-	name = "\improper Scaredy's Private Reserve Beef Jerky"
-	icon_state = "sosjerky"
-
-/obj/item/trash/syndi_cakes
-	name = "syndi-cakes"
-	icon_state = "syndi_cakes"
-
-/obj/item/trash/waffles
-	name = "waffles tray"
-	icon_state = "waffles"
-
-/obj/item/trash/plate
-	name = "plate"
-	icon_state = "plate"
-	resistance_flags = 0
-
-/obj/item/trash/pistachios
-	name = "pistachios pack"
-	icon_state = "pistachios_pack"
-
-/obj/item/trash/semki
-	name = "semki pack"
-	icon_state = "semki_pack"
-
-/obj/item/trash/tray
-	name = "tray"
-	icon_state = "tray"
-	resistance_flags = 0
-
-/obj/item/trash/candle
-	name = "candle"
-	icon = 'icons/obj/candle.dmi'
-	icon_state = "candle4"
-
-/obj/item/trash/can
-	name = "crushed can"
-	icon_state = "cola"
-	resistance_flags = 0
-
-/obj/item/trash/attack(mob/M, mob/living/user)
-	return
-
-/obj/item/trash/coal
-	name = "lump of coal"
-	icon = 'icons/obj/mining.dmi'
-	icon_state = "slag"
-	desc = "Someone's gotten on the naughty list."
-
-/obj/item/trash/coal/burn()
-	visible_message("[src] fuses into a diamond! Someone wasn't so naughty after all...")
-	new /obj/item/ore/diamond(loc)
-=======
 	desc = "This is rubbish."
 	w_class = WEIGHT_CLASS_TINY
 	resistance_flags = FLAMMABLE
@@ -157,5 +79,4 @@
 /obj/item/trash/coal/burn()
 	visible_message("[src] fuses into a diamond! Someone wasn't so naughty after all...")
 	new /obj/item/ore/diamond(loc)
->>>>>>> b0f24a8... Fixes bartender suit having an adjust state (#32968)
-	qdel(src)
\ No newline at end of file
+	qdel(src)