shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Conflicts!!!

Browse Source
This commit is contained in:
Artur
2020-06-22 17:39:24 +03:00
parent 66cbdd1174 a0a4007332
commit c41d2e78be
395 changed files with 84463 additions and 336540 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/food_and_drinks/food/snacks/meat.dm
+22
View File
@@ -315,6 +315,15 @@
slice_path = /obj/item/reagent_containers/food/snacks/meat/rawcutlet/gondola
foodtype = RAW | MEAT
/obj/item/reagent_containers/food/snacks/meat/slab/wisdomcow
name = "wisdom cow meat"
desc = "The meat from the legendary creature known as the wisdom cow. You monster."
list_reagents = list(/datum/reagent/consumable/nutriment = 3, /datum/reagent/medicine/liquid_wisdom = 5)
tastes = list("meat" = 1, "wisdom" = 5)
filling_color = "#18e3ca"
cooked_type = /obj/item/reagent_containers/food/snacks/meat/steak/wisdomcow
slice_path = /obj/item/reagent_containers/food/snacks/meat/rawcutlet/wisdomcow
////////////////////////////////////// MEAT STEAKS ///////////////////////////////////////////////////////////
@@ -374,6 +383,10 @@
name = "gondola steak"
tastes = list("meat" = 1, "tranquility" = 1)
/obj/item/reagent_containers/food/snacks/meat/steak/wisdomcow
name = "wisdom cow steak"
tastes = list("meat" = 1, "wisdom" = 5)
//////////////////////////////// MEAT CUTLETS ///////////////////////////////////////////////////////
//Raw cutlets
@@ -441,6 +454,11 @@
cooked_type = /obj/item/reagent_containers/food/snacks/meat/cutlet/gondola
tastes = list("meat" = 1, "tranquility" = 1)
/obj/item/reagent_containers/food/snacks/meat/rawcutlet/wisdomcow
name = "raw wisdom cow cutlet"
cooked_type = /obj/item/reagent_containers/food/snacks/meat/cutlet/wisdomcow
tastes = list("meat" = 1, "wisdom" = 5)
//Cooked cutlets
/obj/item/reagent_containers/food/snacks/meat/cutlet
@@ -488,3 +506,7 @@
/obj/item/reagent_containers/food/snacks/meat/cutlet/chicken
name = "chicken cutlet"
tastes = list("chicken" = 1)
/obj/item/reagent_containers/food/snacks/meat/cutlet/wisdomcow
name = "wisdom cow cutlet"
tastes = list("meat" = 1, "wisdom" = 5)
code/modules/food_and_drinks/kitchen_machinery/smartfridge.dm
+1 -1
View File
@@ -463,7 +463,7 @@
return TRUE
if(!O.reagents || !O.reagents.reagent_list.len) // other empty containers not accepted
return FALSE
if(istype(O, /obj/item/reagent_containers/syringe) || istype(O, /obj/item/reagent_containers/glass/bottle) || istype(O, /obj/item/reagent_containers/glass/beaker) || istype(O, /obj/item/reagent_containers/spray) || istype(O, /obj/item/reagent_containers/medspray))
if(istype(O, /obj/item/reagent_containers/syringe) || istype(O, /obj/item/reagent_containers/glass/bottle) || istype(O, /obj/item/reagent_containers/glass/beaker) || istype(O, /obj/item/reagent_containers/spray) || istype(O, /obj/item/reagent_containers/medspray) || istype(O, /obj/item/reagent_containers/chem_pack))
return TRUE
return FALSE