diff --git a/code/game/objects/items/trash.dm b/code/game/objects/items/trash.dm index 9b955195dbe..72d98d66a64 100644 --- a/code/game/objects/items/trash.dm +++ b/code/game/objects/items/trash.dm @@ -52,6 +52,9 @@ liquidfood name = "\improper \"LiquidFood\" ration" icon_state = "liquidfood" + can + name = "crushed can" + icon_state = "cola" /obj/item/trash/attack(mob/M as mob, mob/living/user as mob) return diff --git a/code/modules/reagents/reagent_containers/food/cans.dm b/code/modules/reagents/reagent_containers/food/cans.dm index 2f997295b1a..2c045e23766 100644 --- a/code/modules/reagents/reagent_containers/food/cans.dm +++ b/code/modules/reagents/reagent_containers/food/cans.dm @@ -21,14 +21,25 @@ return 0 if(M == user) - M << "\blue You swallow a gulp of [src]." - if(reagents.total_volume) - reagents.reaction(M, INGEST) - spawn(5) - reagents.trans_to(M, gulp_size) + if(!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) + + else + M << "\blue You swallow a gulp of [src]." + if(reagents.total_volume) + reagents.reaction(M, INGEST) + spawn(5) + reagents.trans_to(M, gulp_size) + + playsound(M.loc,'sound/items/drink.ogg', rand(10,50), 1) + return 1 + + - playsound(M.loc,'sound/items/drink.ogg', rand(10,50), 1) - return 1 else if( istype(M, /mob/living/carbon/human) ) for(var/mob/O in viewers(world.view, user)) diff --git a/icons/obj/janitor.dmi b/icons/obj/janitor.dmi deleted file mode 100644 index 5e0e2ced3ae..00000000000 Binary files a/icons/obj/janitor.dmi and /dev/null differ diff --git a/icons/obj/trash.dmi b/icons/obj/trash.dmi index c031a9576c9..da88f0bf6e8 100644 Binary files a/icons/obj/trash.dmi and b/icons/obj/trash.dmi differ