cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-12 19:22:56 +00:00
Code Issues Packages Projects Releases Wiki Activity

Tweaked the food system to allow for custom sounds.

Browse Source 
Also switched the LiquidFood stuff and the soups to play the drink sound.
Signed-off-by: Lexus Langg <jaedonjacobi@yahoo.com>
This commit is contained in:
Lexus Langg
2012-06-04 12:21:38 -07:00
parent 81efb76970
commit 056697025a
4 changed files with 14 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
code/modules/chemical/Chemistry-Tools.dm
View File

@@ -1466,6 +1466,7 @@
icon_state = null
var/bitesize = 1
var/bitecount = 0
var/eatsound = 'eatfood.ogg'
var/trash = null
//Placeholder for effect that trigger on eating that aren't tied to reagents.
@@ -1592,7 +1593,7 @@
spawn(5)
user.update_clothing()
playsound(M.loc,'eatfood.ogg', rand(10,50), 1)
playsound(M.loc, eatsound, rand(10,50), 1)
return 1
else if(istype(M, /mob/living/simple_animal/livestock))
if(M == user) //If you're eating it yourself.

12
code/modules/food/food.dm
View File

@@ -20,6 +20,8 @@
// name = "Xenoburger" //Name that displays in the UI.
// desc = "Smells caustic. Tastes like heresy." //Duh
// icon_state = "xburger" //Refers to an icon in food.dmi
// eatsound = 'eatfood.ogg' //Don't touch this if you want your food to have a crunch sound.
// trash = "plate" //Refers to the trash item.
// New() //Don't mess with this.
// ..() //Same here.
// reagents.add_reagent("xenomicrobes", 10) //This is what is in the food item. you may copy/paste
@@ -944,6 +946,7 @@
name = "Meatball soup"
desc = "Smells like copper"
icon_state = "meatballsoup"
eatsound = 'drink.ogg'
New()
..()
reagents.add_reagent("nutriment", 2)
@@ -954,6 +957,7 @@
/obj/item/weapon/reagent_containers/food/snacks/clownstears
name = "Clown's Tears"
desc = "Not very funny."
eatsound = 'drink.ogg'
icon_state = "clownstears"
New()
..()
@@ -967,6 +971,7 @@
desc = "A true vegan meal" //TODO
icon_state = "vegetablesoup"
trash = "snack_bowl"
eatsound = 'drink.ogg'
New()
..()
reagents.add_reagent("nutriment", 10)
@@ -977,6 +982,7 @@
name = "Nettle soup"
desc = "To think, the botanist would've beat you to death with one of these."
icon_state = "nettlesoup"
eatsound = 'drink.ogg'
trash = "snack_bowl"
New()
..()
@@ -989,6 +995,7 @@
name = "Mystery soup"
desc = "The mystery is, why aren't you eating it?"
icon_state = "mysterysoup"
eatsound = 'drink.ogg'
trash = "snack_bowl"
New()
..()
@@ -1035,6 +1042,7 @@
desc = "I wish this was soup."
icon_state = "wishsoup"
trash = "snack_bowl"
eatsound = 'drink.ogg'
New()
..()
reagents.add_reagent("water", 10)
@@ -1224,6 +1232,7 @@
desc = "Drinking this feels like being a vampire! A tomato vampire..."
icon_state = "tomatosoup"
trash = "snack_bowl"
eatsound = 'drink.ogg'
New()
..()
reagents.add_reagent("nutriment", 5)
@@ -1245,6 +1254,7 @@
name = "Stew"
desc = "A nice and warm stew. Healthy and strong."
icon_state = "stew"
eatsound = 'drink.ogg'
New()
..()
reagents.add_reagent("nutriment", 20)
@@ -1416,6 +1426,7 @@
name = "chantrelle soup"
desc = "A delicious and hearty mushroom soup."
icon_state = "mushroomsoup"
eatsound = 'drink.ogg'
trash = "snack_bowl"
New()
..()
@@ -1475,6 +1486,7 @@
name = "\improper \"LiquidFood\" ration"
icon_state = "liquidfood"
desc = "A bland, tasteless pulp of what you need to survive. Packaged in a airtight bag, which you can drink through a straw. Strangely crunchy."
eatsound = 'drink.ogg'
trash = "liquidfood"
var/flavored = 0
New()