cyberpresidentvanellope/VOREStation
1
0
Fork 0
mirror of https://github.com/VOREStation/VOREStation.git synced 2026-07-10 22:55:22 +01:00
Code Issues Packages Projects Releases Wiki Activity

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@350 316c924e-a436-60f5-8080-3fe189b3f50e

Browse Source
This commit is contained in:
morikou@gmail.com
2010-10-24 04:01:18 +00:00
parent 94d83d41c7
commit d88a396ff5
6 changed files with 4429 additions and 4215 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/WorkInProgress/Chemistry-Tools.dm
+85 -1
View File
@@ -1340,7 +1340,11 @@
R.add_reagent("spaceacillin", 15)
update_icon()
//Snacks
//////////////////////////////////////////////////
////////////////////////////////////////////Snacks
//////////////////////////////////////////////////
/obj/item/weapon/reagent_containers/food/snacks/candy
name = "candy"
desc = "Man, that shit looks good. I bet it's got nougat. Fuck."
@@ -1638,6 +1642,86 @@
R.my_atom = src
R.add_reagent("milk", 50)
/obj/item/weapon/reagent_containers/food/snacks/ketchup
name = "Ketchup"
desc = "You feel more American already."
icon_state = "ketchup"
amount = 1
/obj/item/weapon/reagent_containers/food/snacks/hotsauce
name = "Hotsauce"
desc = "You can almost TASTE the stomach ulcers now!"
icon_state = "hotsauce"
amount = 1
// Work in Process by Darem. Sorry for the mess.
/obj/item/weapon/reagent_containers/food/snacks/grown/berryjam
name = "Berry Jam"
desc = "A delightfully sweat flavor of some indescernible berry... you think."
icon_state = "berryjam"
amount = 1
/obj/item/weapon/reagent_containers/food/snacks/eggplantparm
name = "Eggplant Parmigiana"
desc = "The only good recipe for eggplant."
icon_state = "eggplantparm"
amount = 5
heal_amt = 2
/obj/item/weapon/reagent_containers/food/snacks/jellydonut
name = "Jelly Donut"
desc = "Oh so gooey on the inside."
icon_state = "donut1" //Placeholder until I stop being lazy. ie. Never. -- Darem
heal_amt = 2
New()
..()
if(rand(1,3) == 1)
src.icon_state = "donut2"
src.name = "Frosted Jelly Donut"
src.heal_amt = 3
heal(var/mob/M)
if(istype(M, /mob/living/carbon/human) && M.job in list("Security Officer", "Head of Security", "Detective"))
src.heal_amt *= 2
..()
src.heal_amt /= 2
/obj/item/weapon/reagent_containers/food/snacks/soylentgreen
name = "Soylent Green"
desc = "Not made of people. Honest." //Totally people.
icon_state = "soylent"
amount = 5
heal_amt = 1
/obj/item/weapon/reagent_containers/food/snacks/soysauce
name = "Soy Sauce"
desc = "A salty soy-based flavoring."
icon_state = "soysauce"
amount = 1
/obj/item/weapon/reagent_containers/food/snacks/soylenviridians
name = "Soylen Virdians"
desc = "Not made of people. Honest." //Actually honest for once.
icon_state = "soylent"
amount = 5
heal_amt = 1
/obj/item/weapon/reagent_containers/food/snacks/coldsauce
name = "Coldsauce"
desc = "Leaves the tongue numb in it's passage."
icon_state = "coldsauce"
amount = 1
/obj/item/weapon/reagent_containers/food/snacks/carrotcake
name = "Carrot Cake"
desc = "A favorite desert of a certain wascally wabbit. Also not a lie."
icon_state = "carrotcake"
amount = 5
heal_amt = 2
//End new stuff by Darem
///////////////////////////////////////////////Alchohol bottles! -Agouri //////////////////////////
/obj/item/weapon/reagent_containers/food/drinks/gin
code/defines/obj/machinery.dm
+6 -1
View File
@@ -655,6 +655,11 @@
var/humanmeat_amount = 0
var/donkpocket_amount = 0
var/xenomeat_amount = 0
var/hotsauce_amount = 0
var/coldsauce_amount = 0
var/soysauce_amount = 0
var/ketchup_amount = 0
var/sauce_amount = 0 //This is so that I can lump all the sauces together in the microwave menu.
var/humanmeat_name = ""
var/humanmeat_job = ""
var/operating = 0 // Is it on?
@@ -662,7 +667,7 @@
var/broken = 0 // How broken is it???
var/list/available_recipes = list() // List of the recipes you can use
var/obj/item/weapon/reagent_containers/food/snacks/being_cooked = null // The item being cooked
var/obj/item/extra_item // One non food item that can be added
var/obj/item/extra_item = null// One non food item that can be added
/obj/machinery/processor
name = "Food Processor"
code/game/machinery/microwave.dm
+99 -9
View File
@@ -7,9 +7,20 @@
var/xenomeat_amount = 0
var/humanmeat_amount = 0
var/donkpocket_amount = 0
var/hotsauce_amount = 0
var/coldsauce_amount = 0
var/soysauce_amount = 0
var/ketchup_amount = 0
var/sauce_amount = 0 //This is so that I can lump all the sauces together in the microwave menu rather then clutter it up.
var/obj/extra_item = null // This is if an extra item is needed, eg a butte for an assburger
var/creates = "" // The item that is spawned when the recipe is made
/datum/recipe/jellydonut
egg_amount = 1
flour_amount = 1
extra_item = /obj/item/weapon/reagent_containers/food/snacks/grown/berryjam
creates = "/obj/item/weapon/reagent_containers/food/snacks/jellydonut"
/datum/recipe/donut
egg_amount = 1
flour_amount = 1
@@ -89,9 +100,25 @@
extra_item = /obj/item/weapon/reagent_containers/food/drinks/milk
creates = "/obj/item/weapon/reagent_containers/food/snacks/muffin"
/datum/recipe/eggplantparm // Doesn't work EXACTLY right. The recipe works but it also works if you don't put in any cheese at all.
cheese_amount = 2 // I'm not sure why this is the case. -- Darem
extra_item = /obj/item/weapon/reagent_containers/food/snacks/grown/eggplant
creates = "/obj/item/weapon/reagent_containers/food/snacks/eggplantparm"
/obj/machinery/microwave/New() // *** After making the recipe in defines\obj\food.dmi, add it in here! ***
/datum/recipe/soylenviridians
flour_amount = 3
extra_item = /obj/item/weapon/reagent_containers/food/snacks/grown/soybeans
creates = "/obj/item/weapon/reagent_containers/food/snacks/soylenviridians"
/datum/recipe/carrotcake
flour_amount = 3
extra_item = /obj/item/weapon/reagent_containers/food/snacks/grown/carrot
creates = "/obj/item/weapon/reagent_containers/food/snacks/carrotcake"
/obj/machinery/microwave/New() // *** After making the recipe above, add it in here! ***
..()
src.available_recipes += new /datum/recipe/jellydonut(src)
src.available_recipes += new /datum/recipe/donut(src)
src.available_recipes += new /datum/recipe/monkeyburger(src)
src.available_recipes += new /datum/recipe/humanburger(src)
@@ -107,6 +134,9 @@
src.available_recipes += new /datum/recipe/meatbreadhuman(src)
src.available_recipes += new /datum/recipe/omelette (src)
src.available_recipes += new /datum/recipe/muffin (src)
src.available_recipes += new /datum/recipe/eggplantparm(src)
src.available_recipes += new /datum/recipe/soylenviridians(src)
src.available_recipes += new /datum/recipe/carrotcake(src)
/*******************
@@ -143,36 +173,42 @@ obj/machinery/microwave/attackby(var/obj/item/O as obj, var/mob/user as mob)
src.icon_state = "mw"
else //Otherwise bad luck!!
return
else if(istype(O, /obj/item/weapon/reagent_containers/food/snacks/egg)) // If an egg is used, add it
if(src.egg_amount < 5)
for(var/mob/V in viewers(src, null))
V.show_message(text("\blue [user] adds an egg to the microwave."))
src.egg_amount++
del(O)
else if(istype(O, /obj/item/weapon/reagent_containers/food/snacks/flour)) // If flour is used, add it
if(src.flour_amount < 5)
for(var/mob/V in viewers(src, null))
V.show_message(text("\blue [user] adds some flour to the microwave."))
src.flour_amount++
del(O)
else if(istype(O, /obj/item/weapon/reagent_containers/food/snacks/cheesewedge)) // If cheese is used, add it
if(src.cheese_amount < 5)
for(var/mob/V in viewers(src, null))
V.show_message(text("\blue [user] adds some cheese to the microwave."))
src.cheese_amount++
del(O)
else if(istype(O, /obj/item/weapon/reagent_containers/food/snacks/monkeymeat))
if(src.monkeymeat_amount < 5)
for(var/mob/V in viewers(src, null))
V.show_message(text("\blue [user] adds some meat to the microwave."))
src.monkeymeat_amount++
del(O)
else if(istype(O, /obj/item/weapon/reagent_containers/food/snacks/xenomeat))
if(src.xenomeat_amount < 5)
for(var/mob/V in viewers(src, null))
V.show_message(text("\blue [user] adds some meat to the microwave."))
src.xenomeat_amount++
del(O)
else if(istype(O, /obj/item/weapon/reagent_containers/food/snacks/humanmeat))
if(src.humanmeat_amount < 5)
for(var/mob/V in viewers(src, null))
@@ -181,12 +217,46 @@ obj/machinery/microwave/attackby(var/obj/item/O as obj, var/mob/user as mob)
src.humanmeat_job = O:subjectjob
src.humanmeat_amount++
del(O)
else if(istype(O, /obj/item/weapon/reagent_containers/food/snacks/donkpocket))
if(src.donkpocket_amount < 2)
for(var/mob/V in viewers(src, null))
V.show_message(text("\blue [user] adds a donk-pocket to the microwave."))
src.donkpocket_amount++
del(O)
else if(istype(O, /obj/item/weapon/reagent_containers/food/snacks/hotsauce))
if(src.hotsauce_amount < 5)
for(var/mob/V in viewers(src, null))
V.show_message(text("\blue [user] adds some meat to the microwave."))
src.hotsauce_amount++
src.sauce_amount++
del(O)
else if(istype(O, /obj/item/weapon/reagent_containers/food/snacks/coldsauce))
if(src.coldsauce_amount < 5)
for(var/mob/V in viewers(src, null))
V.show_message(text("\blue [user] adds some coldsauce to the microwave."))
src.coldsauce_amount++
src.sauce_amount++
del(O)
else if(istype(O, /obj/item/weapon/reagent_containers/food/snacks/soysauce))
if(src.soysauce_amount < 5)
for(var/mob/V in viewers(src, null))
V.show_message(text("\blue [user] adds some soysauce to the microwave."))
src.soysauce_amount++
src.sauce_amount++
del(O)
else if(istype(O, /obj/item/weapon/reagent_containers/food/snacks/ketchup))
if(src.ketchup_amount < 5)
for(var/mob/V in viewers(src, null))
V.show_message(text("\blue [user] adds some ketchup to the microwave."))
src.ketchup_amount++
src.sauce_amount++
del(O)
else
if(!istype(extra_item, /obj/item)) //Allow one non food item to be added!
user.u_equip(O)
@@ -235,6 +305,7 @@ Please clean it before use!</TT><BR>
<B>Cheese:</B>[src.cheese_amount] cheese wedges<BR>
<B>Monkey Meat:</B>[src.monkeymeat_amount] slabs of meat<BR>
<B>Meat Turnovers:</B>[src.donkpocket_amount] turnovers<BR>
<B>Various Sauces:</B>[src.sauce_amount] servings.<BR>
<B>Other Meat:</B>[src.humanmeat_amount] slabs of meat<BR>
[xenodisplay]
<HR>
@@ -265,13 +336,13 @@ Please clean it before use!</TT><BR>
var/operation = text2num(href_list["cook"])
var/cook_time = 200 // The time to wait before spawning the item
var/cooked_item = ""
var/cooked_item = null
if(operation == 1) // If cook was pressed
for(var/mob/V in viewers(src, null))
V.show_message(text("\blue The microwave turns on."))
for(var/datum/recipe/R in src.available_recipes) //Look through the recipe list we made above
if(src.egg_amount == R.egg_amount && src.flour_amount == R.flour_amount && src.monkeymeat_amount == R.monkeymeat_amount && src.humanmeat_amount == R.humanmeat_amount && src.donkpocket_amount == R.donkpocket_amount && src.xenomeat_amount == R.xenomeat_amount) // Check if it's an accepted recipe
if(src.egg_amount == R.egg_amount && src.flour_amount == R.flour_amount && src.monkeymeat_amount == R.monkeymeat_amount && src.humanmeat_amount == R.humanmeat_amount && src.donkpocket_amount == R.donkpocket_amount && src.xenomeat_amount == R.xenomeat_amount && src.hotsauce_amount == R.hotsauce_amount && src.coldsauce_amount == R.coldsauce_amount && src.soysauce_amount == R.soysauce_amount && src.ketchup_amount == R.ketchup_amount) // Check if it's an accepted recipe
var/thing
if(src.extra_item)
if (src.extra_item.type == R.extra_item) thing = 1
@@ -284,11 +355,18 @@ Please clean it before use!</TT><BR>
src.monkeymeat_amount = 0
src.humanmeat_amount = 0
src.donkpocket_amount = 0
src.hotsauce_amount = 0
src.coldsauce_amount = 0
src.soysauce_amount = 0
src.ketchup_amount = 0
src.sauce_amount = 0
src.extra_item = null // And the extra item
cooked_item = R.creates // Store the item that will be created
if(cooked_item == "") //Oops that wasn't a recipe dummy!!!
if(src.egg_amount > 0 || src.flour_amount > 0 || src.water_amount > 0 || src.monkeymeat_amount > 0 || src.humanmeat_amount > 0 || src.donkpocket_amount > 0 && src.extra_item == null) //Make sure there's something inside though to dirty it
if(cooked_item == null) //Oops that wasn't a recipe dummy!!!
if(src.egg_amount > 0 || src.flour_amount > 0 || src.water_amount > 0 || src.monkeymeat_amount > 0 || src.humanmeat_amount > 0 || src.donkpocket_amount > 0 || src.hotsauce_amount > 0 ||src.coldsauce_amount > 0 || src.soysauce_amount > 0 || src.ketchup_amount > 0 && src.extra_item == null) //Make sure there's something inside though to dirty it
src.operating = 1 // Turn it on
src.icon_state = "mw1"
src.updateUsrDialog()
@@ -300,6 +378,11 @@ Please clean it before use!</TT><BR>
src.humanmeat_amount = 0
src.monkeymeat_amount = 0
src.donkpocket_amount = 0
src.hotsauce_amount = 0
src.coldsauce_amount = 0
src.soysauce_amount = 0
src.ketchup_amount = 0
src.sauce_amount = 0
sleep(40) // Half way through
playsound(src.loc, 'splat.ogg', 50, 1) // Play a splat sound
icon_state = "mwbloody1" // Make it look dirty!!
@@ -325,6 +408,11 @@ Please clean it before use!</TT><BR>
src.humanmeat_amount = 0
src.monkeymeat_amount = 0
src.donkpocket_amount = 0
src.hotsauce_amount = 0
src.coldsauce_amount = 0
src.soysauce_amount = 0
src.ketchup_amount = 0
src.sauce_amount = 0
sleep(60) // Wait a while
var/datum/effects/system/spark_spread/s = new /datum/effects/system/spark_spread
s.set_up(2, 1, src)
@@ -355,20 +443,22 @@ Please clean it before use!</TT><BR>
src.humanmeat_amount = 0
src.monkeymeat_amount = 0
src.donkpocket_amount = 0
src.hotsauce_amount = 0
src.coldsauce_amount = 0
src.soysauce_amount = 0
src.ketchup_amount = 0
src.sauce_amount = 0
if(src.extra_item != null)
src.extra_item.loc = get_turf(src) // Eject the extra item so important shit like the disk can't be destroyed in there
src.extra_item = null
usr << "You dispose of the microwave contents."
var/cooking = text2path(cooked_item) // Get the item that needs to be spanwed
var/cooking = cooked_item // Get the item that needs to be spanwed
if(!isnull(cooking))
for(var/mob/V in viewers(src, null))
V.show_message(text("\blue The microwave begins cooking something!"))
src.operating = 1 // Turn it on so it can't be used again while it's cooking
src.icon_state = "mw1" //Make it look on too
src.updateUsrDialog()
src.being_cooked = new cooking(src)
spawn(cook_time) //After the cooking time
if(!isnull(src.being_cooked))
playsound(src.loc, 'ding.ogg', 50, 1)
code/game/machinery/processor.dm
+46 -12
View File
@@ -3,7 +3,7 @@ obj/machinery/processor/attackby(var/obj/item/O as obj, var/mob/user as mob)
user << "Something is already in the processing chamber."
return 0
else
if(istype(O, /obj/item/weapon/reagent_containers/food/snacks/grown/wheat) || istype(O, /obj/item/weapon/reagent_containers/food/snacks/grown/chili) || istype(O, /obj/item/weapon/reagent_containers/food/snacks/grown/tomato) || istype(O, /obj/item/weapon/reagent_containers/food/drinks/milk))
if(istype(O, /obj/item/weapon/reagent_containers/food/snacks/grown/wheat) || istype(O, /obj/item/weapon/reagent_containers/food/snacks/grown/chili) || istype(O, /obj/item/weapon/reagent_containers/food/snacks/grown/tomato) || istype(O, /obj/item/weapon/reagent_containers/food/drinks/milk) || istype(O, /obj/item/weapon/reagent_containers/food/snacks/grown/berries) || istype(O, /obj/item/weapon/reagent_containers/food/snacks/humanmeat) || istype(O, /obj/item/weapon/reagent_containers/food/snacks/grown/soybeans) || istype(O, /obj/item/weapon/reagent_containers/food/snacks/grown/icepepper))
user.drop_item()
O.loc = src
else if(istype(O,/obj/item/weapon/grab))
@@ -62,6 +62,51 @@ obj/machinery/processor/attackby(var/obj/item/O as obj, var/mob/user as mob)
new /obj/item/weapon/reagent_containers/food/snacks/ketchup(src.loc)
src.processing = 0
return
if(istype(O, /obj/item/weapon/reagent_containers/food/snacks/grown/berries))
src.processing = 1
sleep(40)
playsound(src.loc, 'blender.ogg', 50, 1)
for(var/mob/V in viewers(src, null))
V.show_message(text("\blue [user] turns on \a [src]."))
del(O)
new /obj/item/weapon/reagent_containers/food/snacks/grown/berryjam(src.loc)
src.processing = 0
return
if (istype(O, /obj/item/weapon/reagent_containers/food/snacks/humanmeat))
src.processing = 1
sleep(40)
playsound(src.loc, 'blender.ogg', 50, 1)
for(var/mob/V in viewers(src, null))
V.show_message(text("\blue [user] turns on \a [src]."))
del(O)
new /obj/item/weapon/reagent_containers/food/snacks/soylentgreen(src.loc)
processing = 0
return
if (istype(O, /obj/item/weapon/reagent_containers/food/snacks/grown/soybeans))
src.processing = 1
sleep(40)
playsound(src.loc, 'blender.ogg', 50, 1)
for(var/mob/V in viewers(src, null))
V.show_message(text("\blue [user] turns on \a [src]."))
del(O)
new /obj/item/weapon/reagent_containers/food/snacks/soysauce(src.loc)
src.processing = 0
return
if (istype(O, /obj/item/weapon/reagent_containers/food/snacks/grown/icepepper))
src.processing = 1
sleep(40)
playsound(src.loc, 'blender.ogg', 50, 1)
for(var/mob/V in viewers(src, null))
V.show_message(text("\blue [user] turns on \a [src]."))
del(O)
new /obj/item/weapon/reagent_containers/food/snacks/coldsauce(src.loc)
src.processing = 0
return
for(var/mob/O in src.contents)
if(istype(O, /mob/living/carbon/alien/larva/metroid))
src.processing = 1
@@ -112,14 +157,3 @@ obj/machinery/processor/attackby(var/obj/item/O as obj, var/mob/user as mob)
*/
/obj/item/weapon/reagent_containers/food/snacks/ketchup
name = "ketchup"
desc = "You feel more American already."
icon_state = "ketchup"
amount = 1
/obj/item/weapon/reagent_containers/food/snacks/hotsauce
name = "hotsauce"
desc = "You can almost TASTE the stomach ulcers now!"
icon_state = "hotsauce"
amount = 1
icons/obj/food.dmi
BIN
View File
Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 46 KiB

After

Width:  |  Height:  |  Size: 48 KiB

maps/trunkmap.dmm
+4193 -4192
View File
File diff suppressed because it is too large Load Diff