diff --git a/code/controllers/Processes/shuttles/supply.dm b/code/controllers/Processes/shuttles/supply.dm index a32ac4a3d0b..0954436247d 100644 --- a/code/controllers/Processes/shuttles/supply.dm +++ b/code/controllers/Processes/shuttles/supply.dm @@ -288,6 +288,7 @@ return var/obj/item/weapon/paper/reqform = new /obj/item/weapon/paper(_loc) + playsound(_loc, "sound/goonstation/machines/printer_thermal.ogg", 50, 1) reqform.name = "Requisition Form - [crates] '[object.name]' for [orderedby]" reqform.info += "

[station_name] Supply Requisition Form

" reqform.info += "INDEX: #[shuttle_master.ordernum]
" diff --git a/code/game/gamemodes/blob/blob_report.dm b/code/game/gamemodes/blob/blob_report.dm index 816dce84008..9ebb20a299f 100644 --- a/code/game/gamemodes/blob/blob_report.dm +++ b/code/game/gamemodes/blob/blob_report.dm @@ -46,6 +46,7 @@ comm.messagetext.Add(intercepttext) if(!(comm.stat & (BROKEN | NOPOWER)) && comm.prints_intercept) var/obj/item/weapon/paper/intercept = new /obj/item/weapon/paper( comm.loc ) + playsound(comm.loc, "sound/goonstation/machines/printer_dotmatrix.ogg", 50, 1) intercept.name = "Classified Central Command Update" intercept.info = intercepttext command_announcement.Announce("A report has been downloaded and printed out at all communications consoles.", "Incoming Classified Message", 'sound/AI/commandreport.ogg') diff --git a/code/game/machinery/adv_med.dm b/code/game/machinery/adv_med.dm index 0b34638ef44..f0df15af4fe 100644 --- a/code/game/machinery/adv_med.dm +++ b/code/game/machinery/adv_med.dm @@ -447,6 +447,7 @@ printing = 1 visible_message("\The [src] rattles and prints out a sheet of paper.") var/obj/item/weapon/paper/P = new /obj/item/weapon/paper(loc) + playsound(loc, "sound/goonstation/machines/printer_dotmatrix.ogg", 50, 1) P.info = "
Body Scan - [href_list["name"]]

" P.info += "Time of scan: [worldtime2text(world.time)]

" P.info += "[printing_text]" diff --git a/code/game/machinery/computer/card.dm b/code/game/machinery/computer/card.dm index 165e30b4ebb..33442e8403e 100644 --- a/code/game/machinery/computer/card.dm +++ b/code/game/machinery/computer/card.dm @@ -358,6 +358,7 @@ var/time_last_changed_position = 0 if ("print") if (!printing) printing = 1 + playsound(loc, "sound/goonstation/machines/printer_dotmatrix.ogg", 50, 1) spawn(50) printing = null nanomanager.update_uis(src) diff --git a/code/game/machinery/computer/medical.dm b/code/game/machinery/computer/medical.dm index 2e1853c598f..ddcff089b81 100644 --- a/code/game/machinery/computer/medical.dm +++ b/code/game/machinery/computer/medical.dm @@ -464,6 +464,7 @@ if (href_list["print_p"]) if (!( src.printing )) src.printing = 1 + playsound(loc, "sound/goonstation/machines/printer_dotmatrix.ogg", 50, 1) sleep(50) var/obj/item/weapon/paper/P = new /obj/item/weapon/paper( src.loc ) P.info = "
Medical Record

" diff --git a/code/game/machinery/computer/message.dm b/code/game/machinery/computer/message.dm index 136abe54100..85d4807b355 100644 --- a/code/game/machinery/computer/message.dm +++ b/code/game/machinery/computer/message.dm @@ -62,6 +62,7 @@ src.spark_system.start() var/obj/item/weapon/paper/monitorkey/MK = new/obj/item/weapon/paper/monitorkey MK.loc = src.loc + playsound(loc, "sound/goonstation/machines/printer_dotmatrix.ogg", 50, 1) // Will help make emagging the console not so easy to get away with. MK.info += "

