cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-08-22 03:27:05 +01:00
Code Issues Packages Projects Releases Wiki Activity

sync

Browse Source
This commit is contained in:
Chakirski
2016-07-08 15:33:26 -05:00
parent 3a3f7e7218
commit 3700a7ff8b
5 changed files with 19 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/food/recipes_grill.dm
+3 -2
View File
@@ -3,7 +3,8 @@
/datum/recipe/grill/bacon
items = list(
/obj/item/weapon/reagent_containers/food/snacks/raw_bacon,
/obj/item/weapon/reagent_containers/food/snacks/cutlet,
/obj/item/weapon/reagent_containers/food/snacks/cutlet
)
result = /obj/item/weapon/reagent_containers/food/snacks/bacon
@@ -91,7 +92,7 @@
/datum/recipe/grill/cutlet
items = list(
/obj/item/weapon/reagent_containers/food/snacks/sliceable/rawcutlet
/obj/item/weapon/reagent_containers/food/snacks/rawcutlet
)
result = /obj/item/weapon/reagent_containers/food/snacks/cutlet
code/modules/mob/living/carbon/human/interactive/functions.dm
+2 -10
View File
@@ -442,7 +442,7 @@
var/static/list/customableTypes = list(/obj/item/weapon/reagent_containers/food/snacks/customizable,/obj/item/weapon/reagent_containers/food/snacks/breadslice,/obj/item/weapon/reagent_containers/food/snacks/bun,/obj/item/weapon/reagent_containers/food/snacks/sliceable/flatdough,/obj/item/weapon/reagent_containers/food/snacks/boiledspagetti,/obj/item/trash/plate,/obj/item/trash/bowl)
var/static/list/rawtypes = list(/obj/item/weapon/reagent_containers/food/snacks/grown, /obj/item/weapon/reagent_containers/food/snacks/sliceable/rawcutlet, /obj/item/weapon/reagent_containers/food/snacks/rawmeatball, /obj/item/weapon/reagent_containers/food/snacks/rawsticks, /obj/item/weapon/reagent_containers/food/snacks/salmonmeat, /obj/item/weapon/reagent_containers/food/snacks/carpmeat, /obj/item/weapon/reagent_containers/food/snacks/catfishmeat, /obj/item/weapon/reagent_containers/food/snacks/spagetti, /obj/item/weapon/reagent_containers/food/snacks/dough_ball, /obj/item/weapon/reagent_containers/food/snacks/sliceable/flatdough, /obj/item/weapon/reagent_containers/food/snacks/doughslice, /obj/item/weapon/reagent_containers/food/snacks/meat, /obj/item/weapon/reagent_containers/food/snacks/boiledrice, /obj/item/weapon/reagent_containers/food/snacks/cheesewedge, /obj/item/weapon/reagent_containers/food/snacks/raw_bacon)
var/static/list/rawtypes = list(/obj/item/weapon/reagent_containers/food/snacks/grown, /obj/item/weapon/reagent_containers/food/snacks/rawcutlet, /obj/item/weapon/reagent_containers/food/snacks/rawmeatball, /obj/item/weapon/reagent_containers/food/snacks/rawsticks, /obj/item/weapon/reagent_containers/food/snacks/salmonmeat, /obj/item/weapon/reagent_containers/food/snacks/carpmeat, /obj/item/weapon/reagent_containers/food/snacks/catfishmeat, /obj/item/weapon/reagent_containers/food/snacks/spagetti, /obj/item/weapon/reagent_containers/food/snacks/dough_ball, /obj/item/weapon/reagent_containers/food/snacks/sliceable/flatdough, /obj/item/weapon/reagent_containers/food/snacks/doughslice, /obj/item/weapon/reagent_containers/food/snacks/meat, /obj/item/weapon/reagent_containers/food/snacks/boiledrice, /obj/item/weapon/reagent_containers/food/snacks/cheesewedge)
try
var/list/allContents = getAllContents()
@@ -514,11 +514,10 @@
// Process tool-based ingredients
var/obj/item/weapon/reagent_containers/food/snacks/dough/D = locate() in rangeCheck
var/obj/item/weapon/reagent_containers/food/snacks/sliceable/flatdough/FD = locate() in rangeCheck
var/obj/item/weapon/reagent_containers/food/snacks/sliceable/rawcutlet/RC = locate() in rangeCheck
var/obj/item/weapon/reagent_containers/food/snacks/rawcutlet/RC = locate() in rangeCheck
var/obj/item/weapon/reagent_containers/food/snacks/sliceable/cheesewheel/CW = locate() in rangeCheck
var/obj/item/weapon/reagent_containers/food/snacks/grown/potato/PO = locate() in rangeCheck
var/obj/item/weapon/reagent_containers/food/snacks/meat/ME = locate() in rangeCheck
var/obj/item/weapon/reagent_containers/food/snacks/raw_bacon/RB = locate() in rangeCheck
if(D)
TARGET = D
@@ -562,13 +561,6 @@
sleep(get_dist(src, ME))
ME.attackby(KK, src)
foundCookable = 1
else if(RB)
TARGET = RB
if(prob(50))
tryWalk(get_turf(RB))
sleep(get_dist(src, RB))
RB.attackby(KK, src)
foundCookable = 1
// refresh
allContents = getAllContents()
code/modules/reagents/reagent_containers/food/snacks.dm
+10 -26
View File
@@ -1578,15 +1578,6 @@
reagents.add_reagent("tomatojuice", 2)
bitesize = 5
/obj/item/weapon/reagent_containers/food/snacks/raw_bacon
name = "raw bacon"
desc = "It's fleshy and pink!"
icon_state = "raw_bacon"
bitesize = 2
New()
..()
reagents.add_reagent("nutriment", 1)
reagents.add_reagent("porktonium", 10)
/obj/item/weapon/reagent_containers/food/snacks/bacon
name = "bacon"
@@ -2708,23 +2699,6 @@
..()
reagents.add_reagent("nutriment", 1)
/obj/item/weapon/reagent_containers/food/snacks/sliceable/rawcutlet
name = "raw cutlet"
desc = "A thin piece of raw meat."
icon = 'icons/obj/food/food_ingredients.dmi'
icon_state = "rawcutlet"
bitesize = 1
New()
..()
reagents.add_reagent("protein", 1)
attackby(obj/item/weapon/W as obj, mob/user as mob, params)
if(istype(W,/obj/item/weapon/kitchen/knife))
user.visible_message( \
"[user] cuts the raw cutlet with the knife!", \
"<span class ='notice'>You cut the raw cutlet with your knife!</span>" \
)
new /obj/item/weapon/reagent_containers/food/snacks/raw_bacon(src.loc)
qdel(src)
/////////////////////////////////////////////////PIZZA////////////////////////////////////////
@@ -3307,6 +3281,16 @@
..()
reagents.add_reagent("nutriment", 7)
/obj/item/weapon/reagent_containers/food/snacks/rawcutlet
name = "raw cutlet"
desc = "A thin piece of raw meat."
icon = 'icons/obj/food/food_ingredients.dmi'
icon_state = "rawcutlet"
bitesize = 1
New()
..()
reagents.add_reagent("protein", 1)
/obj/item/weapon/reagent_containers/food/snacks/cutlet
name = "cutlet"
desc = "A tasty meat slice."
code/modules/reagents/reagent_containers/food/snacks/meat.dm
+4 -4
View File
@@ -14,9 +14,9 @@
istype(W, /obj/item/weapon/kitchen/knife) || \
istype(W, /obj/item/weapon/scalpel) \
)
new /obj/item/weapon/reagent_containers/food/snacks/sliceable/rawcutlet(src)
new /obj/item/weapon/reagent_containers/food/snacks/sliceable/rawcutlet(src)
new /obj/item/weapon/reagent_containers/food/snacks/sliceable/rawcutlet(src)
new /obj/item/weapon/reagent_containers/food/snacks/rawcutlet(src)
new /obj/item/weapon/reagent_containers/food/snacks/rawcutlet(src)
new /obj/item/weapon/reagent_containers/food/snacks/rawcutlet(src)
to_chat(user, "You cut the meat in thin strips.")
qdel(src)
else
@@ -51,4 +51,4 @@
desc = "Taste like bacon."
New()
..()
reagents.add_reagent("porktonium", 10)
reagents.add_reagent("porktonium", 10)
icons/obj/food/food.dmi
BIN
View File
Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 121 KiB

After

Width:  |  Height:  |  Size: 121 KiB