diff --git a/code/game/objects/items/weapons/scissors.dm b/code/game/objects/items/weapons/scissors.dm
index ea68d2cf8cb..577f4b113b3 100644
--- a/code/game/objects/items/weapons/scissors.dm
+++ b/code/game/objects/items/weapons/scissors.dm
@@ -50,11 +50,7 @@
species_hair = hair_styles_list
var/h_new_style = input(user, "Select a hair style", "Grooming") as null|anything in species_hair
user.visible_message("[user] starts cutting [M]'s hair!", "You start cutting [M]'s hair!") //arguments for this are: 1. what others see 2. what the user sees. --Fixed grammar, (TGameCo)
- playsound(loc, "sound/items/Wirecutter.ogg", 50, 1, -1)
- spawn(5)
- playsound(loc, "sound/items/Wirecutter.ogg", 50, 1, -1)
- spawn(10)
- playsound(loc, "sound/items/Wirecutter.ogg", 50, 1, -1)
+ playsound(loc, "sound/goonstation/misc/Scissor.ogg", 100, 1)
if(do_after(user, 50, target = H)) //this is the part that adds a delay. delay is in deciseconds. --Made it 5 seconds, because hair isn't cut in one second in real life, and I want at least a little bit longer time, (TGameCo)
if(!(M in view(1))) //Adjacency test
user.visible_message("[user] stops cutting [M]'s hair.", "You stop cutting [M]'s hair.")
diff --git a/code/game/objects/items/weapons/storage/boxes.dm b/code/game/objects/items/weapons/storage/boxes.dm
index a898c7cca91..cd565f341a7 100644
--- a/code/game/objects/items/weapons/storage/boxes.dm
+++ b/code/game/objects/items/weapons/storage/boxes.dm
@@ -583,6 +583,7 @@
W.lit = 1
W.icon_state = "match_lit"
processing_objects.Add(W)
+ playsound(user.loc, 'sound/goonstation/misc/matchstick_light.ogg', 50, 1)
W.update_icon()
return
diff --git a/code/modules/clothing/clothing.dm b/code/modules/clothing/clothing.dm
index da0da57bcd4..a02d51044c9 100644
--- a/code/modules/clothing/clothing.dm
+++ b/code/modules/clothing/clothing.dm
@@ -369,6 +369,7 @@ BLIND // can't see anything
processing_objects.Add(M)
M.update_icon()
user.visible_message("[user] strikes a [M] on the bottom of [src], lighting it.","You strike the [M] on the bottom of [src] to light it.")
+ playsound(user.loc, 'sound/goonstation/misc/matchstick_light.ogg', 50, 1)
else if(M.lit == 1) // Match is lit, not extinguished.
M.dropped()
user.visible_message("[user] crushes the [M] into the bottom of [src], extinguishing it.","You crush the [M] into the bottom of [src], extinguishing it.")
diff --git a/code/modules/reagents/newchem/drinks.dm b/code/modules/reagents/newchem/drinks.dm
index 28237207995..2b041372ee8 100644
--- a/code/modules/reagents/newchem/drinks.dm
+++ b/code/modules/reagents/newchem/drinks.dm
@@ -12,6 +12,7 @@
required_reagents = list("gintonic" = 1, "methamphetamine" = 1)
result_amount = 2
mix_message = "The drink turns electric blue and starts quivering violently."
+ mix_sound = 'sound/goonstation/misc/drinkfizz.ogg'
/datum/reagent/ginsonic/on_mob_life(var/mob/living/M as mob)
if(!M) M = holder.my_atom
@@ -62,6 +63,7 @@
result = "jackrose"
required_reagents = list("applejack" = 4, "lemonjuice" = 1)
result_amount = 5
+ mix_sound = 'sound/goonstation/misc/drinkfizz.ogg'
// ROBOT ALCOHOL PAST THIS POINT
@@ -93,7 +95,7 @@
/datum/reagent/ethanol/synthanol/on_mob_life(var/mob/living/M as mob, var/alien)
- var/d = data
+ var/d = data
if(d >= collapse_start && prob(10))
M.emote("collapse")
@@ -118,6 +120,7 @@
required_reagents = list("synthanol" = 1, "oil" = 1, "sodawater" = 1)
result_amount = 3
mix_message = "The ingredients combine into a stiff, dark goo."
+ mix_sound = 'sound/goonstation/misc/drinkfizz.ogg'
/datum/reagent/ethanol/synthanol/trinary
name = "Trinary"
@@ -133,6 +136,7 @@
required_reagents = list("synthanol" = 1, "limejuice" = 1, "orangejuice" = 1)
result_amount = 3
mix_message = "The ingredients mix into a colorful substance."
+ mix_sound = 'sound/goonstation/misc/drinkfizz.ogg'
/datum/reagent/ethanol/synthanol/servo
name = "Servo"
@@ -148,5 +152,6 @@
required_reagents = list("synthanol" = 2, "cream" = 1, "hot_coco" = 1)
result_amount = 4
mix_message = "The ingredients mix into a dark brown substance."
+ mix_sound = 'sound/goonstation/misc/drinkfizz.ogg'
// ROBOT ALCOHOL ENDS
diff --git a/code/modules/reagents/newchem/drugs.dm b/code/modules/reagents/newchem/drugs.dm
index aac5157403e..5389c8bed6d 100644
--- a/code/modules/reagents/newchem/drugs.dm
+++ b/code/modules/reagents/newchem/drugs.dm
@@ -154,6 +154,7 @@
result_amount = 6
mix_message = "The mixture dries into a pale blue powder."
min_temp = 380
+ mix_sound = 'sound/goonstation/misc/fuse.ogg'
/datum/reagent/methamphetamine
name = "Methamphetamine"
@@ -244,6 +245,7 @@
result = "saltpetre"
required_reagents = list("potassium" = 1, "nitrogen" = 1, "oxygen" = 3)
result_amount = 3
+ mix_sound = 'sound/goonstation/misc/fuse.ogg'
/datum/reagent/saltpetre
name = "Saltpetre"
@@ -289,6 +291,7 @@
result_amount = 6
min_temp = 374
mix_message = "Tiny cubic crystals precipitate out of the mixture. Huh."
+ mix_sound = 'sound/goonstation/misc/fuse.ogg'
/datum/reagent/bath_salts/overdose_process(var/mob/living/M as mob)
M.hallucination += 10
diff --git a/code/modules/reagents/newchem/food.dm b/code/modules/reagents/newchem/food.dm
index b0c0704cbb9..1329828b948 100644
--- a/code/modules/reagents/newchem/food.dm
+++ b/code/modules/reagents/newchem/food.dm
@@ -41,6 +41,7 @@ datum/reagent/triple_citrus
required_reagents = list("lemonjuice" = 1, "limejuice" = 1, "orangejuice" = 1)
result_amount = 3
mix_message = "The citrus juices begin to blend together."
+ mix_sound = 'sound/goonstation/misc/drinkfizz.ogg'
datum/reagent/triple_citrus/reaction_mob(var/mob/living/carbon/M as mob, var/method=TOUCH, var/volume)
if(!istype(M, /mob/living/carbon))
@@ -106,6 +107,7 @@ datum/reagent/vhfcs/on_mob_life(var/mob/living/M as mob)
required_reagents = list("carbon" = 1, "oxygen" = 1, "water" = 1, "sugar" = 1)
result_amount = 4
mix_message = "The mixture begins to fizz."
+ mix_sound = 'sound/goonstation/misc/drinkfizz.ogg'
/datum/reagent/honey
name = "Honey"
diff --git a/code/modules/reagents/newchem/medicine.dm b/code/modules/reagents/newchem/medicine.dm
index f0b8c990aba..979fe8492ba 100644
--- a/code/modules/reagents/newchem/medicine.dm
+++ b/code/modules/reagents/newchem/medicine.dm
@@ -125,6 +125,7 @@ datum/reagent/charcoal/on_mob_life(var/mob/living/M as mob)
result_amount = 2
mix_message = "The mixture yields a fine black powder."
min_temp = 380
+ mix_sound = 'sound/goonstation/misc/fuse.ogg'
/datum/chemical_reaction/silver_sulfadiazine
name = "Silver Sulfadiazine"
@@ -133,6 +134,7 @@ datum/reagent/charcoal/on_mob_life(var/mob/living/M as mob)
required_reagents = list("ammonia" = 1, "silver" = 1, "sulfur" = 1, "oxygen" = 1, "chlorine" = 1)
result_amount = 5
mix_message = "A strong and cloying odor begins to bubble from the mixture."
+ mix_sound = 'sound/goonstation/misc/drinkfizz.ogg'
/datum/chemical_reaction/salglu_solution
name = "Saline-Glucose Solution"
@@ -307,6 +309,7 @@ datum/reagent/sal_acid/overdose_process(var/mob/living/M as mob)
required_reagents = list("sodium" = 1, "phenol" = 1, "carbon" = 1, "oxygen" = 1, "sacid" = 1)
result_amount = 5
mix_message = "The mixture crystallizes."
+ mix_sound = 'sound/goonstation/misc/drinkfizz.ogg'
datum/reagent/salbutamol
name = "Salbutamol"
@@ -331,6 +334,7 @@ datum/reagent/salbutamol/on_mob_life(var/mob/living/M as mob)
required_reagents = list("sal_acid" = 1, "lithium" = 1, "aluminum" = 1, "bromine" = 1, "ammonia" = 1)
result_amount = 5
mix_message = "The solution bubbles freely, creating a head of bluish foam."
+ mix_sound = 'sound/goonstation/misc/drinkfizz.ogg'
datum/reagent/perfluorodecalin
name = "Perfluorodecalin"
@@ -358,6 +362,7 @@ datum/reagent/perfluorodecalin/on_mob_life(var/mob/living/carbon/human/M as mob)
result_amount = 3
min_temp = 370
mix_message = "The mixture rapidly turns into a dense pink liquid."
+ mix_sound = 'sound/goonstation/misc/drinkfizz.ogg'
datum/reagent/ephedrine
name = "Ephedrine"
@@ -440,6 +445,7 @@ datum/reagent/diphenhydramine/on_mob_life(var/mob/living/M as mob)
required_reagents = list("oil" = 1, "carbon" = 1, "bromine" = 1, "diethylamine" = 1, "ethanol" = 1)
result_amount = 4
mix_message = "The mixture fizzes gently."
+ mix_sound = 'sound/goonstation/misc/drinkfizz.ogg'
datum/reagent/morphine
name = "Morphine"
@@ -637,6 +643,7 @@ datum/reagent/epinephrine/overdose_process(var/mob/living/M as mob)
required_reagents = list("phenol" = 1, "acetone" = 1, "diethylamine" = 1, "oxygen" = 1, "chlorine" = 1, "hydrogen" = 1)
result_amount = 6
mix_message = "Tiny white crystals precipitate out of the solution."
+ mix_sound = 'sound/goonstation/misc/drinkfizz.ogg'
datum/reagent/strange_reagent
name = "Strange Reagent"
@@ -815,6 +822,7 @@ datum/reagent/antihol/on_mob_life(var/mob/living/M as mob)
required_reagents = list("ethanol" = 1, "charcoal" = 1)
result_amount = 2
mix_message = "A minty and refreshing smell drifts from the effervescent mixture."
+ mix_sound = 'sound/goonstation/misc/drinkfizz.ogg'
/datum/reagent/stimulants
name = "Stimulants"
@@ -923,6 +931,7 @@ datum/reagent/teporone/on_mob_life(var/mob/living/M as mob)
required_reagents = list("acetone" = 1, "silicon" = 1, "plasma" = 1)
result_amount = 2
mix_message = "The mixture turns an odd lavender color."
+ mix_sound = 'sound/goonstation/misc/drinkfizz.ogg'
datum/reagent/haloperidol
name = "Haloperidol"
diff --git a/code/modules/reagents/newchem/other.dm b/code/modules/reagents/newchem/other.dm
index 46b2fe15108..3f6ae65d250 100644
--- a/code/modules/reagents/newchem/other.dm
+++ b/code/modules/reagents/newchem/other.dm
@@ -99,6 +99,7 @@ datum/reagent/acetone
required_reagents = list("water" = 1, "chlorine" = 1, "oil" = 1)
result_amount = 3
mix_message = "The mixture bubbles and gives off an unpleasant medicinal odor."
+ mix_sound = 'sound/goonstation/misc/drinkfizz.ogg'
/datum/chemical_reaction/ash
name = "Ash"
diff --git a/code/modules/reagents/newchem/pyro.dm b/code/modules/reagents/newchem/pyro.dm
index c2adcc783e3..12a8266693e 100644
--- a/code/modules/reagents/newchem/pyro.dm
+++ b/code/modules/reagents/newchem/pyro.dm
@@ -170,6 +170,7 @@
result = "blackpowder"
required_reagents = list("saltpetre" = 1, "charcoal" = 1, "sulfur" = 1)
result_amount = 3
+ mix_sound = 'sound/goonstation/misc/fuse.ogg'
/datum/chemical_reaction/blackpowder_explosion
name = "Black Powder Kaboom"
@@ -479,6 +480,7 @@ datum/reagent/cryostylane
result = "cryostylane"
required_reagents = list("water" = 1, "plasma" = 1, "nitrogen" = 1)
result_amount = 3
+ mix_sound = 'sound/goonstation/misc/drinkfizz.ogg'
datum/reagent/cryostylane/on_mob_life(var/mob/living/M as mob) //TODO: code freezing into an ice cube
if(M.reagents.has_reagent("oxygen"))
@@ -557,6 +559,7 @@ datum/reagent/firefighting_foam
required_reagents = list("carbon" = 1, "chlorine" = 1, "sulfur" = 1)
result_amount = 3
mix_message = "The mixture bubbles gently."
+ mix_sound = 'sound/goonstation/misc/drinkfizz.ogg'
datum/reagent/firefighting_foam/reaction_mob(var/mob/living/M, var/method=TOUCH, var/volume)
if(!istype(M, /mob/living))
diff --git a/code/modules/reagents/newchem/toxins.dm b/code/modules/reagents/newchem/toxins.dm
index a330b8f8b91..2cdc5f08a8f 100644
--- a/code/modules/reagents/newchem/toxins.dm
+++ b/code/modules/reagents/newchem/toxins.dm
@@ -180,6 +180,7 @@
result_amount = 3
min_temp = 380
mix_message = "The mixture gives off a faint scent of almonds."
+ mix_sound = 'sound/goonstation/misc/drinkfizz.ogg'
/datum/reagent/itching_powder
@@ -412,6 +413,7 @@
required_reagents = list("acetone" = 1, "diethylamine" = 1, "sulfur" = 1)
result_amount = 3
mix_message = "The mixture gives off quite a stench."
+ mix_sound = 'sound/goonstation/misc/drinkfizz.ogg'
/datum/reagent/sulfonal/on_mob_life(var/mob/living/M as mob)
if(!M) M = holder.my_atom
@@ -527,6 +529,7 @@
result_amount = 8
mix_message = "The mixture yields a colorless, odorless liquid."
min_temp = 374
+ mix_sound = 'sound/goonstation/misc/drinkfizz.ogg'
/datum/reagent/tabun/on_mob_life(var/mob/living/M as mob)
if(!M) M = holder.my_atom
diff --git a/code/modules/reagents/oldchem/chemical_reaction/chemical_reaction_drink.dm b/code/modules/reagents/oldchem/chemical_reaction/chemical_reaction_drink.dm
index 683bd84337f..4479d24aa7c 100644
--- a/code/modules/reagents/oldchem/chemical_reaction/chemical_reaction_drink.dm
+++ b/code/modules/reagents/oldchem/chemical_reaction/chemical_reaction_drink.dm
@@ -5,6 +5,7 @@
result = "hot_coco"
required_reagents = list("water" = 5, "cocoa" = 1)
result_amount = 5
+ mix_sound = 'sound/goonstation/misc/drinkfizz.ogg'
/datum/chemical_reaction/chocolate_milk
name = "Chocolate Milk"
@@ -13,6 +14,7 @@
required_reagents = list("chocolate" = 1, "milk" = 1)
result_amount = 2
mix_message = "The mixture turns a nice brown color."
+ mix_sound = 'sound/goonstation/misc/drinkfizz.ogg'
/datum/chemical_reaction/coffee
name = "Coffee"
@@ -20,6 +22,7 @@
result = "coffee"
required_reagents = list("coffeepowder" = 1, "water" = 5)
result_amount = 5
+ mix_sound = 'sound/goonstation/misc/drinkfizz.ogg'
/datum/chemical_reaction/tea
name = "Tea"
@@ -27,6 +30,7 @@
result = "tea"
required_reagents = list("teapowder" = 1, "water" = 5)
result_amount = 5
+ mix_sound = 'sound/goonstation/misc/drinkfizz.ogg'
/datum/chemical_reaction/goldschlager
name = "Goldschlager"
@@ -34,6 +38,7 @@
result = "goldschlager"
required_reagents = list("vodka" = 10, "gold" = 1)
result_amount = 10
+ mix_sound = 'sound/goonstation/misc/drinkfizz.ogg'
/datum/chemical_reaction/patron
name = "Patron"
@@ -41,6 +46,7 @@
result = "patron"
required_reagents = list("tequilla" = 10, "silver" = 1)
result_amount = 10
+ mix_sound = 'sound/goonstation/misc/drinkfizz.ogg'
/datum/chemical_reaction/bilk
name = "Bilk"
@@ -48,6 +54,7 @@
result = "bilk"
required_reagents = list("milk" = 1, "beer" = 1)
result_amount = 2
+ mix_sound = 'sound/goonstation/misc/drinkfizz.ogg'
/datum/chemical_reaction/icetea
name = "Iced Tea"
@@ -55,6 +62,7 @@
result = "icetea"
required_reagents = list("ice" = 1, "tea" = 3)
result_amount = 4
+ mix_sound = 'sound/goonstation/misc/drinkfizz.ogg'
/datum/chemical_reaction/icecoffee
name = "Iced Coffee"
@@ -62,6 +70,7 @@
result = "icecoffee"
required_reagents = list("ice" = 1, "coffee" = 3)
result_amount = 4
+ mix_sound = 'sound/goonstation/misc/drinkfizz.ogg'
/datum/chemical_reaction/nuka_cola
name = "Nuka Cola"
@@ -69,6 +78,7 @@
result = "nuka_cola"
required_reagents = list("uranium" = 1, "cola" = 6)
result_amount = 6
+ mix_sound = 'sound/goonstation/misc/drinkfizz.ogg'
/datum/chemical_reaction/moonshine
name = "Moonshine"
@@ -77,6 +87,7 @@
required_reagents = list("nutriment" = 10)
required_catalysts = list("enzyme" = 5)
result_amount = 10
+ mix_sound = 'sound/goonstation/misc/drinkfizz.ogg'
/datum/chemical_reaction/wine
name = "Wine"
@@ -85,6 +96,7 @@
required_reagents = list("berryjuice" = 10)
required_catalysts = list("enzyme" = 5)
result_amount = 10
+ mix_sound = 'sound/goonstation/misc/drinkfizz.ogg'
/datum/chemical_reaction/spacebeer
name = "Space Beer"
@@ -93,6 +105,7 @@
required_reagents = list("cornoil" = 10)
required_catalysts = list("enzyme" = 5)
result_amount = 10
+ mix_sound = 'sound/goonstation/misc/drinkfizz.ogg'
/datum/chemical_reaction/vodka
name = "Vodka"
@@ -101,6 +114,7 @@
required_reagents = list("potato" = 10)
required_catalysts = list("enzyme" = 5)
result_amount = 10
+ mix_sound = 'sound/goonstation/misc/drinkfizz.ogg'
/datum/chemical_reaction/sake
name = "Sake"
@@ -109,6 +123,7 @@
required_reagents = list("rice" = 10,"water" = 5)
required_catalysts = list("enzyme" = 5)
result_amount = 15
+ mix_sound = 'sound/goonstation/misc/drinkfizz.ogg'
/datum/chemical_reaction/kahlua
name = "Kahlua"
@@ -117,6 +132,7 @@
required_reagents = list("coffee" = 5, "sugar" = 5, "rum" = 5)
required_catalysts = list("enzyme" = 5)
result_amount = 5
+ mix_sound = 'sound/goonstation/misc/drinkfizz.ogg'
/datum/chemical_reaction/kahluaVodka
name = "KahluaVodka"
@@ -125,6 +141,7 @@
required_reagents = list("coffee" = 5, "sugar" = 5, "vodka" = 5)
required_catalysts = list("enzyme" = 5)
result_amount = 5
+ mix_sound = 'sound/goonstation/misc/drinkfizz.ogg'
/datum/chemical_reaction/gin_tonic
name = "Gin and Tonic"
@@ -133,6 +150,7 @@
required_reagents = list("gin" = 2, "tonic" = 1)
result_amount = 3
mix_message = "The tonic water and gin mix together perfectly."
+ mix_sound = 'sound/goonstation/misc/drinkfizz.ogg'
/datum/chemical_reaction/cuba_libre
name = "Cuba Libre"
@@ -140,6 +158,7 @@
result = "cubalibre"
required_reagents = list("rum" = 2, "cola" = 1)
result_amount = 3
+ mix_sound = 'sound/goonstation/misc/drinkfizz.ogg'
/datum/chemical_reaction/mojito
name = "Mojito"
@@ -147,6 +166,7 @@
result = "mojito"
required_reagents = list("rum" = 1, "sugar" = 1, "limejuice" = 1, "sodawater" = 1)
result_amount = 4
+ mix_sound = 'sound/goonstation/misc/drinkfizz.ogg'
/datum/chemical_reaction/martini
name = "Classic Martini"
@@ -154,6 +174,7 @@
result = "martini"
required_reagents = list("gin" = 2, "vermouth" = 1)
result_amount = 3
+ mix_sound = 'sound/goonstation/misc/drinkfizz.ogg'
/datum/chemical_reaction/vodkamartini
name = "Vodka Martini"
@@ -161,6 +182,7 @@
result = "vodkamartini"
required_reagents = list("vodka" = 2, "vermouth" = 1)
result_amount = 3
+ mix_sound = 'sound/goonstation/misc/drinkfizz.ogg'
/datum/chemical_reaction/white_russian
name = "White Russian"
@@ -168,6 +190,7 @@
result = "whiterussian"
required_reagents = list("blackrussian" = 3, "cream" = 2)
result_amount = 5
+ mix_sound = 'sound/goonstation/misc/drinkfizz.ogg'
/datum/chemical_reaction/whiskey_cola
name = "Whiskey Cola"
@@ -175,6 +198,7 @@
result = "whiskeycola"
required_reagents = list("whiskey" = 2, "cola" = 1)
result_amount = 3
+ mix_sound = 'sound/goonstation/misc/drinkfizz.ogg'
/datum/chemical_reaction/screwdriver
name = "Screwdriver"
@@ -182,6 +206,7 @@
result = "screwdrivercocktail"
required_reagents = list("vodka" = 2, "orangejuice" = 1)
result_amount = 3
+ mix_sound = 'sound/goonstation/misc/drinkfizz.ogg'
/datum/chemical_reaction/bloody_mary
name = "Bloody Mary"
@@ -189,6 +214,7 @@
result = "bloodymary"
required_reagents = list("vodka" = 1, "tomatojuice" = 2, "limejuice" = 1)
result_amount = 4
+ mix_sound = 'sound/goonstation/misc/drinkfizz.ogg'
/datum/chemical_reaction/gargle_blaster
name = "Pan-Galactic Gargle Blaster"
@@ -196,6 +222,7 @@
result = "gargleblaster"
required_reagents = list("vodka" = 1, "gin" = 1, "whiskey" = 1, "cognac" = 1, "limejuice" = 1)
result_amount = 5
+ mix_sound = 'sound/goonstation/misc/drinkfizz.ogg'
/datum/chemical_reaction/brave_bull
name = "Brave Bull"
@@ -203,6 +230,7 @@
result = "bravebull"
required_reagents = list("tequilla" = 2, "kahlua" = 1)
result_amount = 3
+ mix_sound = 'sound/goonstation/misc/drinkfizz.ogg'
/datum/chemical_reaction/tequilla_sunrise
name = "Tequilla Sunrise"
@@ -210,6 +238,7 @@
result = "tequillasunrise"
required_reagents = list("tequilla" = 2, "orangejuice" = 1)
result_amount = 3
+ mix_sound = 'sound/goonstation/misc/drinkfizz.ogg'
/datum/chemical_reaction/toxins_special
name = "Toxins Special"
@@ -217,6 +246,7 @@
result = "toxinsspecial"
required_reagents = list("rum" = 2, "vermouth" = 1, "plasma" = 2)
result_amount = 5
+ mix_sound = 'sound/goonstation/misc/drinkfizz.ogg'
/datum/chemical_reaction/beepsky_smash
name = "Beepksy Smash"
@@ -224,6 +254,7 @@
result = "beepskysmash"
required_reagents = list("limejuice" = 2, "whiskey" = 2, "iron" = 1)
result_amount = 4
+ mix_sound = 'sound/goonstation/misc/drinkfizz.ogg'
/datum/chemical_reaction/doctor_delight
name = "The Doctor's Delight"
@@ -231,6 +262,7 @@
result = "doctorsdelight"
required_reagents = list("limejuice" = 1, "tomatojuice" = 1, "orangejuice" = 1, "cream" = 1)
result_amount = 5
+ mix_sound = 'sound/goonstation/misc/drinkfizz.ogg'
/datum/chemical_reaction/irish_cream
name = "Irish Cream"
@@ -238,6 +270,7 @@
result = "irishcream"
required_reagents = list("whiskey" = 2, "cream" = 1)
result_amount = 3
+ mix_sound = 'sound/goonstation/misc/drinkfizz.ogg'
/datum/chemical_reaction/manly_dorf
name = "The Manly Dorf"
@@ -245,6 +278,7 @@
result = "manlydorf"
required_reagents = list ("beer" = 1, "ale" = 2)
result_amount = 3
+ mix_sound = 'sound/goonstation/misc/drinkfizz.ogg'
/datum/chemical_reaction/suicider
name = "Suicider"
@@ -253,6 +287,7 @@
required_reagents = list ("vodka" = 1, "cider" = 1, "fuel" = 1, "epinephrine" = 1)
result_amount = 4
mix_message = "The drinks and chemicals mix together, emitting a potent smell."
+ mix_sound = 'sound/goonstation/misc/drinkfizz.ogg'
/datum/chemical_reaction/irish_coffee
name = "Irish Coffee"
@@ -260,6 +295,7 @@
result = "irishcoffee"
required_reagents = list("irishcream" = 1, "coffee" = 1)
result_amount = 2
+ mix_sound = 'sound/goonstation/misc/drinkfizz.ogg'
/datum/chemical_reaction/b52
name = "B-52"
@@ -267,6 +303,7 @@
result = "b52"
required_reagents = list("irishcream" = 1, "kahlua" = 1, "cognac" = 1)
result_amount = 3
+ mix_sound = 'sound/goonstation/misc/drinkfizz.ogg'
/datum/chemical_reaction/atomicbomb
name = "Atomic Bomb"
@@ -274,6 +311,7 @@
result = "atomicbomb"
required_reagents = list("b52" = 10, "uranium" = 1)
result_amount = 10
+ mix_sound = 'sound/goonstation/misc/drinkfizz.ogg'
/datum/chemical_reaction/margarita
name = "Margarita"
@@ -281,6 +319,7 @@
result = "margarita"
required_reagents = list("tequilla" = 2, "limejuice" = 1)
result_amount = 3
+ mix_sound = 'sound/goonstation/misc/drinkfizz.ogg'
/datum/chemical_reaction/longislandicedtea
name = "Long Island Iced Tea"
@@ -288,6 +327,7 @@
result = "longislandicedtea"
required_reagents = list("vodka" = 1, "gin" = 1, "tequilla" = 1, "cubalibre" = 1)
result_amount = 4
+ mix_sound = 'sound/goonstation/misc/drinkfizz.ogg'
/datum/chemical_reaction/threemileisland
name = "Three Mile Island Iced Tea"
@@ -295,6 +335,7 @@
result = "threemileisland"
required_reagents = list("longislandicedtea" = 10, "uranium" = 1)
result_amount = 10
+ mix_sound = 'sound/goonstation/misc/drinkfizz.ogg'
/datum/chemical_reaction/whiskeysoda
name = "Whiskey Soda"
@@ -302,6 +343,7 @@
result = "whiskeysoda"
required_reagents = list("whiskey" = 2, "sodawater" = 1)
result_amount = 3
+ mix_sound = 'sound/goonstation/misc/drinkfizz.ogg'
/datum/chemical_reaction/black_russian
name = "Black Russian"
@@ -309,6 +351,7 @@
result = "blackrussian"
required_reagents = list("vodka" = 3, "kahlua" = 2)
result_amount = 5
+ mix_sound = 'sound/goonstation/misc/drinkfizz.ogg'
/datum/chemical_reaction/manhattan
name = "Manhattan"
@@ -316,6 +359,7 @@
result = "manhattan"
required_reagents = list("whiskey" = 2, "vermouth" = 1)
result_amount = 3
+ mix_sound = 'sound/goonstation/misc/drinkfizz.ogg'
/datum/chemical_reaction/manhattan_proj
name = "Manhattan Project"
@@ -323,6 +367,7 @@
result = "manhattan_proj"
required_reagents = list("manhattan" = 10, "uranium" = 1)
result_amount = 10
+ mix_sound = 'sound/goonstation/misc/drinkfizz.ogg'
/datum/chemical_reaction/vodka_tonic
name = "Vodka and Tonic"
@@ -330,6 +375,7 @@
result = "vodkatonic"
required_reagents = list("vodka" = 2, "tonic" = 1)
result_amount = 3
+ mix_sound = 'sound/goonstation/misc/drinkfizz.ogg'
/datum/chemical_reaction/gin_fizz
name = "Gin Fizz"
@@ -337,6 +383,7 @@
result = "ginfizz"
required_reagents = list("gin" = 2, "sodawater" = 1, "limejuice" = 1)
result_amount = 4
+ mix_sound = 'sound/goonstation/misc/drinkfizz.ogg'
/datum/chemical_reaction/bahama_mama
name = "Bahama mama"
@@ -344,6 +391,7 @@
result = "bahama_mama"
required_reagents = list("rum" = 2, "orangejuice" = 2, "limejuice" = 1, "ice" = 1)
result_amount = 6
+ mix_sound = 'sound/goonstation/misc/drinkfizz.ogg'
/datum/chemical_reaction/singulo
name = "Singulo"
@@ -351,6 +399,7 @@
result = "singulo"
required_reagents = list("vodka" = 5, "radium" = 1, "wine" = 5)
result_amount = 10
+ mix_sound = 'sound/goonstation/misc/drinkfizz.ogg'
/datum/chemical_reaction/alliescocktail
name = "Allies Cocktail"
@@ -358,6 +407,7 @@
result = "alliescocktail"
required_reagents = list("martini" = 1, "vodka" = 1)
result_amount = 2
+ mix_sound = 'sound/goonstation/misc/drinkfizz.ogg'
/datum/chemical_reaction/demonsblood
name = "Demons Blood"
@@ -365,6 +415,7 @@
result = "demonsblood"
required_reagents = list("rum" = 1, "spacemountainwind" = 1, "blood" = 1, "dr_gibb" = 1)
result_amount = 4
+ mix_sound = 'sound/goonstation/misc/drinkfizz.ogg'
/datum/chemical_reaction/booger
name = "Booger"
@@ -372,6 +423,7 @@
result = "booger"
required_reagents = list("cream" = 1, "banana" = 1, "rum" = 1, "watermelonjuice" = 1)
result_amount = 4
+ mix_sound = 'sound/goonstation/misc/drinkfizz.ogg'
/datum/chemical_reaction/antifreeze
name = "Anti-freeze"
@@ -379,6 +431,7 @@
result = "antifreeze"
required_reagents = list("vodka" = 2, "cream" = 1, "ice" = 1)
result_amount = 4
+ mix_sound = 'sound/goonstation/misc/drinkfizz.ogg'
/datum/chemical_reaction/barefoot
name = "Barefoot"
@@ -386,6 +439,7 @@
result = "barefoot"
required_reagents = list("berryjuice" = 1, "cream" = 1, "vermouth" = 1)
result_amount = 3
+ mix_sound = 'sound/goonstation/misc/drinkfizz.ogg'
////DRINKS THAT REQUIRED IMPROVED SPRITES BELOW:: -Agouri/////
@@ -396,6 +450,7 @@
result = "sbiten"
required_reagents = list("vodka" = 10, "capsaicin" = 1)
result_amount = 10
+ mix_sound = 'sound/goonstation/misc/drinkfizz.ogg'
/datum/chemical_reaction/red_mead
name = "Red Mead"
@@ -403,6 +458,7 @@
result = "red_mead"
required_reagents = list("blood" = 1, "mead" = 1)
result_amount = 2
+ mix_sound = 'sound/goonstation/misc/drinkfizz.ogg'
/datum/chemical_reaction/mead
name = "Mead"
@@ -411,6 +467,7 @@
required_reagents = list("sugar" = 1, "water" = 1)
required_catalysts = list("enzyme" = 5)
result_amount = 2
+ mix_sound = 'sound/goonstation/misc/drinkfizz.ogg'
/datum/chemical_reaction/iced_beer
name = "Iced Beer"
@@ -418,6 +475,7 @@
result = "iced_beer"
required_reagents = list("beer" = 10, "frostoil" = 1)
result_amount = 10
+ mix_sound = 'sound/goonstation/misc/drinkfizz.ogg'
/datum/chemical_reaction/iced_beer2
name = "Iced Beer"
@@ -425,6 +483,7 @@
result = "iced_beer"
required_reagents = list("beer" = 5, "ice" = 1)
result_amount = 6
+ mix_sound = 'sound/goonstation/misc/drinkfizz.ogg'
/datum/chemical_reaction/grog
name = "Grog"
@@ -432,6 +491,7 @@
result = "grog"
required_reagents = list("rum" = 1, "water" = 1)
result_amount = 2
+ mix_sound = 'sound/goonstation/misc/drinkfizz.ogg'
/datum/chemical_reaction/soy_latte
name = "Soy Latte"
@@ -439,6 +499,7 @@
result = "soy_latte"
required_reagents = list("coffee" = 1, "soymilk" = 1)
result_amount = 2
+ mix_sound = 'sound/goonstation/misc/drinkfizz.ogg'
/datum/chemical_reaction/cafe_latte
name = "Cafe Latte"
@@ -446,6 +507,7 @@
result = "cafe_latte"
required_reagents = list("coffee" = 1, "milk" = 1)
result_amount = 2
+ mix_sound = 'sound/goonstation/misc/drinkfizz.ogg'
/datum/chemical_reaction/acidspit
name = "Acid Spit"
@@ -453,6 +515,7 @@
result = "acidspit"
required_reagents = list("sacid" = 1, "wine" = 5)
result_amount = 6
+ mix_sound = 'sound/goonstation/misc/drinkfizz.ogg'
/datum/chemical_reaction/amasec
name = "Amasec"
@@ -460,6 +523,7 @@
result = "amasec"
required_reagents = list("iron" = 1, "wine" = 5, "vodka" = 5)
result_amount = 10
+ mix_sound = 'sound/goonstation/misc/drinkfizz.ogg'
/datum/chemical_reaction/changelingsting
name = "Changeling Sting"
@@ -467,6 +531,7 @@
result = "changelingsting"
required_reagents = list("screwdrivercocktail" = 1, "limejuice" = 1, "lemonjuice" = 1)
result_amount = 5
+ mix_sound = 'sound/goonstation/misc/drinkfizz.ogg'
/datum/chemical_reaction/aloe
name = "Aloe"
@@ -474,6 +539,7 @@
result = "aloe"
required_reagents = list("cream" = 1, "whiskey" = 1, "watermelonjuice" = 1)
result_amount = 2
+ mix_sound = 'sound/goonstation/misc/drinkfizz.ogg'
/datum/chemical_reaction/andalusia
name = "Andalusia"
@@ -481,6 +547,7 @@
result = "andalusia"
required_reagents = list("rum" = 1, "whiskey" = 1, "lemonjuice" = 1)
result_amount = 3
+ mix_sound = 'sound/goonstation/misc/drinkfizz.ogg'
/datum/chemical_reaction/neurotoxin
name = "Neurotoxin"
@@ -488,6 +555,7 @@
result = "neurotoxin"
required_reagents = list("gargleblaster" = 1, "ether" = 1)
result_amount = 2
+ mix_sound = 'sound/goonstation/misc/drinkfizz.ogg'
/datum/chemical_reaction/snowwhite
name = "Snow White"
@@ -495,6 +563,7 @@
result = "snowwhite"
required_reagents = list("beer" = 1, "lemon_lime" = 1)
result_amount = 2
+ mix_sound = 'sound/goonstation/misc/drinkfizz.ogg'
/datum/chemical_reaction/irishcarbomb
name = "Irish Car Bomb"
@@ -502,6 +571,7 @@
result = "irishcarbomb"
required_reagents = list("ale" = 1, "irishcream" = 1)
result_amount = 2
+ mix_sound = 'sound/goonstation/misc/drinkfizz.ogg'
/datum/chemical_reaction/syndicatebomb
name = "Syndicate Bomb"
@@ -509,6 +579,7 @@
result = "syndicatebomb"
required_reagents = list("beer" = 1, "whiskeycola" = 1)
result_amount = 2
+ mix_sound = 'sound/goonstation/misc/drinkfizz.ogg'
/datum/chemical_reaction/erikasurprise
name = "Erika Surprise"
@@ -516,6 +587,7 @@
result = "erikasurprise"
required_reagents = list("ale" = 1, "limejuice" = 1, "whiskey" = 1, "banana" = 1, "ice" = 1)
result_amount = 5
+ mix_sound = 'sound/goonstation/misc/drinkfizz.ogg'
/datum/chemical_reaction/devilskiss
name = "Devils Kiss"
@@ -523,6 +595,7 @@
result = "devilskiss"
required_reagents = list("blood" = 1, "kahlua" = 1, "rum" = 1)
result_amount = 3
+ mix_sound = 'sound/goonstation/misc/drinkfizz.ogg'
/datum/chemical_reaction/hippiesdelight
name = "Hippies Delight"
@@ -530,6 +603,7 @@
result = "hippiesdelight"
required_reagents = list("psilocybin" = 1, "gargleblaster" = 1)
result_amount = 2
+ mix_sound = 'sound/goonstation/misc/drinkfizz.ogg'
/datum/chemical_reaction/bananahonk
name = "Banana Honk"
@@ -537,6 +611,7 @@
result = "bananahonk"
required_reagents = list("banana" = 1, "cream" = 1, "sugar" = 1)
result_amount = 3
+ mix_sound = 'sound/goonstation/misc/drinkfizz.ogg'
/datum/chemical_reaction/silencer
name = "Silencer"
@@ -544,6 +619,7 @@
result = "silencer"
required_reagents = list("nothing" = 1, "cream" = 1, "sugar" = 1)
result_amount = 3
+ mix_sound = 'sound/goonstation/misc/drinkfizz.ogg'
/datum/chemical_reaction/driestmartini
name = "Driest Martini"
@@ -551,6 +627,7 @@
result = "driestmartini"
required_reagents = list("nothing" = 1, "gin" = 1)
result_amount = 2
+ mix_sound = 'sound/goonstation/misc/drinkfizz.ogg'
/datum/chemical_reaction/lemonade
name = "Lemonade"
@@ -558,6 +635,7 @@
result = "lemonade"
required_reagents = list("lemonjuice" = 1, "sugar" = 1, "water" = 1)
result_amount = 3
+ mix_sound = 'sound/goonstation/misc/drinkfizz.ogg'
/datum/chemical_reaction/kiraspecial
name = "Kira Special"
@@ -565,6 +643,7 @@
result = "kiraspecial"
required_reagents = list("orangejuice" = 1, "limejuice" = 1, "sodawater" = 1)
result_amount = 2
+ mix_sound = 'sound/goonstation/misc/drinkfizz.ogg'
/datum/chemical_reaction/brownstar
name = "Brown Star"
@@ -572,6 +651,7 @@
result = "brownstar"
required_reagents = list("orangejuice" = 2, "cola" = 1)
result_amount = 2
+ mix_sound = 'sound/goonstation/misc/drinkfizz.ogg'
/datum/chemical_reaction/milkshake
name = "Milkshake"
@@ -579,10 +659,12 @@
result = "milkshake"
required_reagents = list("cream" = 1, "ice" = 2, "milk" = 2)
result_amount = 5
+ mix_sound = 'sound/goonstation/misc/drinkfizz.ogg'
/datum/chemical_reaction/rewriter
name = "Rewriter"
id = "rewriter"
result = "rewriter"
required_reagents = list("spacemountainwind" = 1, "coffee" = 1)
- result_amount = 2
\ No newline at end of file
+ result_amount = 2
+ mix_sound = 'sound/goonstation/misc/drinkfizz.ogg'
\ No newline at end of file
diff --git a/code/modules/reagents/oldchem/chemical_reaction/chemical_reaction_med.dm b/code/modules/reagents/oldchem/chemical_reaction/chemical_reaction_med.dm
index e44a166a87a..468316eab15 100644
--- a/code/modules/reagents/oldchem/chemical_reaction/chemical_reaction_med.dm
+++ b/code/modules/reagents/oldchem/chemical_reaction/chemical_reaction_med.dm
@@ -21,6 +21,7 @@
required_reagents = list("cryostylane" = 1, "plasma" = 1, "acetone" = 1, "mutagen" = 1)
result_amount = 4
mix_message = "The solution bubbles softly."
+ mix_sound = 'sound/goonstation/misc/drinkfizz.ogg'
spaceacillin
name = "Spaceacillin"
diff --git a/code/modules/reagents/oldchem/chemical_reaction/chemical_reaction_misc.dm b/code/modules/reagents/oldchem/chemical_reaction/chemical_reaction_misc.dm
index 7b2cc0615b0..ff544e9129a 100644
--- a/code/modules/reagents/oldchem/chemical_reaction/chemical_reaction_misc.dm
+++ b/code/modules/reagents/oldchem/chemical_reaction/chemical_reaction_misc.dm
@@ -172,6 +172,7 @@
required_reagents = list("mercury" = 1, "sugar" = 1, "lithium" = 1)
result_amount = 3
mix_message = "Slightly dizzying fumes drift from the solution."
+ mix_sound = 'sound/goonstation/misc/drinkfizz.ogg'
lube
name = "Space Lube"
diff --git a/sound/goonstation/misc/Scissor.ogg b/sound/goonstation/misc/Scissor.ogg
new file mode 100644
index 00000000000..69fc6a399f3
Binary files /dev/null and b/sound/goonstation/misc/Scissor.ogg differ
diff --git a/sound/goonstation/misc/drinkfizz.ogg b/sound/goonstation/misc/drinkfizz.ogg
new file mode 100644
index 00000000000..43d928b93c1
Binary files /dev/null and b/sound/goonstation/misc/drinkfizz.ogg differ
diff --git a/sound/goonstation/misc/fuse.ogg b/sound/goonstation/misc/fuse.ogg
new file mode 100644
index 00000000000..199f20674da
Binary files /dev/null and b/sound/goonstation/misc/fuse.ogg differ
diff --git a/sound/goonstation/misc/matchstick_light.ogg b/sound/goonstation/misc/matchstick_light.ogg
new file mode 100644
index 00000000000..af8dacdf5d5
Binary files /dev/null and b/sound/goonstation/misc/matchstick_light.ogg differ