From 698debad082fee77dd17c730997b6f337f51a33f Mon Sep 17 00:00:00 2001 From: Incoming Date: Thu, 13 Feb 2014 10:35:02 -0500 Subject: [PATCH] Cleans up the trash.dm --- code/game/objects/items/trash.dm | 106 +++++++++++++++++-------------- 1 file changed, 60 insertions(+), 46 deletions(-) diff --git a/code/game/objects/items/trash.dm b/code/game/objects/items/trash.dm index 8781ba4a0ff..12911c16baa 100644 --- a/code/game/objects/items/trash.dm +++ b/code/game/objects/items/trash.dm @@ -4,52 +4,66 @@ desc = "This is rubbish." w_class = 1.0 - raisins - name = "\improper 4no raisins" - icon_state= "4no_raisins" - candy - name = "candy" - icon_state= "candy" - cheesie - name = "cheesie honkers" - icon_state = "cheesie_honkers" - chips - name = "chips" - icon_state = "chips" - popcorn - name = "popcorn" - icon_state = "popcorn" - sosjerky - name = "\improper Scaredy's Private Reserve Beef Jerky" - icon_state = "sosjerky" - syndi_cakes - name = "syndi-cakes" - icon_state = "syndi_cakes" - waffles - name = "waffles" - icon_state = "waffles" - plate - name = "plate" - icon_state = "plate" - snack_bowl - name = "snack bowl" - icon_state = "snack_bowl" - pistachios - name = "pistachios pack" - icon_state = "pistachios_pack" - semki - name = "semki pack" - icon_state = "semki_pack" - tray - name = "tray" - icon_state = "tray" - candle - name = "candle" - icon = 'icons/obj/candle.dmi' - icon_state = "candle4" - can - name = "crushed can" - icon_state = "cola" +/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" + icon_state = "waffles" + +/obj/item/trash/plate + name = "plate" + icon_state = "plate" + +/obj/item/trash/snack_bowl + name = "snack bowl" + icon_state = "snack_bowl" + +/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" + +/obj/item/trash/candle + name = "candle" + icon = 'icons/obj/candle.dmi' + icon_state = "candle4" + +/obj/item/trash/can + name = "crushed can" + icon_state = "cola" /obj/item/trash/attack(mob/M, mob/living/user) return \ No newline at end of file