cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2025-12-28 11:11:52 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1140 from Fox-McCloud/tweaking-stuff

Browse Source 
Tweaks and Fixes 2.0
This commit is contained in:
ZomgPonies
2015-05-22 17:24:29 -04:00
parent 2d1b8f422e 1c1eec3210
commit c8f9aa0c33
17 changed files with 111 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
code/modules/reagents/reagent_containers/food/drinks.dm
View File

@@ -242,6 +242,8 @@
New()
..()
reagents.add_reagent("tea", 30)
if(prob(20))
reagents.add_reagent("mugwort", 3)
src.pixel_x = rand(-10.0, 10)
src.pixel_y = rand(-10.0, 10)
@@ -308,6 +310,8 @@
New()
..()
reagents.add_reagent("dry_ramen", 30)
if(prob(20))
reagents.add_reagent("enzyme", 3)
src.pixel_x = rand(-10.0, 10)
src.pixel_y = rand(-10.0, 10)

8
code/modules/reagents/reagent_containers/food/drinks/drinkingglass.dm
View File

@@ -188,6 +188,14 @@
icon_state = "vermouthglass"
name = "Glass of Vermouth"
desc = "You wonder why you're even drinking this straight."
if("triple_citrus")
icon_state = "triplecitrus"
name = "Glass of Triplecitrus Juice"
desc = "As colorful and healthy as it is delicious."
if("mojito")
icon_state = "mojito"
name = "Glass of Mojito"
desc = "Fresh from Spesscuba."
if("tequilla")
icon_state = "tequillaglass"
name = "Glass of Tequilla"

2
code/modules/reagents/reagent_containers/food/snacks.dm
View File

@@ -1279,6 +1279,7 @@
New()
..()
reagents.add_reagent("nutriment", 4)
reagents.add_reagent("fake_cheese", 2)
bitesize = 2
/obj/item/weapon/reagent_containers/food/snacks/chinese/chowmein
@@ -1288,6 +1289,7 @@
New()
..()
reagents.add_reagent("nutriment", 6)
reagents.add_reagent("beans", 3)
reagents.add_reagent("msg",4)
bitesize = 2

13
code/modules/reagents/reagent_containers/glass/bottle.dm
View File

@@ -252,6 +252,19 @@
..()
reagents.add_reagent("formaldehyde", 50)
/obj/item/weapon/reagent_containers/glass/bottle/reagent/morphine
name = "Morphine Bottle"
desc = "A reagent bottle. Contains morphine."
New()
..()
reagents.add_reagent("morphine", 50)
/obj/item/weapon/reagent_containers/glass/bottle/reagent/insulin
name = "Insulin Bottle"
desc = "A reagent bottle. Contains insulin."
New()
..()
reagents.add_reagent("insulin", 50)
////////////////////Traitor Poison Bottle//////////////////////////////