£%@%(*$%&(£&?*(%&£/{}" update_icon() diff --git a/code/game/machinery/computer/security.dm b/code/game/machinery/computer/security.dm index f54365c2c05..06ea4dd8702 100644 --- a/code/game/machinery/computer/security.dm +++ b/code/game/machinery/computer/security.dm @@ -322,6 +322,7 @@ What a mess.*/ if ("Print Record") if (!( printing )) printing = 1 + playsound(loc, "sound/goonstation/machines/printer_dotmatrix.ogg", 50, 1) sleep(50) var/obj/item/weapon/paper/P = new /obj/item/weapon/paper( loc ) P.info = "
Security Record

" @@ -344,6 +345,7 @@ What a mess.*/ if ("Print Photo") if(!printing) printing = 1 + playsound(loc, "sound/goonstation/machines/printer_dotmatrix.ogg", 50, 1) sleep(50) if(istype(active1, /datum/data/record) && data_core.general.Find(active1)) create_record_photo(active1) diff --git a/code/game/machinery/computer/skills.dm b/code/game/machinery/computer/skills.dm index 3dc5a599a6e..5ddc91bfa72 100644 --- a/code/game/machinery/computer/skills.dm +++ b/code/game/machinery/computer/skills.dm @@ -255,6 +255,7 @@ What a mess.*/ if ("Print Record") if (!( printing )) printing = 1 + playsound(loc, "sound/goonstation/machines/printer_dotmatrix.ogg", 50, 1) sleep(50) var/obj/item/weapon/paper/P = new /obj/item/weapon/paper( loc ) P.info = "
Employment Record

" diff --git a/code/game/machinery/guestpass.dm b/code/game/machinery/guestpass.dm index 16849268b35..77eed46c4e2 100644 --- a/code/game/machinery/guestpass.dm +++ b/code/game/machinery/guestpass.dm @@ -153,6 +153,7 @@ //usr << "Printing the log, standby..." //sleep(50) var/obj/item/weapon/paper/P = new/obj/item/weapon/paper( loc ) + playsound(loc, "sound/goonstation/machines/printer_dotmatrix.ogg", 50, 1) P.name = "activity log" P.info = dat diff --git a/code/game/objects/items/devices/autopsy.dm b/code/game/objects/items/devices/autopsy.dm index 6f815fee0c9..54056c0942e 100644 --- a/code/game/objects/items/devices/autopsy.dm +++ b/code/game/objects/items/devices/autopsy.dm @@ -151,6 +151,7 @@ for(var/mob/O in viewers(usr)) O.show_message("\red \the [src] rattles and prints out a sheet of paper.", 1) + playsound(loc, "sound/goonstation/machines/printer_thermal.ogg", 50, 1) sleep(10) var/obj/item/weapon/paper/P = new(usr.loc) diff --git a/code/game/objects/items/devices/taperecorder.dm b/code/game/objects/items/devices/taperecorder.dm index ebaff840df5..7b56b34090a 100644 --- a/code/game/objects/items/devices/taperecorder.dm +++ b/code/game/objects/items/devices/taperecorder.dm @@ -93,7 +93,7 @@ mytape.storedinfo += "\[[time2text(mytape.used_capacity * 10,"mm:ss")]\] [M.name] exclaims, \"[msg]\"" return mytape.storedinfo += "\[[time2text(mytape.used_capacity * 10,"mm:ss")]\] [M.name] says, \"[msg]\"" - + /obj/item/device/taperecorder/hear_message(mob/living/M as mob, msg) if(mytape && recording) mytape.timestamp += mytape.used_capacity @@ -221,6 +221,7 @@ return usr << "Transcript printed." + playsound(loc, "sound/goonstation/machines/printer_thermal.ogg", 50, 1) var/obj/item/weapon/paper/P = new /obj/item/weapon/paper(get_turf(src)) var/t1 = "Transcript:

" for(var/i = 1, mytape.storedinfo.len >= i, i++) 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/game/sound.dm b/code/game/sound.dm index 0d601c280be..1470bf2be97 100644 --- a/code/game/sound.dm +++ b/code/game/sound.dm @@ -10,6 +10,7 @@ var/list/swing_hit_sound = list('sound/weapons/genhit1.ogg', 'sound/weapons/genh var/list/hiss_sound = list('sound/voice/hiss1.ogg','sound/voice/hiss2.ogg','sound/voice/hiss3.ogg','sound/voice/hiss4.ogg') var/list/page_sound = list('sound/effects/pageturn1.ogg', 'sound/effects/pageturn2.ogg','sound/effects/pageturn3.ogg') //var/list/gun_sound = list('sound/weapons/Gunshot.ogg', 'sound/weapons/Gunshot2.ogg','sound/weapons/Gunshot3.ogg','sound/weapons/Gunshot4.ogg') +var/list/computer_ambience = list('sound/goonstation/machines/ambicomp1.ogg', 'sound/goonstation/machines/ambicomp2.ogg', 'sound/goonstation/machines/ambicomp3.ogg') /proc/playsound(var/atom/source, soundin, vol as num, vary, extrarange as num, falloff, var/is_global) @@ -117,4 +118,5 @@ var/const/FALLOFF_SOUNDS = 0.5 if ("hiss") soundin = pick(hiss_sound) if ("pageturn") soundin = pick(page_sound) //if ("gunshot") soundin = pick(gun_sound) + if("computer_ambience") soundin = pick(computer_ambience) return soundin diff --git a/code/modules/clothing/clothing.dm b/code/modules/clothing/clothing.dm index f7f3ec32ac7..2fd455ae391 100644 --- a/code/modules/clothing/clothing.dm +++ b/code/modules/clothing/clothing.dm @@ -378,6 +378,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/detective_work/scanner.dm b/code/modules/detective_work/scanner.dm index 5aec21ac94e..71d0431a420 100644 --- a/code/modules/detective_work/scanner.dm +++ b/code/modules/detective_work/scanner.dm @@ -18,7 +18,7 @@ if(log.len && !scanning) scanning = 1 user << "Printing report, please wait..." - + playsound(loc, "sound/goonstation/machines/printer_thermal.ogg", 50, 1) spawn(100) // Create our paper diff --git a/code/modules/economy/ATM.dm b/code/modules/economy/ATM.dm index d73e93e782f..2f359cd2a39 100644 --- a/code/modules/economy/ATM.dm +++ b/code/modules/economy/ATM.dm @@ -330,6 +330,7 @@ log transactions usr << "The [src.name] flashes an error on its display." return lastprint = world.timeofday + playsound(loc, "sound/goonstation/machines/printer_thermal.ogg", 50, 1) var/obj/item/weapon/paper/R = new(src.loc) R.name = "Account balance: [authenticated_account.owner_name]" R.info = {"NT Automated Teller Account Statement

diff --git a/code/modules/economy/Accounts.dm b/code/modules/economy/Accounts.dm index 493bfdd1e8a..844c5ca8bbf 100644 --- a/code/modules/economy/Accounts.dm +++ b/code/modules/economy/Accounts.dm @@ -89,6 +89,7 @@ var/global/list/all_money_accounts = list() var/obj/item/smallDelivery/P = new /obj/item/smallDelivery(source_db.loc) var/obj/item/weapon/paper/R = new /obj/item/weapon/paper(P) + playsound(source_db.loc, "sound/goonstation/machines/printer_thermal.ogg", 50, 1) P.wrapped = R R.name = "Account information: [M.owner_name]" diff --git a/code/modules/economy/Accounts_DB.dm b/code/modules/economy/Accounts_DB.dm index 2eb5a487bfd..b5cb77880f6 100644 --- a/code/modules/economy/Accounts_DB.dm +++ b/code/modules/economy/Accounts_DB.dm @@ -12,7 +12,7 @@ var/creating_new_account = 0 var/activated = 1 var/const/fund_cap = 1000000 - + light_color = LIGHT_COLOR_GREEN /obj/machinery/computer/account_database/proc/get_access_level(var/mob/user) @@ -127,11 +127,11 @@ ui = new(user, src, ui_key, "accounts_terminal.tmpl", src.name, 400, 640) ui.set_initial_data(data) ui.open() - + /obj/machinery/computer/account_database/Topic(href, href_list) if(..()) return 1 - + if(href_list["insert_card"]) if(held_card) held_card.forceMove(loc) @@ -146,8 +146,8 @@ var/obj/item/weapon/card/id/C = I usr.drop_item() C.forceMove(src) - held_card = C - + held_card = C + if(!get_access_level(usr)) return 1 @@ -176,10 +176,10 @@ if("finalise_create_account") var/account_name = href_list["holder_name"] var/starting_funds = max(text2num(href_list["starting_funds"]), 0) - + starting_funds = Clamp(starting_funds, 0, station_account.money) // Not authorized to put the station in debt. - starting_funds = min(starting_funds, fund_cap) // Not authorized to give more than the fund cap. - + starting_funds = min(starting_funds, fund_cap) // Not authorized to give more than the fund cap. + create_account(account_name, starting_funds, src) if(starting_funds > 0) //subtract the money @@ -218,6 +218,7 @@ if("print") var/text + playsound(loc, "sound/goonstation/machines/printer_thermal.ogg", 50, 1) var/obj/item/weapon/paper/P = new(loc) if (detailed_account_view) P.name = "account #[detailed_account_view.account_number] details" diff --git a/code/modules/economy/EFTPOS.dm b/code/modules/economy/EFTPOS.dm index 30a1cb82af0..729ae67acce 100644 --- a/code/modules/economy/EFTPOS.dm +++ b/code/modules/economy/EFTPOS.dm @@ -26,6 +26,7 @@ linked_account = station_account /obj/item/device/eftpos/proc/print_reference() + playsound(loc, "sound/goonstation/machines/printer_thermal.ogg", 50, 1) var/obj/item/weapon/paper/R = new(src.loc) R.name = "Reference: [eftpos_name]" diff --git a/code/modules/economy/POS.dm b/code/modules/economy/POS.dm index 8cc707f3b2f..1601956e0a0 100644 --- a/code/modules/economy/POS.dm +++ b/code/modules/economy/POS.dm @@ -201,6 +201,7 @@ var/const/POS_HEADER = {" "} receipt += "" + playsound(loc, "sound/goonstation/machines/printer_thermal.ogg", 50, 1) var/obj/item/weapon/paper/P = new(loc) P.name="Receipt #[id]-[++sales]" P.info=receipt diff --git a/code/modules/hydroponics/trays/tray_tools.dm b/code/modules/hydroponics/trays/tray_tools.dm index 0c08ca44949..a25eaec652b 100644 --- a/code/modules/hydroponics/trays/tray_tools.dm +++ b/code/modules/hydroponics/trays/tray_tools.dm @@ -31,6 +31,7 @@ if(!last_data) user << "There is no scan data to print." return + playsound(loc, "sound/goonstation/machines/printer_thermal.ogg", 50, 1) var/obj/item/weapon/paper/P = new /obj/item/weapon/paper(get_turf(src)) P.name = "paper - [form_title]" P.info = "[last_data]" diff --git a/code/modules/library/lib_machines.dm b/code/modules/library/lib_machines.dm index 76e3bd4dd15..3f93963a796 100644 --- a/code/modules/library/lib_machines.dm +++ b/code/modules/library/lib_machines.dm @@ -277,6 +277,7 @@ datum/borrowbook // Datum used to keep track of who has borrowed what when and f if("6") if(!bibledelay) + playsound(loc, "sound/goonstation/machines/printer_dotmatrix.ogg", 50, 1) var/obj/item/weapon/storage/bible/B = new /obj/item/weapon/storage/bible(src.loc) if(ticker && ( ticker.Bible_icon_state && ticker.Bible_item_state) ) B.icon_state = ticker.Bible_icon_state @@ -375,6 +376,7 @@ datum/borrowbook // Datum used to keep track of who has borrowed what when and f var/author = query.item[2] var/title = query.item[3] var/content = query.item[4] + playsound(loc, "sound/goonstation/machines/printer_dotmatrix.ogg", 50, 1) var/obj/item/weapon/book/B = new(src.loc) B.name = "Book: [title]" B.title = title diff --git a/code/modules/paperwork/faxmachine.dm b/code/modules/paperwork/faxmachine.dm index 80319363248..14e3f0d1343 100644 --- a/code/modules/paperwork/faxmachine.dm +++ b/code/modules/paperwork/faxmachine.dm @@ -203,7 +203,8 @@ var/list/alldepartments = list() return 0 //You can't send faxes to "Unknown" flick("faxreceive", src) - playsound(loc, "sound/items/polaroid1.ogg", 50, 1) + + playsound(loc, "sound/goonstation/machines/printer_dotmatrix.ogg", 50, 1) // give the sprite some time to flick sleep(20) diff --git a/code/modules/paperwork/photocopier.dm b/code/modules/paperwork/photocopier.dm index 39c5442c7e7..6630c24d46c 100644 --- a/code/modules/paperwork/photocopier.dm +++ b/code/modules/paperwork/photocopier.dm @@ -45,6 +45,7 @@ if(stat & (BROKEN|NOPOWER)) return + playsound(loc, "sound/goonstation/machines/printer_dotmatrix.ogg", 50, 1) for(var/i = 0, i < copies, i++) if(toner <= 0) break @@ -99,6 +100,7 @@ if (!selection) return + playsound(loc, "sound/goonstation/machines/printer_dotmatrix.ogg", 50, 1) var/obj/item/weapon/photo/p = new /obj/item/weapon/photo (src.loc) p.construct(selection) if (p.desc == "") diff --git a/code/modules/reagents/Chemistry-Machinery.dm b/code/modules/reagents/Chemistry-Machinery.dm index 773f345645a..94491e74e64 100644 --- a/code/modules/reagents/Chemistry-Machinery.dm +++ b/code/modules/reagents/Chemistry-Machinery.dm @@ -478,6 +478,7 @@ src.printing = 1 for(var/mob/O in viewers(usr)) O.show_message("\blue \the [src] rattles and prints out a sheet of paper.", 1) + playsound(loc, "sound/goonstation/machines/printer_dotmatrix.ogg", 50, 1) var/obj/item/weapon/paper/P = new /obj/item/weapon/paper( src.loc ) P.info = "
Chemical Analysis

" P.info += "Time of analysis: [worldtime2text(world.time)]

" 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/code/modules/research/message_server.dm b/code/modules/research/message_server.dm index 9d2c0dd1bb9..9744e726cdc 100644 --- a/code/modules/research/message_server.dm +++ b/code/modules/research/message_server.dm @@ -76,6 +76,8 @@ var/global/list/obj/machinery/message_server/message_servers = list() if(active && (stat & (BROKEN|NOPOWER))) active = 0 return + if(prob(3)) + playsound(loc, "computer_ambience", 50, 1) update_icon() return diff --git a/code/modules/research/server.dm b/code/modules/research/server.dm index c539b0c958f..1bb531051d0 100644 --- a/code/modules/research/server.dm +++ b/code/modules/research/server.dm @@ -13,6 +13,7 @@ var/heating_power = 40000 var/delay = 10 req_access = list(access_rd) //Only the R&D can change server settings. + var/plays_sound = 0 /obj/machinery/r_n_d/server/New() ..() @@ -58,6 +59,9 @@ id_with_download += text2num(N) /obj/machinery/r_n_d/server/process() + if(prob(3) && plays_sound) + playsound(loc, "computer_ambience", 50, 1) + var/datum/gas_mixture/environment = loc.return_air() switch(environment.temperature) if(0 to T0C) @@ -341,6 +345,7 @@ id_with_upload_string = "1;3" id_with_download_string = "1;3" server_id = 1 + plays_sound = 1 /obj/machinery/r_n_d/server/robotics name = "Robotics and Mechanic R&D Server" diff --git a/code/modules/research/xenoarchaeology/machinery/artifact_analyser.dm b/code/modules/research/xenoarchaeology/machinery/artifact_analyser.dm index 130fd8faa05..77b6f688458 100644 --- a/code/modules/research/xenoarchaeology/machinery/artifact_analyser.dm +++ b/code/modules/research/xenoarchaeology/machinery/artifact_analyser.dm @@ -73,6 +73,7 @@ results = get_scan_info(scanned_object) src.visible_message("[name] states, \"Scanning complete.\"") + playsound(loc, "sound/goonstation/machines/printer_dotmatrix.ogg", 50, 1) var/obj/item/weapon/paper/P = new(src.loc) P.name = "[src] report #[++report_num]" P.info = "[src] analysis report #[report_num]
" diff --git a/code/modules/research/xenoarchaeology/machinery/geosample_scanner.dm b/code/modules/research/xenoarchaeology/machinery/geosample_scanner.dm index fc2fe0d2e7a..61915c91e2d 100644 --- a/code/modules/research/xenoarchaeology/machinery/geosample_scanner.dm +++ b/code/modules/research/xenoarchaeology/machinery/geosample_scanner.dm @@ -259,6 +259,7 @@ if(scanned_item) //create report + playsound(loc, "sound/goonstation/machines/printer_dotmatrix.ogg", 50, 1) var/obj/item/weapon/paper/P = new(src) P.name = "[src] report #[++report_num]: [scanned_item.name]" P.stamped = list(/obj/item/weapon/stamp) diff --git a/code/modules/virus2/analyser.dm b/code/modules/virus2/analyser.dm index e68889837c4..770587eee70 100644 --- a/code/modules/virus2/analyser.dm +++ b/code/modules/virus2/analyser.dm @@ -33,6 +33,7 @@ if (dish.virus2.addToDB()) ping("\The [src] pings, \"New pathogen added to data bank.\"") + playsound(loc, "sound/goonstation/machines/printer_dotmatrix.ogg", 50, 1) var/obj/item/weapon/paper/P = new /obj/item/weapon/paper(src.loc) P.name = "paper - [dish.virus2.name()]" diff --git a/code/modules/virus2/centrifuge.dm b/code/modules/virus2/centrifuge.dm index 30805f8c28a..e215e9e6a8c 100644 --- a/code/modules/virus2/centrifuge.dm +++ b/code/modules/virus2/centrifuge.dm @@ -174,6 +174,7 @@ ping("\The [src] pings, \"Pathogen isolated.\"") /obj/machinery/computer/centrifuge/proc/print(var/mob/user) + playsound(loc, "sound/goonstation/machines/printer_dotmatrix.ogg", 50, 1) var/obj/item/weapon/paper/P = new /obj/item/weapon/paper(loc) P.name = "paper - Pathology Report" P.info = {" diff --git a/code/modules/virus2/isolator.dm b/code/modules/virus2/isolator.dm index 41e18e42faa..479b2c7b4d6 100644 --- a/code/modules/virus2/isolator.dm +++ b/code/modules/virus2/isolator.dm @@ -168,6 +168,7 @@ return 1 /obj/machinery/disease2/isolator/proc/print(var/mob/user) + playsound(loc, "sound/goonstation/machines/printer_dotmatrix.ogg", 50, 1) var/obj/item/weapon/paper/P = new /obj/item/weapon/paper(loc) switch (state) diff --git a/sound/goonstation/machines/ambicomp1.ogg b/sound/goonstation/machines/ambicomp1.ogg new file mode 100644 index 00000000000..524aaa432a3 Binary files /dev/null and b/sound/goonstation/machines/ambicomp1.ogg differ diff --git a/sound/goonstation/machines/ambicomp2.ogg b/sound/goonstation/machines/ambicomp2.ogg new file mode 100644 index 00000000000..66fc1e918f8 Binary files /dev/null and b/sound/goonstation/machines/ambicomp2.ogg differ diff --git a/sound/goonstation/machines/ambicomp3.ogg b/sound/goonstation/machines/ambicomp3.ogg new file mode 100644 index 00000000000..6c59e0e0d26 Binary files /dev/null and b/sound/goonstation/machines/ambicomp3.ogg differ diff --git a/sound/goonstation/machines/printer_dotmatrix.ogg b/sound/goonstation/machines/printer_dotmatrix.ogg new file mode 100644 index 00000000000..272a2dab226 Binary files /dev/null and b/sound/goonstation/machines/printer_dotmatrix.ogg differ diff --git a/sound/goonstation/machines/printer_thermal.ogg b/sound/goonstation/machines/printer_thermal.ogg new file mode 100644 index 00000000000..ca12dffa6f3 Binary files /dev/null and b/sound/goonstation/machines/printer_thermal.ogg differ 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