Jay Owen demands that this pull be merged.

Crush a can for Jay Owen.

He has leukemia, please crush a can for Jay Owen.

His only wish is to see a can crushed live in our game.

Sprites by Nienhaus

Conflicts:
	code/game/objects/items/trash.dm
	code/modules/reagents/reagent_containers/food/drinks.dm
	icons/obj/janitor.dmi
This commit is contained in:
Incoming
2014-02-16 05:42:55 -05:00
committed by ZomgPonies
parent 71c07e208a
commit 917370a608
4 changed files with 21 additions and 7 deletions
+3
View File
@@ -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