diff --git a/code/game/objects/items/trash.dm b/code/game/objects/items/trash.dm index ed69ba9f38a..8781ba4a0ff 100644 --- a/code/game/objects/items/trash.dm +++ b/code/game/objects/items/trash.dm @@ -47,6 +47,9 @@ name = "candle" icon = 'icons/obj/candle.dmi' icon_state = "candle4" + can + name = "crushed can" + icon_state = "cola" /obj/item/trash/attack(mob/M, mob/living/user) return \ No newline at end of file diff --git a/code/modules/reagents/reagent_containers/food/drinks.dm b/code/modules/reagents/reagent_containers/food/drinks.dm index b05fe1d7d47..8d5f9338895 100644 --- a/code/modules/reagents/reagent_containers/food/drinks.dm +++ b/code/modules/reagents/reagent_containers/food/drinks.dm @@ -289,6 +289,15 @@ //////////////////////////soda_cans// //These are in their own group to be used as IED's in /obj/item/weapon/grenade/ghettobomb.dm +/obj/item/weapon/reagent_containers/food/drinks/soda_cans/attack(mob/M, mob/user) + if(M == user && !src.reagents.total_volume && user.a_intent == "harm" && user.zone_sel.selecting == "head") + user.visible_message("[user] crushes the can of [src] on \his forehead!", "You crush the can of [src] on your forehead!") + playsound(user.loc,'sound/weapons/pierce.ogg', rand(10,50), 1) + var/obj/item/trash/can/crushed_can = new /obj/item/trash/can(user.loc) + crushed_can.icon_state = icon_state + del(src) + ..() + /obj/item/weapon/reagent_containers/food/drinks/soda_cans/cola name = "Space Cola" desc = "Cola. in space." @@ -376,3 +385,4 @@ reagents.add_reagent("dr_gibb", 30) src.pixel_x = rand(-10.0, 10) src.pixel_y = rand(-10.0, 10) + diff --git a/icons/obj/janitor.dmi b/icons/obj/janitor.dmi index aeca4370ed6..fbe96a72628 100644 Binary files a/icons/obj/janitor.dmi and b/icons/obj/janitor.dmi differ