diff --git a/code/game/objects/grille.dm b/code/game/objects/grille.dm index 6c89401cdcc..23a05cf7be3 100644 --- a/code/game/objects/grille.dm +++ b/code/game/objects/grille.dm @@ -81,6 +81,15 @@ healthcheck() return + attack_animal(var/mob/living/simple_animal/M as mob) + if(M.melee_damage_upper == 0) return + playsound(src.loc, 'grillehit.ogg', 80, 1) + M.visible_message("[M.name] smashes against the [src.name].", \ + "You smash against the [src.name].", \ + "You hear a noise") + src.health -= rand(4) + healthcheck() + return CanPass(atom/movable/mover, turf/target, height=0, air_group=0) if(air_group || (height==0)) return 1 diff --git a/code/game/objects/window.dm b/code/game/objects/window.dm index c651e28117c..e2d53d0c6ae 100644 --- a/code/game/objects/window.dm +++ b/code/game/objects/window.dm @@ -138,6 +138,30 @@ return return + +/obj/structure/window/attack_animal(mob/living/simple_animal/M as mob) + if (M.melee_damage_upper == 0) + return + M << text("\green You smash against the window.") + for(var/mob/O in viewers(src, null)) + if ((O.client && !( O.blinded ))) + O << text("\red [] smashes against the window.", M) + playsound(src.loc, 'Glasshit.ogg', 100, 1) + src.health -= M.melee_damage_upper + if(src.health <= 0) + M << text("\green You smash through the window.") + for(var/mob/O in viewers(src, null)) + if ((O.client && !( O.blinded ))) + O << text("\red [] smashes through the window!", M) + src.health = 0 + new /obj/item/weapon/shard(src.loc) + if(reinf) + new /obj/item/stack/rods(src.loc) + src.density = 0 + del(src) + return + return + /obj/structure/window/attack_metroid() if(!istype(usr, /mob/living/carbon/metroid/adult)) return diff --git a/code/modules/food/food.dm b/code/modules/food/food.dm index e4ace4ad73f..e9a65d77750 100644 --- a/code/modules/food/food.dm +++ b/code/modules/food/food.dm @@ -415,6 +415,19 @@ name = "brainburger" desc = "A strange looking burger. It looks almost sentient." icon_state = "brainburger" + New() + ..() + bitesize = 2 + +/obj/item/weapon/reagent_containers/food/snacks/ghostburger + name = "Ghost Burger" + desc = "Spooky! It doesn't look very filling." + icon_state = "ghostburger" + New() + ..() + reagents.add_reagent("nutriment", 2) + bitesize = 2 + /obj/item/weapon/reagent_containers/food/snacks/human var/hname = "" diff --git a/code/modules/food/recipes_microwave.dm b/code/modules/food/recipes_microwave.dm index ca4fc6b3efb..64f43fa2434 100644 --- a/code/modules/food/recipes_microwave.dm +++ b/code/modules/food/recipes_microwave.dm @@ -109,6 +109,12 @@ /obj/item/weapon/reagent_containers/food/snacks/tofu ) result = /obj/item/weapon/reagent_containers/food/snacks/burger/tofu +/datum/recipe/ghostburger + items = list( + /obj/item/weapon/reagent_containers/food/snacks/flour, + /obj/item/weapon/ectoplasm + ) + result = /obj/item/weapon/reagent_containers/food/snacks/ghostburger /datum/recipe/clownburger items = list( diff --git a/icons/obj/food.dmi b/icons/obj/food.dmi index 27b05fd606a..6e7efe921c0 100644 Binary files a/icons/obj/food.dmi and b/icons/obj/food.dmi differ