cyberpresidentvanellope/Bubberstation
1
0
Fork 0
mirror of https://github.com/Bubberstation/Bubberstation.git synced 2026-08-26 06:29:23 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fixes infinite grilled naming bug (#50503)

Browse Source
This commit is contained in:
ShizCalev
2020-04-18 15:26:39 +08:00
committed by GitHub
parent 326d6b5d82
commit a642601944
2 changed files with 9 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/food_and_drinks/kitchen_machinery/grill.dm
+8 -3
View File
@@ -42,13 +42,18 @@
return ..()
if(istype(I, /obj/item/reagent_containers))
if(istype(I, /obj/item/reagent_containers/food) && !istype(I, /obj/item/reagent_containers/food/drinks))
if(HAS_TRAIT(I, TRAIT_NODROP) || (I.item_flags & (ABSTRACT | DROPDEL)))
var/obj/item/reagent_containers/food/food_item = I
if(HAS_TRAIT(food_item, TRAIT_NODROP) || (food_item.item_flags & (ABSTRACT | DROPDEL)))
return ..()
else if(food_item.foodtype & GRILLED)
to_chat(user, "<span class='notice'>[food_item] has already been grilled!</span>")
return
else if(!grill_fuel)
to_chat(user, "<span class='warning'>There is not enough fuel!</span>")
return
else if(!grilled_item && user.transferItemToLoc(I, src))
grilled_item = I
else if(!grilled_item && user.transferItemToLoc(food_item, src))
grilled_item = food_item
grilled_item.foodtype |= GRILLED
to_chat(user, "<span class='notice'>You put the [grilled_item] on [src].</span>")
update_icon()
grill_loop.start()