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

Merge branch 'master' into upstream-merge-37476

Browse Source
This commit is contained in:
deathride58
2018-05-06 07:07:02 +00:00
committed by GitHub
parent 892cb0a1be 11c1e8fbf7
commit 6a07a66cb3
738 changed files with 10463 additions and 18840 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/food_and_drinks/food/snacks_bread.dm
+9
View File
@@ -192,6 +192,15 @@
overlays = fried.copy_overlays()
icon_state = fried.icon_state
desc = fried.desc
w_class = fried.w_class
slowdown = fried.slowdown
equip_delay_self = fried.equip_delay_self
equip_delay_other = fried.equip_delay_other
strip_delay = fried.strip_delay
species_exception = fried.species_exception
item_flags = fried.item_flags
obj_flags = fried.obj_flags
if(istype(fried, /obj/item/reagent_containers/food/snacks))
fried.reagents.trans_to(src, fried.reagents.total_volume)
qdel(fried)
code/modules/food_and_drinks/food/snacks_other.dm
+1 -1
View File
@@ -559,7 +559,7 @@
icon_state = "pineapple_slice"
filling_color = "#F6CB0B"
tastes = list("pineapple" = 1)
foodtype = FRUIT
foodtype = FRUIT | PINEAPPLE
/obj/item/reagent_containers/food/snacks/tinychocolate
name = "chocolate"
code/modules/food_and_drinks/food/snacks_pizza.dm
+4 -4
View File
@@ -145,16 +145,16 @@
icon_state = "pineapplepizza"
slice_path = /obj/item/reagent_containers/food/snacks/pizzaslice/pineapple
bonus_reagents = list("nutriment" = 6, "vitamin" = 6)
tastes = list("crust" = 1, "tomato" = 1, "cheese" = 1, "pineapples" = 2, "ham" = 2)
foodtype = GRAIN | VEGETABLES | DAIRY | MEAT | FRUIT
tastes = list("crust" = 1, "tomato" = 1, "cheese" = 1, "pineapple" = 2, "ham" = 2)
foodtype = GRAIN | VEGETABLES | DAIRY | MEAT | FRUIT | PINEAPPLE
/obj/item/reagent_containers/food/snacks/pizzaslice/pineapple
name = "\improper Hawaiian pizza slice"
desc = "A slice of delicious controversy."
icon_state = "pineapplepizzaslice"
filling_color = "#FF4500"
tastes = list("crust" = 1, "tomato" = 1, "cheese" = 1, "pineapples" = 2, "ham" = 2)
foodtype = GRAIN | VEGETABLES | DAIRY | MEAT | FRUIT
tastes = list("crust" = 1, "tomato" = 1, "cheese" = 1, "pineapple" = 2, "ham" = 2)
foodtype = GRAIN | VEGETABLES | DAIRY | MEAT | FRUIT | PINEAPPLE
/obj/item/reagent_containers/food/snacks/pizzaslice/custom
name = "pizza slice"
code/modules/food_and_drinks/kitchen_machinery/deep_fryer.dm
+1 -3
View File
@@ -41,7 +41,7 @@ God bless America.
/obj/item/crowbar,
/obj/item/wrench,
/obj/item/wirecutters,
/obj/item/device/multitool,
/obj/item/multitool,
/obj/item/weldingtool,
/obj/item/reagent_containers/glass,
/obj/item/reagent_containers/syringe,
@@ -89,8 +89,6 @@ God bless America.
return
if(default_unfasten_wrench(user, I))
return
else if(exchange_parts(user, I))
return
else if(default_deconstruction_screwdriver(user, "fryer_off", "fryer_off" ,I)) //where's the open maint panel icon?!
return
else
code/modules/food_and_drinks/kitchen_machinery/gibber.dm
+1 -4
View File
@@ -99,10 +99,7 @@
/obj/machinery/gibber/attackby(obj/item/P, mob/user, params)
if(default_deconstruction_screwdriver(user, "grinder_open", "grinder", P))
return
else if(exchange_parts(user, P))
return
else if(default_pry_open(P))
return
code/modules/food_and_drinks/kitchen_machinery/microwave.dm
-2
View File
@@ -50,8 +50,6 @@
return
if(default_unfasten_wrench(user, O))
return
if(exchange_parts(user, O))
return
if(default_deconstruction_crowbar(O))
return
code/modules/food_and_drinks/kitchen_machinery/monkeyrecycler.dm
-3
View File
@@ -29,9 +29,6 @@
if(default_deconstruction_screwdriver(user, "grinder_open", "grinder", O))
return
if(exchange_parts(user, O))
return
if(default_pry_open(O))
return
code/modules/food_and_drinks/kitchen_machinery/processor.dm
-3
View File
@@ -46,9 +46,6 @@
if(default_deconstruction_screwdriver(user, "processor", "processor1", O))
return
if(exchange_parts(user, O))
return
if(default_pry_open(O))
return
code/modules/food_and_drinks/kitchen_machinery/smartfridge.dm
+2 -5
View File
@@ -55,9 +55,6 @@
if(default_deconstruction_screwdriver(user, "smartfridge_open", "smartfridge", O))
return
if(exchange_parts(user, O))
return
if(default_pry_open(O))
return
@@ -347,12 +344,12 @@
/obj/machinery/smartfridge/extract/accept_check(obj/item/O)
if(istype(O, /obj/item/slime_extract))
return TRUE
if(istype(O, /obj/item/device/slime_scanner))
if(istype(O, /obj/item/slime_scanner))
return TRUE
return FALSE
/obj/machinery/smartfridge/extract/preloaded
initial_contents = list(/obj/item/device/slime_scanner = 2)
initial_contents = list(/obj/item/slime_scanner = 2)
// -----------------------------
// Chemistry Medical Smartfridge
code/modules/food_and_drinks/recipes/drinks_recipes.dm
+1 -1
View File
@@ -139,7 +139,7 @@
required_reagents = list("tequila" = 2, "kahlua" = 1)
/datum/chemical_reaction/tequila_sunrise
name = "tequila Sunrise"
name = "Tequila Sunrise"
id = "tequilasunrise"
results = list("tequilasunrise" = 3)
required_reagents = list("tequila" = 2, "orangejuice" = 1)