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

Misc Updates:

Browse Source 
- Silly error in medical code. Now ointment will actually heal fire damage properly.
- Removed fork from the kitchen since all it does is stab you in the face when you try to eat with it.
- New Reagent: Sodium
- Table Salt renamed "Sodium Chloride" for SCIENCE! You can make it by mixing sodium and chlorine.
- Some reagents rearranged in reagents file.
Food Overhaul Phase 2:
- You can now add condiments from condiment containers to food! You may also inject (but not remove) substances into food 

with a syringe.
- Bitesize variable redone. Now bites eat half the remaining contents of the food to a minimum of 1 or the bitesize. 

Otherwise, it'd be REALLY obvious when you've doctored food.
- New Items: Salt Shaker, Pepper Mill (both used to season food). (Sprites by Deuryn) Both added to cafe.
- Bug (possibly) of alcohol not metabolizing properly (possibly) fixed.
- New snacks and beverages! Icons courtesy of Deuryn.
- Cola Vending Machines and Water Cooler added (icons also courtesy of Deuryn). Also check snack vendors for new items.

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@469 316c924e-a436-60f5-8080-3fe189b3f50e
This commit is contained in:
morikou@gmail.com
2010-11-20 23:51:03 +00:00
parent 783d8e14d7
commit a6b980664a
12 changed files with 5248 additions and 4848 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/WorkInProgress/Chemistry-Reagents.dm
+161 -56
View File
@@ -150,33 +150,6 @@ datum
return
milk
name = "Milk"
id = "milk"
description = "An opaque white liquid produced by the mammary glands of mammals."
reagent_state = LIQUID
on_mob_life(var/mob/M)
if(!M) M = holder.my_atom
if(M:bruteloss && prob(10)) M:bruteloss--
beer
name = "Beer"
id = "beer"
description = "An alcoholic beverage made from malted grains, hops, yeast, and water."
reagent_state = LIQUID
on_mob_life(var/mob/M)
if(!data) data = 1
data++
M.make_dizzy(3)
M:jitteriness = max(M:jitteriness-3,0)
if(data >= 25)
if (!M:stuttering) M:stuttering = 1
M:stuttering += 3
if(data >= 40 && prob(33))
if (!M:confused) M:confused = 1
M:confused += 2
..()
water
name = "Water"
id = "water"
@@ -432,6 +405,12 @@ datum
..()
return
sodium
name = "Sodium"
id = "sodium"
description = "A chemical element."
reagent_state = SOLID
phosphorus
name = "Phosphorus"
id = "phosphorus"
@@ -671,19 +650,6 @@ datum
T.assume_air(napalm)
return
coffee
name = "Coffee"
id = "coffee"
description = "Coffee is a brewed drink prepared from roasted seeds, commonly called coffee beans, of the coffee plant."
reagent_state = LIQUID
on_mob_life(var/mob/M)
..()
M.dizziness = max(0,M.dizziness-5)
M:drowsyness = max(0,M:drowsyness-3)
M:sleeping = 0
M.bodytemperature = min(310, M.bodytemperature+5) //310 is the normal bodytemp. 310.055
M.make_jittery(5)
space_cleaner
name = "Space cleaner"
id = "cleaner"
@@ -753,17 +719,6 @@ datum
//M.make_dizzy(1) doesn't seem to do anything
space_cola
name = "Cola"
id = "cola"
description = "A refreshing beverage."
reagent_state = LIQUID
on_mob_life(var/mob/M)
M:drowsyness = max(0,M:drowsyness-5)
M.bodytemperature = max(310, M.bodytemperature-5) //310 is the normal bodytemp. 310.055
..()
return
plasma
name = "Plasma"
id = "plasma"
@@ -1052,6 +1007,7 @@ datum
if (!M:confused) M:confused = 1
M:confused += 3
..()
return
ammonia
name = "Ammonia"
@@ -1077,6 +1033,7 @@ datum
M:stuttering = 0
M:confused = 0
..()
return
/////////////////////////Food Reagents////////////////////////////
@@ -1140,9 +1097,9 @@ datum
..()
return
tablesalt
sodiumchloride
name = "Table Salt"
id = "tablesalt"
id = "sodiumchloride"
description = "A salt made of sodium chloride. Commonly used to season food."
reagent_state = SOLID
@@ -1189,8 +1146,119 @@ datum
/////////////////////////////////////////////////////////////////////////////////////////////////////////
/////////////////////// ALCHOHOLIC DRINKS BELOW, Beer is up there though, along with cola. Cap'n Pete's Cuban Spiced Rum////////////////////////////////
/////////////////////// DRINKS BELOW, Beer is up there though, along with cola. Cap'n Pete's Cuban Spiced Rum////////////////////////////////
/////////////////////////////////////////////////////////////////////////////////////////////////////////
milk
name = "Milk"
id = "milk"
description = "An opaque white liquid produced by the mammary glands of mammals."
reagent_state = LIQUID
on_mob_life(var/mob/M)
if(!M) M = holder.my_atom
if(M:bruteloss && prob(10)) M:bruteloss--
..()
return
coffee
name = "Coffee"
id = "coffee"
description = "Coffee is a brewed drink prepared from roasted seeds, commonly called coffee beans, of the coffee plant."
reagent_state = LIQUID
on_mob_life(var/mob/M)
..()
M.dizziness = max(0,M.dizziness-5)
M:drowsyness = max(0,M:drowsyness-3)
M:sleeping = 0
M.bodytemperature = min(310, M.bodytemperature+5) //310 is the normal bodytemp. 310.055
M.make_jittery(5)
..()
return
space_cola
name = "Cola"
id = "cola"
description = "A refreshing beverage."
reagent_state = LIQUID
on_mob_life(var/mob/M)
M:drowsyness = max(0,M:drowsyness-5)
M.bodytemperature = max(310, M.bodytemperature-5) //310 is the normal bodytemp. 310.055
..()
return
spacemountainwind
name = "Space Mountain Wind"
id = "spacemountainwind"
description = "Blows right through you like a space wind."
reagent_state = LIQUID
on_mob_life(var/mob/M)
M:drowsyness = max(0,M:drowsyness-7)
M:sleeping = 0
M.bodytemperature = max(310, M.bodytemperature-5)
M.make_jittery(5)
..()
return
thirteenloko
name = "Thirteen Loko"
id = "thirteenloko"
description = "A potent mixture of caffeine and alcohol."
reagent_state = LIQUID
on_mob_life(var/mob/M)
M:drowsyness = max(0,M:drowsyness-7)
M:sleeping = 0
M.bodytemperature = max(310, M.bodytemperature-5)
M.make_jittery(5)
if(!data) data = 1
data++
M.dizziness +=4
if(data >= 45 && data <115)
if (!M.stuttering) M.stuttering = 1
M.stuttering += 3
else if(data >= 125 && prob(33))
M.confused = max(M:confused+2,0)
..()
return
dr_gibb
name = "Dr. Gibb"
id = "dr_gibb"
description = "A delicious blend of 42 different flavours"
reagent_state = LIQUID
on_mob_life(var/mob/M)
M:drowsyness = max(0,M:drowsyness-6)
M.bodytemperature = max(310, M.bodytemperature-5) //310 is the normal bodytemp. 310.055
..()
return
space_up
name = "Space-Up"
id = "space_up"
description = "Tastes like a hull breach in your mouth."
reagent_state = LIQUID
on_mob_life(var/mob/M)
M.bodytemperature = max(310, M.bodytemperature-8) //310 is the normal bodytemp. 310.055
..()
return
beer
name = "Beer"
id = "beer"
description = "An alcoholic beverage made from malted grains, hops, yeast, and water."
reagent_state = LIQUID
on_mob_life(var/mob/M)
if(!data) data = 1
data++
M.make_dizzy(3)
M:jitteriness = max(M:jitteriness-3,0)
if(data >= 25)
if (!M:stuttering) M:stuttering = 1
M:stuttering += 3
if(data >= 40 && prob(33))
if (!M:confused) M:confused = 1
M:confused += 2
..()
return
whiskey
name = "Whiskey"
@@ -1207,6 +1275,7 @@ datum
else if(data >= 125 && prob(33))
M.confused = max(M:confused+2,0)
..()
return
specialwhiskey
name = "Special Blend Whiskey"
@@ -1223,6 +1292,7 @@ datum
else if(data >= 125 && prob(33))
M.confused = max(M:confused+2,0)
..()
return
gin
@@ -1240,6 +1310,7 @@ datum
else if(data >= 125 && prob(33))
M.confused = max(M:confused+2,0)
..()
return
rum
name = "Rum"
@@ -1256,6 +1327,7 @@ datum
else if(data >= 125 && prob(33))
M.confused = max(M:confused+2,0)
..()
return
vodka
name = "Vodka"
@@ -1272,6 +1344,7 @@ datum
else if(data >= 125 && prob(33))
M.confused = max(M:confused+2,0)
..()
return
tequilla
name = "Tequila"
@@ -1288,6 +1361,7 @@ datum
else if(data >= 125 && prob(33))
M.confused = max(M:confused+2,0)
..()
return
vermouth
name = "Vermouth"
@@ -1304,6 +1378,8 @@ datum
else if(data >= 125 && prob(33))
M.confused = max(M:confused+2,0)
..()
return
wine
name = "Wine"
id = "wine"
@@ -1319,6 +1395,7 @@ datum
else if(data >= 145 && prob(33))
M.confused = max(M:confused+2,0)
..()
return
tonic
name = "Tonic Water"
@@ -1326,11 +1403,12 @@ datum
description = "It tastes strange but at least the quinine keeps the Space Malaria at bay."
reagent_state = LIQUID
on_mob_life(var/mob/M)
..()
M.dizziness = max(0,M.dizziness-5)
M:drowsyness = max(0,M:drowsyness-3)
M:sleeping = 0
M.bodytemperature = min(310, M.bodytemperature-5)
..()
return
orangejuice
name = "Orange juice"
@@ -1404,6 +1482,7 @@ datum
else if(data >= 115 && prob(33))
M.confused = max(M:confused+2,0)
..()
return
cream
name = "Cream"
@@ -1426,6 +1505,7 @@ datum
else if(data >= 90 && prob(33))
M.confused = max(M:confused+2,0)
..()
return
ale
name = "Ale"
@@ -1442,6 +1522,7 @@ datum
else if(data >= 125 && prob(33))
M.confused = max(M:confused+2,0)
..()
return
sodawater
name = "Soda Water"
@@ -1449,11 +1530,13 @@ datum
description = "A can of club soda. Why not make a scotch and soda?"
reagent_state = LIQUID
on_mob_life(var/mob/M)
..()
M.dizziness = max(0,M.dizziness-5)
M:drowsyness = max(0,M:drowsyness-3)
M:sleeping = 0
M.bodytemperature = min(310, M.bodytemperature-5)
..()
return
/////////////////////////////////////////////////////////////////cocktail entities//////////////////////////////////////////////
@@ -1472,6 +1555,7 @@ datum
else if(data >= 135 && prob(33))
M.confused = max(M:confused+2,0)
..()
return
cuba_libre
name = "Cuba Libre"
@@ -1488,6 +1572,7 @@ datum
else if(data >= 135 && prob(33))
M.confused = max(M:confused+2,0)
..()
return
whiskey_cola
name = "Whiskey Cola"
@@ -1504,6 +1589,7 @@ datum
else if(data >= 125 && prob(33))
M.confused = max(M:confused+2,0)
..()
return
martini
name = "Classic Martini"
@@ -1520,6 +1606,7 @@ datum
else if(data >= 135 && prob(33))
M.confused = max(M:confused+2,0)
..()
return
vodkamartini
name = "Vodka Martini"
@@ -1536,6 +1623,7 @@ datum
else if(data >= 135 && prob(33))
M.confused = max(M:confused+2,0)
..()
return
white_russian
name = "White Russian"
@@ -1552,6 +1640,7 @@ datum
else if(data >= 165 && prob(33))
M.confused = max(M:confused+2,0)
..()
return
screwdrivercocktail
name = "Screwdriver"
@@ -1568,6 +1657,7 @@ datum
else if(data >= 165 && prob(33))
M.confused = max(M:confused+2,0)
..()
return
bloody_mary
name = "Bloody Mary"
@@ -1584,6 +1674,8 @@ datum
else if(data >= 165 && prob(33))
M.confused = max(M:confused+2,0)
..()
return
gargle_blaster
name = "Pan-Galactic Gargle Blaster"
id = "gargleblaster"
@@ -1601,6 +1693,7 @@ datum
else if(data >=55)
M.druggy = max(M.druggy, 55)
..()
return
brave_bull
name = "Brave Bull"
@@ -1617,6 +1710,7 @@ datum
else if(data >= 145 && prob(33))
M.confused = max(M:confused+2,0)
..()
return
tequilla_sunrise
name = "Tequilla Sunrise"
@@ -1633,6 +1727,7 @@ datum
else if(data >= 165 && prob(33))
M.confused = max(M:confused+2,0)
..()
return
toxins_special
name = "Toxins Special"
@@ -1650,6 +1745,7 @@ datum
else if(data >= 165 && prob(33))
M.confused = max(M:confused+2,0)
..()
return
beepsky_smash
name = "Beepsky Smash"
@@ -1668,6 +1764,7 @@ datum
else if(data >= 165 && prob(33))
M.confused = max(M:confused+2,0)
..()
return
doctor_delight
name = "The Doctor's Delight"
@@ -1768,6 +1865,7 @@ datum
else if(data >= 90 && prob(33))
M.confused = max(M:confused+2,0)
..()
return
irishcoffee
name = "Irish Coffee"
@@ -1784,6 +1882,7 @@ datum
else if(data >= 150 && prob(33))
M.confused = max(M:confused+2,0)
..()
return
margarita
name = "Margarita"
@@ -1800,6 +1899,7 @@ datum
else if(data >= 150 && prob(33))
M.confused = max(M:confused+2,0)
..()
return
black_russian
name = "Black Russian"
@@ -1816,6 +1916,7 @@ datum
else if(data >= 115 && prob(33))
M.confused = max(M:confused+2,0)
..()
return
manhattan
name = "Manhattan"
@@ -1832,6 +1933,7 @@ datum
else if(data >= 115 && prob(33))
M.confused = max(M:confused+2,0)
..()
return
whiskeysoda
name = "Whiskey Soda"
@@ -1848,6 +1950,7 @@ datum
else if(data >= 115 && prob(33))
M.confused = max(M:confused+2,0)
..()
return
vodkatonic
name = "Vodka and Tonic"
@@ -1864,6 +1967,7 @@ datum
else if(data >= 115 && prob(33))
M.confused = max(M:confused+2,0)
..()
return
ginfizz
name = "Gin Fizz"
@@ -1880,3 +1984,4 @@ datum
else if(data >= 125 && prob(33))
M.confused = max(M:confused+2,0)
..()
return
code/WorkInProgress/Chemistry-Recipes.dm
+7
View File
@@ -220,6 +220,13 @@ datum
required_reagents = list("ethylredoxrazine" = 1, "ethanol" = 1)
result_amount = 2
sodiumchloride
name = "Sodium Chloride"
id = "sodiumchloride"
result = "sodiumchloride"
required_reagents = list("sodium" = 1, "chlorine" = 1)
result_amount = 2
flash_powder
name = "Flash powder"
id = "flash_powder"
code/WorkInProgress/Chemistry-Tools.dm
+221 -4
View File
@@ -332,7 +332,7 @@
/* New()
var/datum/reagents/R = new/datum/reagents(50)
reagents = R
R.my_atom = src */
R.my_atom = src */
attackby(obj/item/weapon/W as obj, mob/user as mob)
return
@@ -607,7 +607,7 @@
user << "\red [target] is full."
return
if(!target.is_open_container() && !ismob(target) && !istype(target,/obj/item/weapon/reagent_containers/food))
if(!target.is_open_container() && !ismob(target) && !istype(target, /obj/item/weapon/reagent_containers/food))
user << "\red You cannot directly fill this object."
return
@@ -620,7 +620,6 @@
src.reagents.reaction(target, INGEST)
if(ismob(target) && target == user)
src.reagents.reaction(target, INGEST)
spawn(5)
src.reagents.trans_to(target, 5)
user << "\blue You inject 5 units of the solution. The syringe now contains [src.reagents.total_volume] units."
@@ -653,6 +652,77 @@
desc = "yummy"
icon = 'food.dmi'
icon_state = null
flags = FPRINT | TABLEPASS | OPENCONTAINER
attackby(obj/item/weapon/W as obj, mob/user as mob)
return
attack_self(mob/user as mob)
return
attack(mob/M as mob, mob/user as mob, def_zone)
var/datum/reagents/R = src.reagents
if(!R.total_volume || !R)
user << "\red None of [src] left, oh no!"
return 0
if(M == user)
M << "\blue You swallow some of contents of the [src]."
if(reagents.total_volume)
reagents.reaction(M, INGEST)
spawn(5)
reagents.trans_to(M, 10)
playsound(M.loc,'drink.ogg', rand(10,50), 1)
return 1
else if( istype(M, /mob/living/carbon/human) )
for(var/mob/O in viewers(world.view, user))
O.show_message("\red [user] attempts to feed [M] [src].", 1)
if(!do_mob(user, M)) return
for(var/mob/O in viewers(world.view, user))
O.show_message("\red [user] feeds [M] [src].", 1)
if(reagents.total_volume)
reagents.reaction(M, INGEST)
spawn(5)
reagents.trans_to(M, 10)
playsound(M.loc,'drink.ogg', rand(10,50), 1)
return 1
return 0
attackby(obj/item/I as obj, mob/user as mob)
return
afterattack(obj/target, mob/user , flag)
if(istype(target, /obj/reagent_dispensers)) //A dispenser. Transfer FROM it TO us.
if(!target.reagents.total_volume)
user << "\red [target] is empty."
return
if(reagents.total_volume >= reagents.maximum_volume)
user << "\red [src] is full."
return
var/trans = target.reagents.trans_to(src, 5)
user << "\blue You fill [src] with [trans] units of the contents of [target]."
//Something like a glass or a food item. Player probably wants to transfer TO it.
else if(target.is_open_container() || istype(target, /obj/item/weapon/reagent_containers/food/snacks))
if(!reagents.total_volume)
user << "\red [src] is empty."
return
if(target.reagents.total_volume >= target.reagents.maximum_volume)
user << "\red you can't add anymore to [target]."
return
var/trans = src.reagents.trans_to(target, 2)
user << "\blue You transfer [trans] units of the condiment to [target]."
/obj/item/weapon/reagent_containers/food/snacks //Food items that are eaten normally and don't leave anything behind.
name = "snack"
@@ -684,7 +754,8 @@
reagents.reaction(M, INGEST)
spawn(5)
if(reagents.total_volume > bitesize)
reagents.trans_to(M, bitesize)
var/temp_bitesize = max(reagents.total_volume /2, 1)
reagents.trans_to(M, temp_bitesize)
else
reagents.trans_to(M, reagents.total_volume)
if(!reagents.total_volume)
@@ -1541,6 +1612,7 @@
var/hname = ""
var/job = null
icon_state = "kabob"
desc = "A delicious kabob"
New()
..()
reagents.add_reagent("nutriment", 6)
@@ -1549,11 +1621,38 @@
/obj/item/weapon/reagent_containers/food/snacks/monkeykabob
name = "Monkey-kabob"
icon_state = "kabob"
desc = "A delicious kabob"
New()
..()
reagents.add_reagent("nutriment", 6)
bitesize = 2
/obj/item/weapon/reagent_containers/food/snacks/sosjerky
name = "Scardy's Private Reserve Beef Jerky"
icon_state = "sosjerky"
desc = "Beef jerky made from the finest space cows."
New()
..()
reagents.add_reagent("nutriment", 4)
bitesize = 2
/obj/item/weapon/reagent_containers/food/snacks/no_raisin
name = "4no Raisins"
icon_state = "4no_raisins"
desc = "Best raisins in the universe. Not sure why."
New()
..()
reagents.add_reagent("nutriment", 6)
/obj/item/weapon/reagent_containers/food/snacks/spacetwinkie
name = "Space Twinkie"
icon_state = "space_twinkie"
desc = "Will probably survive longer then you will."
New()
..()
reagents.add_reagent("sugar", 4)
bitesize = 2
///////////////////////////////////////////////Condiments
//Notes by Darem: The condiments food-subtype is for stuff you don't actually eat but you use to modify existing food. They all
// leave empty containers when used up and can be filled/re-filled with other items. However, they start already full with
@@ -1575,6 +1674,8 @@
New()
..()
reagents.add_reagent("capsaicin", 50)
src.pixel_x = rand(-5.0, 5)
src.pixel_y = rand(-5.0, 5)
/obj/item/weapon/reagent_containers/food/condiment/berryjam
name = "Berry Jam"
@@ -1583,6 +1684,8 @@
New()
..()
reagents.add_reagent("berryjam", 50)
src.pixel_x = rand(-5.0, 5)
src.pixel_y = rand(-5.0, 5)
/obj/item/weapon/reagent_containers/food/condiment/soysauce
name = "Soy Sauce"
@@ -1591,6 +1694,8 @@
New()
..()
reagents.add_reagent("soysauce", 50)
src.pixel_x = rand(-5.0, 5)
src.pixel_y = rand(-5.0, 5)
/obj/item/weapon/reagent_containers/food/condiment/coldsauce
name = "Coldsauce"
@@ -1599,6 +1704,33 @@
New()
..()
reagents.add_reagent("frostoil", 50)
src.pixel_x = rand(-5.0, 5)
src.pixel_y = rand(-5.0, 5)
/obj/item/weapon/reagent_containers/food/condiment/saltshaker
name = "Salt Shaker"
desc = "Salt. From space oceans, presumably."
icon_state = "saltshakersmall"
New()
var/datum/reagents/R = new/datum/reagents(20)
reagents = R
R.my_atom = src
reagents.add_reagent("sodiumchloride", 20)
src.pixel_x = rand(-5.0, 5)
src.pixel_y = rand(-5.0, 5)
/obj/item/weapon/reagent_containers/food/condiment/peppermill
name = "Pepper Mill"
desc = "Often used to flavor food or make people sneeze."
icon_state = "peppermillsmall"
New()
var/datum/reagents/R = new/datum/reagents(20)
reagents = R
R.my_atom = src
reagents.add_reagent("blackpepper", 20)
src.pixel_x = rand(-5.0, 5)
src.pixel_y = rand(-5.0, 5)
///////////////////////////////////////////////Drinks
//Notes by Darem: Drinks are simply containers that start preloaded. Unlike condiments, the contents can be ingested directly
@@ -1611,6 +1743,8 @@
New()
..()
reagents.add_reagent("milk", 50)
src.pixel_x = rand(-10.0, 10)
src.pixel_y = rand(-10.0, 10)
/obj/item/weapon/reagent_containers/food/drinks/coffee
name = "Robust Coffee"
@@ -1619,6 +1753,8 @@
New()
..()
reagents.add_reagent("coffee", 30)
src.pixel_x = rand(-10.0, 10)
src.pixel_y = rand(-10.0, 10)
/obj/item/weapon/reagent_containers/food/drinks/cola
name = "Space Cola"
@@ -1647,6 +1783,75 @@
New()
..()
reagents.add_reagent("ale", 30)
src.pixel_x = rand(-10.0, 10)
src.pixel_y = rand(-10.0, 10)
/obj/item/weapon/reagent_containers/food/drinks/space_mountain_wind
name = "Space Mountain Wind"
desc = "Blows right through you like a space wind."
icon_state = "space_mountain_wind"
New()
..()
reagents.add_reagent("spacemountainwind", 30)
src.pixel_x = rand(-10.0, 10)
src.pixel_y = rand(-10.0, 10)
/obj/item/weapon/reagent_containers/food/drinks/thirteenloko
name = "Thirteen Loko"
desc = "The CMO has advised crew members that consumption of Thirteen Loko may result in seizures, blindness, drunkeness, or even death. Please Drink Responsably."
icon_state = "thirteen_loko"
New()
..()
reagents.add_reagent("thirteenloko", 30)
src.pixel_x = rand(-10.0, 10)
src.pixel_y = rand(-10.0, 10)
/obj/item/weapon/reagent_containers/food/drinks/dr_gibb
name = "Dr. Gibb"
desc = "A delicious mixture of 42 different flavors."
icon_state = "dr_gibb"
New()
..()
reagents.add_reagent("dr_gibb", 30)
src.pixel_x = rand(-10.0, 10)
src.pixel_y = rand(-10.0, 10)
/obj/item/weapon/reagent_containers/food/drinks/starkist
name = "Star-kist"
desc = "The taste of a star in liquid form."
icon_state = "starkist"
New()
..()
reagents.add_reagent("cola", 15)
reagents.add_reagent("orangejuice", 15)
src.pixel_x = rand(-10.0, 10)
src.pixel_y = rand(-10.0, 10)
/obj/item/weapon/reagent_containers/food/drinks/space_up
name = "Space-Up"
desc = "Tastes like a hull breach in your mouth."
icon_state = "space-up"
New()
..()
reagents.add_reagent("space_up", 30)
src.pixel_x = rand(-10.0, 10)
src.pixel_y = rand(-10.0, 10)
/obj/item/weapon/reagent_containers/food/drinks/sillycup
name = "Paper Cup"
desc = "A paper water cup."
icon_state = "water_cup_e"
New()
var/datum/reagents/R = new/datum/reagents(10)
reagents = R
R.my_atom = src
src.pixel_x = rand(-10.0, 10)
src.pixel_y = rand(-10.0, 10)
on_reagent_change()
if(reagents.total_volume)
icon_state = "water_cup"
else
icon_state = "water_cup_e"
///////////////////////////////////////////////Alchohol bottles! -Agouri //////////////////////////
//Notes by Darem: Functionally identical to regular drinks. The only difference is that the default bottle size is 100.
@@ -1856,6 +2061,18 @@
if(src)
del(src)
/obj/reagent_dispensers/water_cooler
name = "Water-Cooler"
desc = "A machine that dispenses water to drink"
amount_per_transfer_from_this = 5
icon = 'vending.dmi'
icon_state = "water_cooler"
New()
..()
anchored = 1
reagents.add_reagent("water",500)
/obj/reagent_dispensers/beerkeg
name = "beer keg"
desc = "A beer keg"
code/WorkInProgress/cloning.dm
+1 -1
View File
@@ -35,7 +35,7 @@
//The return of data disks?? Just for transferring between genetics machine/cloning machine.
//TO-DO: Make the genetics machine accept them.
/obj/item/weapon/disk/data
name = "data disk"
name = "Cloning Data Disk"
icon = 'cloning.dmi'
icon_state = "datadisk0" //Gosh I hope syndies don't mistake them for the nuke disk.
item_state = "card-id"