From c6ae0b727593d513721d04ff384a28f192f506aa Mon Sep 17 00:00:00 2001 From: Iamgoofball Date: Wed, 23 Oct 2024 12:31:42 -0700 Subject: [PATCH 01/11] [NON-MODULAR] Adds 20 more slots I'm out of character slots I must create more creatures (#2234) ## About The Pull Request Adds 20 more slots I'm out of character slots I must create more creatures ## Why It's Good For The Game I'm out of slots and need more ## Proof Of Testing i changed a number ## Changelog :cl: add: Adds 20 more slots for free players and up to 100 slots for BYOND members /:cl: --- code/modules/client/preferences.dm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/code/modules/client/preferences.dm b/code/modules/client/preferences.dm index c6cd7d3d129..312d6f38927 100644 --- a/code/modules/client/preferences.dm +++ b/code/modules/client/preferences.dm @@ -9,7 +9,7 @@ GLOBAL_LIST_EMPTY(preferences_datums) /// Ensures that we always load the last used save, QOL var/default_slot = 1 /// The maximum number of slots we're allowed to contain - var/max_save_slots = 30 //SKYRAT EDIT - ORIGINAL 3 + var/max_save_slots = 50 // BUBBER EDIT: original is 3 /// Bitflags for communications that are muted var/muted = NONE @@ -112,7 +112,7 @@ GLOBAL_LIST_EMPTY(preferences_datums) unlock_content = !!parent.IsByondMember() donator_status = !!GLOB.donator_list[parent.ckey] //SKYRAT EDIT ADD - DONATOR CHECK if(unlock_content || donator_status) //SKYRAT EDIT - ADD DONATOR CHECK - max_save_slots = 50 //SKYRAT EDIT - ORIGINAL 8 + max_save_slots = 100 //SKYRAT EDIT - ORIGINAL 8 else CRASH("attempted to create a preferences datum without a client or mock!") load_savefile() From 22ca0eacd0cd58a815d46354fe1f6f4b03ac431f Mon Sep 17 00:00:00 2001 From: Bubberbot <151680451+Bubberbot@users.noreply.github.com> Date: Wed, 23 Oct 2024 21:32:07 +0200 Subject: [PATCH 02/11] Automatic changelog for PR #2234 [ci skip] --- html/changelogs/AutoChangeLog-pr-2234.yml | 4 ++++ 1 file changed, 4 insertions(+) create mode 100644 html/changelogs/AutoChangeLog-pr-2234.yml diff --git a/html/changelogs/AutoChangeLog-pr-2234.yml b/html/changelogs/AutoChangeLog-pr-2234.yml new file mode 100644 index 00000000000..bfac1202138 --- /dev/null +++ b/html/changelogs/AutoChangeLog-pr-2234.yml @@ -0,0 +1,4 @@ +author: "Iamgoofball" +delete-after: True +changes: + - rscadd: "Adds 20 more slots for free players and up to 100 slots for BYOND members" \ No newline at end of file From ea16fda5948890faa74f81015da9c7b9299534d9 Mon Sep 17 00:00:00 2001 From: LT3 <83487515+lessthnthree@users.noreply.github.com> Date: Fri, 25 Oct 2024 11:09:30 -0700 Subject: [PATCH 03/11] Subtle PDA indicator (#2243) ## About The Pull Request Adds a span so that you can tell normal PDA messages from subtle ones. ## Why It's Good For The Game You can tell between the two messages types. ## Proof Of Testing
Screenshots/Videos ![image](https://github.com/user-attachments/assets/ff4cb897-d982-48b9-ba3d-fb5986c610ea) ![image](https://github.com/user-attachments/assets/a6d1521f-a8cb-4a50-916f-c8023c5831df)
## Changelog :cl: LT3 qol: Received subtle PDA messages are labelled subtle in the text log /:cl: --- code/__DEFINES/~~bubber_defines/span.dm | 1 + .../programs/messenger/messenger_program.dm | 15 ++++++++++++--- tgstation.dme | 1 + .../tgui-panel/styles/tgchat/chat-dark.scss | 4 ++++ .../tgui-panel/styles/tgchat/chat-light.scss | 4 ++++ 5 files changed, 22 insertions(+), 3 deletions(-) create mode 100644 code/__DEFINES/~~bubber_defines/span.dm diff --git a/code/__DEFINES/~~bubber_defines/span.dm b/code/__DEFINES/~~bubber_defines/span.dm new file mode 100644 index 00000000000..7ab28a8a935 --- /dev/null +++ b/code/__DEFINES/~~bubber_defines/span.dm @@ -0,0 +1 @@ +#define span_subtlepda(str) ("" + str + "") diff --git a/code/modules/modular_computers/file_system/programs/messenger/messenger_program.dm b/code/modules/modular_computers/file_system/programs/messenger/messenger_program.dm index 3bb361eb53f..8968abccd75 100644 --- a/code/modules/modular_computers/file_system/programs/messenger/messenger_program.dm +++ b/code/modules/modular_computers/file_system/programs/messenger/messenger_program.dm @@ -665,10 +665,13 @@ to_chat(listener, "[FOLLOW_LINK(listener, source)] [ghost_message]") // Log to public log log_public_file(public_message) - // BUBBER EDIT CHANGE END if(sender) - to_chat(sender, span_info("PDA message sent to [signal.format_target()]: \"[message]\"")) + if(subtle) + to_chat(sender, span_subtlepda("Subtle PDA message sent to [signal.format_target()]: \"[message]\"")) + else + to_chat(sender, span_info("PDA message sent to [signal.format_target()]: \"[message]\"")) + // BUBBER EDIT CHANGE END if (alert_able && !alert_silenced) computer.send_sound() @@ -688,6 +691,7 @@ var/is_fake_user = is_rigged || is_automated || isnull(signal.data["ref"]) var/fake_name = is_fake_user ? signal.data["fakename"] : null var/fake_job = is_fake_user ? signal.data["fakejob"] : null + var/is_subtle = signal.data["subtle"] // BUBBER EDIT ADDITION - SUBTLE MESSAGES var/sender_ref = signal.data["ref"] @@ -739,7 +743,12 @@ var/inbound_message = "[signal.format_message()]" var/photo_message = signal.data["photo"] ? " (Photo Attached)" : "" - to_chat(messaged_mob, span_infoplain("[icon2html(computer, messaged_mob)] PDA message from [sender_title], \"[inbound_message]\"[photo_message] [reply]")) + // BUBBER EDIT CHANGE BEGIN - SUBTLE MESSAGES + if(is_subtle) + to_chat(messaged_mob, span_subtlepda("[icon2html(computer, messaged_mob)] Subtle PDA message from [sender_title], \"[inbound_message]\"[photo_message] [reply]")) + else + to_chat(messaged_mob, span_infoplain("[icon2html(computer, messaged_mob)] PDA message from [sender_title], \"[inbound_message]\"[photo_message] [reply]")) + // BUBBER EDIT CHANGE END - SUBTLE MESSAGES SEND_SIGNAL(computer, COMSIG_COMPUTER_RECEIVED_MESSAGE, sender_title, inbound_message, photo_message) diff --git a/tgstation.dme b/tgstation.dme index d7b92e8b863..ef155df1f95 100644 --- a/tgstation.dme +++ b/tgstation.dme @@ -503,6 +503,7 @@ #include "code\__DEFINES\~~bubber_defines\research_categories.dm" #include "code\__DEFINES\~~bubber_defines\say.dm" #include "code\__DEFINES\~~bubber_defines\signals.dm" +#include "code\__DEFINES\~~bubber_defines\span.dm" #include "code\__DEFINES\~~bubber_defines\species.dm" #include "code\__DEFINES\~~bubber_defines\status_indicator_defines.dm" #include "code\__DEFINES\~~bubber_defines\storyteller_defines.dm" diff --git a/tgui/packages/tgui-panel/styles/tgchat/chat-dark.scss b/tgui/packages/tgui-panel/styles/tgchat/chat-dark.scss index 715bfbb1216..bfa34346654 100644 --- a/tgui/packages/tgui-panel/styles/tgchat/chat-dark.scss +++ b/tgui/packages/tgui-panel/styles/tgchat/chat-dark.scss @@ -1332,4 +1332,8 @@ $border-width-px: $border-width * 1px; font-weight: bold; font-style: italic; } + +.subtlepda { + color: #eb6bff; +} // SKYRAT EDIT ADDITION END diff --git a/tgui/packages/tgui-panel/styles/tgchat/chat-light.scss b/tgui/packages/tgui-panel/styles/tgchat/chat-light.scss index 20b32a1dba5..25f9a812af4 100644 --- a/tgui/packages/tgui-panel/styles/tgchat/chat-light.scss +++ b/tgui/packages/tgui-panel/styles/tgchat/chat-light.scss @@ -1285,4 +1285,8 @@ $border-width-px: $border-width * 1px; color: #9b6000; } } + +.subtlepda { + color: #9e008c; +} // SKYRAT EDIT ADDITION END From 5908b857dda0fce25b9d3f990d45334d5dc8cbcc Mon Sep 17 00:00:00 2001 From: Bubberbot <151680451+Bubberbot@users.noreply.github.com> Date: Fri, 25 Oct 2024 20:09:58 +0200 Subject: [PATCH 04/11] Automatic changelog for PR #2243 [ci skip] --- html/changelogs/AutoChangeLog-pr-2243.yml | 4 ++++ 1 file changed, 4 insertions(+) create mode 100644 html/changelogs/AutoChangeLog-pr-2243.yml diff --git a/html/changelogs/AutoChangeLog-pr-2243.yml b/html/changelogs/AutoChangeLog-pr-2243.yml new file mode 100644 index 00000000000..ab44d143c4c --- /dev/null +++ b/html/changelogs/AutoChangeLog-pr-2243.yml @@ -0,0 +1,4 @@ +author: "LT3" +delete-after: True +changes: + - qol: "Received subtle PDA messages are labelled subtle in the text log" \ No newline at end of file From e42c97118bb3eb12c96cb7c99329e36d0e9e7829 Mon Sep 17 00:00:00 2001 From: nikothedude <59709059+nikothedude@users.noreply.github.com> Date: Fri, 25 Oct 2024 14:25:07 -0400 Subject: [PATCH 05/11] A few synth wound nerfs, take two (#2230) ## About The Pull Request Now that we're a TG downstream, I can finally modify synth wounds easily T3 blunt wounds only need T1 burn to mold. Heating time reduced to 3s. Wire effectiveness on electrical damage increased across the board. Should be a lot easier to treat. ## Why It's Good For The Game T2 burns tend to overheat dead synths. This was not intended, I just wanted to use burn wounds in the treatment. This fixes this, as T1 is not enough to overheat dead synths. I have literally 0 idea why I made the heating time 7 secs. After playing some robo, I have come to the conclusion that wire effectiveness is just too little. This should help. ## Proof Of Testing Originally tested and made on skyratcode, where it worked fine.
Screenshots/Videos
## Changelog :cl: balance: Synth blunt T3 now requires a T1 burn wound to mold balance: Synth blunt T3 heating step now gives a T1 burn wound balance: Synth blunt T3 heating now takes 3 secs balance: Synth electrical damage is now much more treatable with wires /:cl: --- .../medical/code/wounds/synth/blunt/robotic_blunt.dm | 2 +- .../code/wounds/synth/blunt/robotic_blunt_T3.dm | 4 ++-- .../medical/code/wounds/synth/robotic_pierce.dm | 10 +++++----- .../modules/medical/code/wounds/synth/robotic_slash.dm | 6 +++--- 4 files changed, 11 insertions(+), 11 deletions(-) diff --git a/modular_skyrat/modules/medical/code/wounds/synth/blunt/robotic_blunt.dm b/modular_skyrat/modules/medical/code/wounds/synth/blunt/robotic_blunt.dm index 35b68bf6d8e..87eaaa302b3 100644 --- a/modular_skyrat/modules/medical/code/wounds/synth/blunt/robotic_blunt.dm +++ b/modular_skyrat/modules/medical/code/wounds/synth/blunt/robotic_blunt.dm @@ -167,7 +167,7 @@ RETURN_TYPE(/datum/wound/burn/robotic/overheat) for (var/datum/wound/found_wound as anything in limb.wounds) var/datum/wound_pregen_data/pregen_data = found_wound.get_pregen_data() - if (pregen_data.wound_series == WOUND_SERIES_METAL_BURN_OVERHEAT && found_wound.severity >= WOUND_SEVERITY_SEVERE) // meh solution but whateva + if (pregen_data.wound_series == WOUND_SERIES_METAL_BURN_OVERHEAT && found_wound.severity >= WOUND_SEVERITY_MODERATE) // meh solution but whateva return found_wound return null diff --git a/modular_skyrat/modules/medical/code/wounds/synth/blunt/robotic_blunt_T3.dm b/modular_skyrat/modules/medical/code/wounds/synth/blunt/robotic_blunt_T3.dm index e30c4aeed1c..3ececf6b398 100644 --- a/modular_skyrat/modules/medical/code/wounds/synth/blunt/robotic_blunt_T3.dm +++ b/modular_skyrat/modules/medical/code/wounds/synth/blunt/robotic_blunt_T3.dm @@ -213,10 +213,10 @@ if (HAS_TRAIT(src, TRAIT_WOUND_SCANNED)) delay_mult *= 0.75 - if (!welder.use_tool(target = victim, user = user, delay = 7 SECONDS * delay_mult, volume = 50, extra_checks = CALLBACK(src, PROC_REF(still_exists)))) + if (!welder.use_tool(target = victim, user = user, delay = 3 SECONDS * delay_mult, volume = 50, extra_checks = CALLBACK(src, PROC_REF(still_exists)))) return TRUE - var/wound_path = /datum/wound/burn/robotic/overheat/severe + var/wound_path = /datum/wound/burn/robotic/overheat/moderate if (user != victim && user.combat_mode) wound_path = /datum/wound/burn/robotic/overheat/critical // it really isnt that bad, overheat wounds are a bit funky user.visible_message(span_danger("[user] heats [victim]'s [limb.plaintext_zone] aggressively, overheating it far beyond the necessary point!"), \ diff --git a/modular_skyrat/modules/medical/code/wounds/synth/robotic_pierce.dm b/modular_skyrat/modules/medical/code/wounds/synth/robotic_pierce.dm index 26e8a1ab54d..c34d258c8e0 100644 --- a/modular_skyrat/modules/medical/code/wounds/synth/robotic_pierce.dm +++ b/modular_skyrat/modules/medical/code/wounds/synth/robotic_pierce.dm @@ -42,7 +42,7 @@ process_shock_spark_count_min = 1 wirecut_repair_percent = 0.078 - wire_repair_percent = 0.018 + wire_repair_percent = 0.036 initial_sparks_amount = 1 @@ -85,11 +85,11 @@ process_shock_spark_count_min = 1 wirecut_repair_percent = 0.046 - wire_repair_percent = 0.01 + wire_repair_percent = 0.024 initial_sparks_amount = 3 - status_effect_type = /datum/status_effect/wound/electrical_damage/pierce/moderate + status_effect_type = /datum/status_effect/wound/electrical_damage/pierce/severe a_or_from = "a" @@ -130,11 +130,11 @@ process_shock_spark_count_min = 2 wirecut_repair_percent = 0.032 - wire_repair_percent = 0.008 + wire_repair_percent = 0.017 initial_sparks_amount = 8 - status_effect_type = /datum/status_effect/wound/electrical_damage/pierce/moderate + status_effect_type = /datum/status_effect/wound/electrical_damage/pierce/critical a_or_from = "a" diff --git a/modular_skyrat/modules/medical/code/wounds/synth/robotic_slash.dm b/modular_skyrat/modules/medical/code/wounds/synth/robotic_slash.dm index e478bc3ade7..dc87c679770 100644 --- a/modular_skyrat/modules/medical/code/wounds/synth/robotic_slash.dm +++ b/modular_skyrat/modules/medical/code/wounds/synth/robotic_slash.dm @@ -533,7 +533,7 @@ process_shock_spark_count_min = 1 wirecut_repair_percent = 0.1 - wire_repair_percent = 0.023 + wire_repair_percent = 0.0368 initial_sparks_amount = 1 @@ -576,7 +576,7 @@ process_shock_spark_count_min = 1 wirecut_repair_percent = 0.09 - wire_repair_percent = 0.015 + wire_repair_percent = 0.03 initial_sparks_amount = 3 @@ -621,7 +621,7 @@ process_shock_spark_count_min = 2 wirecut_repair_percent = 0.08 - wire_repair_percent = 0.01 + wire_repair_percent = 0.027 initial_sparks_amount = 8 From b42d78071d1d1f80f57ff26bba564f3c2f673c27 Mon Sep 17 00:00:00 2001 From: Bubberbot <151680451+Bubberbot@users.noreply.github.com> Date: Fri, 25 Oct 2024 20:25:54 +0200 Subject: [PATCH 06/11] Automatic changelog for PR #2230 [ci skip] --- html/changelogs/AutoChangeLog-pr-2230.yml | 7 +++++++ 1 file changed, 7 insertions(+) create mode 100644 html/changelogs/AutoChangeLog-pr-2230.yml diff --git a/html/changelogs/AutoChangeLog-pr-2230.yml b/html/changelogs/AutoChangeLog-pr-2230.yml new file mode 100644 index 00000000000..0117d09dcb2 --- /dev/null +++ b/html/changelogs/AutoChangeLog-pr-2230.yml @@ -0,0 +1,7 @@ +author: "nikothedude" +delete-after: True +changes: + - balance: "Synth blunt T3 now requires a T1 burn wound to mold" + - balance: "Synth blunt T3 heating step now gives a T1 burn wound" + - balance: "Synth blunt T3 heating now takes 3 secs" + - balance: "Synth electrical damage is now much more treatable with wires" \ No newline at end of file From 364e0683d6aa9dcb3d59edcdb556f44231ba3e05 Mon Sep 17 00:00:00 2001 From: Return Date: Fri, 25 Oct 2024 14:14:35 -0500 Subject: [PATCH 07/11] Adds a cooldown to EMP shriek (#2266) ## About The Pull Request This PR adds a cooldown to the Changeling EMP shriek, currently 10 seconds. ## Why It's Good For The Game Every other EMP source in the game is limited in some way, but EMP screech isn't, allowing a changeling to instantly use this ability a ton of times. It instantly kills synths. This will make it possible to survive a ling as a synth now. ## Proof Of Testing https://github.com/user-attachments/assets/7bdccd8c-ddb3-484e-a672-2b7c0cccec25 ## Changelog :cl: ReturnToZender balance: Changeling shrieks now have a 10 second cooldown. /:cl: --- code/modules/antagonists/changeling/powers/shriek.dm | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/code/modules/antagonists/changeling/powers/shriek.dm b/code/modules/antagonists/changeling/powers/shriek.dm index cfbcc7b64ec..4809fbc7aa9 100644 --- a/code/modules/antagonists/changeling/powers/shriek.dm +++ b/code/modules/antagonists/changeling/powers/shriek.dm @@ -43,16 +43,23 @@ chemical_cost = 20 dna_cost = 1 disabled_by_fire = FALSE + COOLDOWN_DECLARE(dissonant_shriek_cooldown) //BUBBER EDIT: DECLARES A COOLDOWN /datum/action/changeling/dissonant_shriek/sting_action(mob/user) ..() if(user.movement_type & VENTCRAWLING) user.balloon_alert(user, "can't shriek in pipes!") return FALSE + //BUBBER EDIT: NO PULSE IF YOU'RE ON COOLDOWN + if(!COOLDOWN_FINISHED(src, dissonant_shriek_cooldown)) + user.balloon_alert(user, "throat is sore!") + return FALSE + //BUBBER EDIT: NO PULSE IF YOU'RE ON COOLDOWN empulse(get_turf(user), 2, 5, 1) for(var/obj/machinery/light/L in range(5, usr)) L.on = TRUE L.break_light_tube() stoplag() + COOLDOWN_START(src, dissonant_shriek_cooldown, 10 SECONDS) //BUBBER EDIT: ADDS A COOLDOWN TO DISSONANT SHRIEK return TRUE From be786b02c4035e1f8888c33eabc1fa4c7351d68d Mon Sep 17 00:00:00 2001 From: Bubberbot <151680451+Bubberbot@users.noreply.github.com> Date: Fri, 25 Oct 2024 21:26:40 +0200 Subject: [PATCH 08/11] Automatic changelog for PR #2266 [ci skip] --- html/changelogs/AutoChangeLog-pr-2266.yml | 4 ++++ 1 file changed, 4 insertions(+) create mode 100644 html/changelogs/AutoChangeLog-pr-2266.yml diff --git a/html/changelogs/AutoChangeLog-pr-2266.yml b/html/changelogs/AutoChangeLog-pr-2266.yml new file mode 100644 index 00000000000..742d927e22c --- /dev/null +++ b/html/changelogs/AutoChangeLog-pr-2266.yml @@ -0,0 +1,4 @@ +author: "ReturnToZender" +delete-after: True +changes: + - balance: "Changeling shrieks now have a 10 second cooldown." \ No newline at end of file From 86c1d1c1a3eab49880e2d6c4f29c636181635340 Mon Sep 17 00:00:00 2001 From: nikothedude <59709059+nikothedude@users.noreply.github.com> Date: Fri, 25 Oct 2024 15:55:06 -0400 Subject: [PATCH 09/11] Yet again, fixes naga footsteps (#2250) ## About The Pull Request Closes https://github.com/Bubberstation/Bubberstation/issues/2245 We need to make sure the args match human args. ## Why It's Good For The Game bugs bad ## Proof Of Testing
Screenshots/Videos https://github.com/user-attachments/assets/8c6684de-e7da-4b58-848c-1e312e4efb6a
## Changelog :cl: fix: Nagas no longer play human footsteps /:cl: --- .../code/modules/taur_mechanics/serpentine_taur.dm | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/modular_zubbers/code/modules/taur_mechanics/serpentine_taur.dm b/modular_zubbers/code/modules/taur_mechanics/serpentine_taur.dm index a09fe1e296a..fb0822e965a 100644 --- a/modular_zubbers/code/modules/taur_mechanics/serpentine_taur.dm +++ b/modular_zubbers/code/modules/taur_mechanics/serpentine_taur.dm @@ -1,12 +1,13 @@ /obj/item/organ/external/taur_body/serpentine/on_mob_insert(mob/living/carbon/organ_owner, special, movement_flags) . = ..() - organ_owner.RemoveElement(/datum/element/footstep, FOOTSTEP_MOB_HUMAN, 0.6, -6) + // These args must be the same as the args used to add the basic human footstep! + organ_owner.RemoveElement(/datum/element/footstep, FOOTSTEP_MOB_HUMAN, 1, -6) organ_owner.AddElement(/datum/element/footstep, FOOTSTEP_MOB_SNAKE, 15, -6) /obj/item/organ/external/taur_body/serpentine/on_mob_remove(mob/living/carbon/organ_owner, special, movement_flags) organ_owner.RemoveElement(/datum/element/footstep, FOOTSTEP_MOB_SNAKE, 15, -6) - organ_owner.AddElement(/datum/element/footstep, FOOTSTEP_MOB_HUMAN, 0.6, -6) + organ_owner.AddElement(/datum/element/footstep, FOOTSTEP_MOB_HUMAN, 1, -6) return ..() From 2c9d438889c76d6c25ff0d3b371ca40820c1f473 Mon Sep 17 00:00:00 2001 From: Bubberbot <151680451+Bubberbot@users.noreply.github.com> Date: Fri, 25 Oct 2024 22:22:45 +0200 Subject: [PATCH 10/11] Automatic changelog for PR #2250 [ci skip] --- html/changelogs/AutoChangeLog-pr-2250.yml | 4 ++++ 1 file changed, 4 insertions(+) create mode 100644 html/changelogs/AutoChangeLog-pr-2250.yml diff --git a/html/changelogs/AutoChangeLog-pr-2250.yml b/html/changelogs/AutoChangeLog-pr-2250.yml new file mode 100644 index 00000000000..14eb746f64e --- /dev/null +++ b/html/changelogs/AutoChangeLog-pr-2250.yml @@ -0,0 +1,4 @@ +author: "nikothedude" +delete-after: True +changes: + - bugfix: "Nagas no longer play human footsteps" \ No newline at end of file From 138be45f921af283413cc7c5947f574f4587a17c Mon Sep 17 00:00:00 2001 From: Waterpig Date: Fri, 25 Oct 2024 23:25:17 +0200 Subject: [PATCH 11/11] upstream-24-10b --- .github/CODEOWNERS | 2 +- .../bubberstation/icemoon_interdyne.dmm | 4 +- ...oon_underground_syndicate_base1_skyrat.dmm | 2 +- .../bubberstation/lavaland_dauntless.dmm | 4 +- ...avaland_surface_syndicate_base1_skyrat.dmm | 2 +- .../bubberstation/space_dauntless.dmm | 4 +- .../SpaceRuins/skyrat/cargodiselost.dmm | 4 +- .../SpaceRuins/skyrat/interdynefob.dmm | 4 +- .../SpaceRuins/skyrat/piratefort.dmm | 2 +- .../SpaceRuins/spacehotel_skyrat.dmm | 2 +- .../IceBoxStation/Icebox_ntrep_office.dmm | 2 +- .../MetaStation/metastation_ntrep_office.dmm | 2 +- .../kilostation/kilostation_ert_bay.dmm | 2 +- .../tramstation/tramstation_ntrep_office.dmm | 2 +- .../wawastation/wawastation_ntrep_office.dmm | 2 +- _maps/map_files/BoxStation/BoxStation.dmm | 10 +- _maps/map_files/KiloStation/KiloStation.dmm | 4 +- _maps/map_files/VoidRaptor/VoidRaptor.dmm | 2 +- _maps/map_files/biodome/biodome.dmm | 8 +- _maps/map_files/generic/CentCom_skyrat_z2.dmm | 2 +- _maps/map_files/moonstation/moonstation.dmm | 10 +- _maps/shuttles/skyrat/goldeneye_cruiser.dmm | 2 +- _maps/shuttles/skyrat/whiteship_blueshift.dmm | 2 +- _maps/shuttles/zubbers/emergency_vortex.dmm | 2 +- .../tramstation/tramstation_cryo.dmm | 2 +- .../wawastation/wawastation_lockers.dmm | 2 +- .../wawastation/wawastation_ntrep_office.dmm | 2 +- code/__DEFINES/~skyrat_defines/span.dm | 3 - code/__HELPERS/priority_announce.dm | 4 +- code/_onclick/hud/hud.dm | 2 + code/controllers/subsystem/job.dm | 16 ++-- code/controllers/subsystem/shuttle.dm | 4 +- code/controllers/subsystem/statpanel.dm | 2 +- code/controllers/subsystem/ticker.dm | 2 +- code/datums/ai/_ai_controller.dm | 70 +++++++++----- code/datums/station_traits/_station_trait.dm | 4 + code/datums/station_traits/job_traits.dm | 2 + .../game/machinery/computer/communications.dm | 2 +- code/game/objects/items/melee/energy.dm | 4 +- code/game/objects/items/tools/weldingtool.dm | 3 - code/game/say.dm | 4 +- code/modules/admin/verbs/adminevents.dm | 4 +- .../admin/view_variables/admin_delete.dm | 2 +- .../antagonists/malf_ai/malf_ai_modules.dm | 2 +- code/modules/buildmode/submodes/advanced.dm | 2 +- code/modules/buildmode/submodes/basic.dm | 2 +- code/modules/buildmode/submodes/delete.dm | 2 +- .../client/preferences/middleware/jobs.dm | 2 +- code/modules/clothing/under/_under.dm | 2 +- code/modules/mob/dead/observer/observer.dm | 2 +- code/modules/mob/living/carbon/examine.dm | 52 ++++++++++- .../mob/living/carbon/human/_species.dm | 6 +- code/modules/mob/living/silicon/ai/ai_say.dm | 2 +- code/modules/mob/mob.dm | 3 +- code/modules/mod/mod_control.dm | 2 +- .../supermatter_delamination/_sm_delam.dm | 2 +- .../delamination_effects.dm | 2 +- .../surgery/organs/external/restyling.dm | 6 +- .../code/datums/components/crusher.dm | 6 +- .../code/datums/components/shielded_suit.dm | 2 +- .../code/datums/votes/_vote_datum.dm | 2 +- .../code/game/objects/items/holy_weapons.dm | 2 +- .../clothing/back/antigravityharness.dm | 4 +- .../head/monkey_magnification_helmet.dm | 6 +- .../modules/mining/equipment/explorer_gear.dm | 2 +- .../mining/equipment/kinetic_crusher.dm | 10 +- .../mining/equipment/kinetic_gauntlets.dm | 32 +++---- .../mob/living/carbon/carbon_defense.dm | 6 +- .../mob/living/simple_animal/friendly/dogs.dm | 2 +- .../mob/living/simple_animal/friendly/pets.dm | 2 +- .../living/simple_animal/friendly/poppy.dm | 2 +- .../simple_animal/friendly/syndicatefox.dm | 2 +- .../simple_animal/hostile/grabbagmob.dm | 86 ++++++++--------- .../code/modules/power/circulator.dm | 2 +- .../modules/Midroundtraitor/code/event.dm | 2 +- .../aesthetics/airlock/code/airlock.dm | 4 +- .../modules/aesthetics/guns/code/guns.dm | 12 +-- .../airlock_override/code/airlock_override.dm | 2 +- .../modules/alerts/code/default_announcer.dm | 4 +- .../ammo_workbench/code/ammo_workbench.dm | 8 +- modular_skyrat/modules/apc_arcing/code/apc.dm | 4 +- .../armaments/code/armament_component.dm | 2 +- .../ashwalkers/code/buildings/ash_tendril.dm | 10 +- .../code/buildings/tendril_cursing.dm | 2 +- .../ashwalkers/code/effects/ash_rituals.dm | 2 +- .../modules/ashwalkers/code/items/ash_tool.dm | 2 +- .../ashwalkers/code/items/ashwalker_shaman.dm | 2 +- .../assault_operatives/code/base_alarm.dm | 2 +- .../code/dynamic_rulsesets_roundstart.dm | 2 +- .../assault_operatives/code/interrogator.dm | 14 +-- .../assault_operatives/code/turrets.dm | 6 +- .../automapper/code/area_spawn_subsystem.dm | 6 +- .../automapper/code/automapper_subsystem.dm | 4 +- .../mothership_astrum/mob.dm | 6 +- .../modules/barricades/code/barricade.dm | 30 +++--- .../modules/basic_mobs/code/chinchilla.dm | 2 +- .../virtual_domains/ancient_milsim/mobs.dm | 2 +- .../modules/black_mesa/code/mobs/headcrab.dm | 2 +- .../modules/black_mesa/code/mobs/houndeye.dm | 2 +- .../black_mesa/code/mobs/human_mobs.dm | 12 +-- .../modules/black_mesa/code/mobs/nihilanth.dm | 8 +- .../black_mesa/code/mobs/vortigaunt.dm | 2 +- .../modules/black_mesa/code/shield_pylon.dm | 2 +- .../modules/black_mesa/code/shockplant.dm | 2 +- .../modules/black_mesa/code/turfs.dm | 2 +- .../modules/black_mesa/code/turrets.dm | 6 +- .../black_mesa/code/uber_teleporter.dm | 4 +- .../bluespace_miner/code/bluespace_miner.dm | 2 +- .../bodyparts/code/_mutant_bodyparts.dm | 8 +- .../modules/bodyparts/code/ghoul_bodyparts.dm | 8 +- modular_skyrat/modules/bongs/code/bong.dm | 2 +- .../modules/borgs/code/robot_items.dm | 24 ++--- .../modules/borgs/code/robot_upgrade.dm | 4 +- .../modules/cargo/code/export_gate.dm | 2 +- .../modules/cargo/code/items/gbp_punchcard.dm | 4 +- .../cargo_teleporter/code/cargo_teleporter.dm | 2 +- .../cell_component/code/cell_component.dm | 4 +- .../modules/cellguns/code/cellgun_cells.dm | 2 +- .../clock_cult/code/actions/recall_slab.dm | 2 +- .../modules/clock_cult/code/items/weaponry.dm | 10 +- .../code/mobs/clockwork_marauder.dm | 6 +- .../scriptures/servitude/hateful_manacles.dm | 2 +- .../code/scriptures/servitude/kindle.dm | 6 +- .../clock_cult/code/structures/_structure.dm | 2 +- .../code/structures/sigil/vitality_sigil.dm | 2 +- modular_skyrat/modules/cme/code/cme.dm | 12 +-- .../code/colony_fabricator.dm | 2 +- .../code/machines/ore_silo.dm | 2 +- .../code/repacking_element.dm | 2 +- .../colony_fabricator/code/tools/tools.dm | 6 +- .../code/armament_datums/put_a_donk_on_it.dm | 4 +- .../code/cortical_borer_items.dm | 4 +- .../modules/cryosleep/code/admin.dm | 2 +- modular_skyrat/modules/cryosleep/code/job.dm | 8 +- .../game/objects/items/devices/ttsdevice.dm | 4 +- .../game/objects/items/plushes.dm | 34 +++---- .../clothing/~donator/donator_clothing.dm | 2 +- .../clothing/~donator/donator_items.dm | 4 +- .../mob/dead/new_player/preferences_setup.dm | 2 +- .../MOD_sprite_accessories/mod_actions.dm | 2 +- .../reagents/chemistry/reagents/drinks.dm | 2 +- .../death_consequences_trauma.dm | 2 +- .../modules/decay_subsystem/code/decaySS.dm | 2 +- .../modules/decay_subsystem/code/nests.dm | 8 +- .../code/chemicals/twitch.dm | 2 +- .../code/healing_stack_items.dm | 2 +- .../delam_emergency_stop/code/scram.dm | 14 +-- .../electric_welder/code/electric_welder.dm | 4 +- .../code/emergency_spacesuit.dm | 2 +- .../emotes/code/additionalemotes/turf_list.dm | 8 +- .../modules/emotes/code/dna_screams.dm | 8 +- modular_skyrat/modules/emotes/code/emotes.dm | 8 +- .../modules/emotes/code/laugh_datums.dm | 14 +-- .../modules/emotes/code/laugh_emotes.dm | 4 +- .../modules/emotes/code/scream_datums.dm | 92 +++++++++---------- .../modules/emotes/code/scream_emote.dm | 6 +- .../modules/emotes/code/synth_emotes.dm | 2 +- .../modules/energy_axe/code/energy_fireaxe.dm | 4 +- modular_skyrat/modules/exp_corps/code/gear.dm | 4 +- .../modules/exp_corps/code/tomahawk.dm | 2 +- .../code/filtersandsetters.dm | 2 +- .../game/objects/items/gladiator_items.dm | 2 +- .../hostile/megafauna/markedone.dm | 15 +-- .../modules/goofsec/code/sol_fed.dm | 20 ++-- .../gun_safety/code/safety_component.dm | 2 +- .../modules/horrorform/code/horror_form.dm | 2 +- .../horrorform/code/true_changeling.dm | 6 +- .../modules/hyposprays/code/hyposprays_II.dm | 4 +- .../modules/icspawning/code/observer.dm | 4 +- .../modules/icspawning/code/spell.dm | 2 +- .../modules/implants/code/augments_arms.dm | 14 +-- .../modules/inflatables/code/inflatable.dm | 4 +- .../modules/jukebox/code/dance_machine.dm | 2 +- .../modules/jukebox/code/ravemod.dm | 2 +- .../modules/liquids/code/cleaning/drains.dm | 2 +- .../modules/liquids/code/ocean_flora.dm | 2 +- .../modules/mapping/code/areas/ruins.dm | 6 +- modular_skyrat/modules/mapping/code/tools.dm | 4 +- .../modules/marines/code/smartgun.dm | 6 +- .../medical/code/anesthetic_machine.dm | 2 +- .../modules/medical/code/trauma_surgery.dm | 2 +- .../wounds/synth/blunt/secures_internals.dm | 2 +- .../code/wounds/synth/robotic_burns.dm | 2 +- .../microfusion/code/microfusion_cell.dm | 4 +- .../code/microfusion_energy_master.dm | 4 +- .../code/microfusion_gun_attachments.dm | 2 +- .../modules/microfusion/code/projectiles.dm | 2 +- modular_skyrat/modules/mining/boulder.dm | 4 +- .../modular_implants/code/misc_devices.dm | 2 +- .../modules/modular_implants/code/nifs.dm | 2 +- .../soulcatcher/attachable_soulcatcher.dm | 2 +- .../code/soulcatcher/handheld_soulcatcher.dm | 4 +- .../modular_items/code/summon_beacon.dm | 2 +- .../code/lewd_clothing/bdsm_mask.dm | 2 +- .../code/lewd_clothing/deprivation_helmet.dm | 12 +-- .../code/lewd_items/attachable_vibrator.dm | 14 +-- .../lewd_items/code/lewd_items/condom.dm | 2 +- .../code/lewd_items/kinky_shocker.dm | 4 +- .../code/lewd_items/leather_whip.dm | 14 +-- .../lewd_items/code/lewd_items/magic_wand.dm | 4 +- .../lewd_items/code/lewd_items/vibrator.dm | 8 +- .../lewd_items/code/lewd_items/vibroring.dm | 2 +- .../code/lewd_structures/bdsm_furniture.dm | 2 +- .../code/lewd_structures/dancing_pole.dm | 2 +- .../nanotrasen_system_inc/pistol.dm | 16 ++-- .../romulus_technology/rifle.dm | 6 +- .../saibasan/laser_guns.dm | 4 +- .../saibasan/mode_datums.dm | 2 +- .../modular_weapons/code/pepperball_gun.dm | 6 +- .../modules/mold/code/mold_controller.dm | 2 +- modular_skyrat/modules/mold/code/mold_mobs.dm | 6 +- .../modules/mold/code/mold_structures.dm | 4 +- .../code/autosurgeon_bodypart.dm | 2 +- .../code/mounted_machine_gun.dm | 6 +- .../modules/mutants/code/mutant_component.dm | 4 +- .../modules/mutants/code/mutant_cure.dm | 10 +- .../modules/mutants/code/mutant_species.dm | 12 +-- .../novaya_ert/code/advanced_choice_beacon.dm | 4 +- .../opposing_force/code/equipment/guns.dm | 2 +- modular_skyrat/modules/organs/code/heart.dm | 2 +- .../modules/paycheck_rations/code/tickets.dm | 10 +- .../primitive_structures/code/fencing.dm | 6 +- modular_skyrat/modules/quirks/good.dm | 8 +- .../modules/reagent_forging/code/anvil.dm | 2 +- .../modules/reagent_forging/code/forge.dm | 6 +- .../reagent_forging/code/forge_weapons.dm | 12 +-- .../code/record_manifest.dm | 2 +- .../modules/resleeving/code/rsd_interface.dm | 2 +- .../modules/rod-stopper/code/rodstopper.dm | 2 +- modular_skyrat/modules/salon/code/hair_tie.dm | 4 +- .../modules/salon/code/straight_razor.dm | 2 +- .../sec_haul/code/misc/bullet_drive.dm | 8 +- .../code/peacekeeper/peacekeeper_hammer.dm | 2 +- .../code/self_actualization_device.dm | 4 +- .../modules/shotgunrebalance/code/shotgun.dm | 4 +- modular_skyrat/modules/space_vines/scythes.dm | 2 +- .../stasisrework/code/stasissleeper.dm | 4 +- modular_skyrat/modules/stone/code/stone.dm | 2 +- .../synths/code/surgery/mechanic_steps.dm | 8 +- .../code/surgery/robot_brain_surgery.dm | 2 +- .../code/surgery/robot_heart_surgery.dm | 4 +- .../code/surgery/robot_liver_surgery.dm | 4 +- .../synths/code/surgery/robot_lung_surgery.dm | 4 +- .../code/surgery/robot_stomach_surgery.dm | 4 +- .../modules/tableflip/code/flipped_table.dm | 4 +- modular_skyrat/modules/tagline/code/world.dm | 4 +- .../modules/tarkon/code/guns/m6pdw.dm | 8 +- .../tarkon/code/guns/resonance_disruptor.dm | 4 +- .../modules/tarkon/code/misc-fluff/spawner.dm | 2 +- .../modules/taur_mechanics/code/constrict.dm | 6 +- .../modules/time_clock/code/console.dm | 4 +- .../code/title_screen_subsystem.dm | 6 +- .../tribal_extended/code/weapons/sword.dm | 2 +- .../modules/trim_tokens/code/trim_tokens.dm | 2 +- modular_skyrat/modules/verbs/code/subtle.dm | 6 +- .../xenos_skyrat_redo/code/human_defense.dm | 6 +- .../code/xeno_types/praetorian.dm | 2 +- .../code/xeno_types/rouny.dm | 2 +- .../subsystem/processing/sol_subsystem.dm | 4 +- .../code/datums/brain_damage/magic.dm | 2 +- .../code/datums/components/vore/_defines.dm | 48 +++++----- .../code/datums/shuttles/emergency.dm | 2 +- .../code/game/Items/big_bertha_shield.dm | 2 +- modular_zubbers/code/game/Items/sec_hailer.dm | 2 +- .../code/game/area/areas/moonstation.dm | 2 +- .../game/machinery/burger_reactor/reactor.dm | 6 +- .../code/game/machinery/crew_monitor.dm | 2 +- .../spawners/random/moonstation_random.dm | 4 +- .../code/game/objects/items/more_pkas.dm | 12 +-- .../code/game/objects/items/plushes.dm | 14 +-- .../game/objects/structures/trash_pile.dm | 30 +++--- modular_zubbers/code/game/traits/neutral.dm | 2 +- .../alt_anomaly_refinery/anomaly_refinery.dm | 2 +- .../bloodsucker/bloodsuckers/life.dm | 2 +- .../bloodsucker/bloodsuckers/objectives.dm | 4 +- .../antagonists/bloodsucker/clans/clan.dm | 2 +- .../bloodsucker/clans/clan_malkavian.dm | 2 +- .../antagonists/bloodsucker/powers/gohome.dm | 2 +- .../bloodsucker/powers/targeted/brawn.dm | 4 +- .../bloodsucker/powers/targeted/haste.dm | 2 +- .../bloodsucker/powers/targeted/trespass.dm | 4 +- .../bloodsucker/powers/tremere/auspex.dm | 4 +- .../bloodsucker/powers/tremere/thaumaturgy.dm | 2 +- .../antagonists/bloodsucker/powers/veil.dm | 2 +- .../bloodsucker/structures/coffin.dm | 2 +- .../bloodsucker/structures/crypt.dm | 4 +- .../bloodsucker/structures/objects.dm | 4 +- .../bloodsucker/vassal/vassal_datum.dm | 6 +- .../bloodsucker/vassal/vassal_procs.dm | 2 +- .../modules/antagonists/malf/remove_malf.dm | 8 +- .../code/modules/antagonists/modglue.dm | 2 +- .../code/loot/arcade_weights_classic.dm | 4 +- .../arcades/code/minesweeper/minesweeper.dm | 2 +- .../code/modules/blooper/bark_list.dm | 8 +- .../code/modules/cargo/expressconsole.dm | 4 +- .../modules/changeling_zombies/infection.dm | 4 +- .../code/modules/changeling_zombies/items.dm | 8 +- .../code/modules/clothing/shoes/boots.dm | 2 +- .../species/synths/death_sound.dm | 2 +- .../code/modules/debug_tools/physgun.dm | 2 +- .../code/modules/debug_tools/phystool.dm | 2 +- modular_zubbers/code/modules/emotes/emotes.dm | 4 +- .../code/modules/job_interns/job_interns.dm | 2 +- .../code/modules/lunchbox/code/lunchbox.dm | 6 +- .../mob/living/basic/moonstation/cazador.dm | 2 +- .../mob/living/basic/moonstation/scorpion.dm | 2 +- .../programs/siliconmanagement.dm | 8 +- .../code/modules/quote_of_the_round/ticker.dm | 2 +- .../modules/security/secmed/security_medic.dm | 2 +- .../code/modules/shuttle/emergency.dm | 4 +- .../code/modules/silicons/borgs/code/robot.dm | 2 +- .../code/modules/silicons/silicon.dm | 4 +- .../spells/spell_types/nerfed_spells.dm | 2 +- .../storyteller/event_defines/crewset/malf.dm | 4 +- .../event_defines/crewset/nuke_ops.dm | 2 +- .../ghostset/lone_infiltrator.dm | 2 +- .../event_defines/ghostset/voidwalker.dm | 4 +- .../code/modules/storyteller/gamemode.dm | 2 +- .../modules/surgery/organs/external/wings.dm | 4 +- .../code/modules/vehicles/mech_fabricator.dm | 2 +- .../modules/wizard_dize/wizard_dice_object.dm | 6 +- .../code/modules/~donator/choicebeacon.dm | 2 +- modular_zubbers/maps/biodome/weapons.dm | 2 +- .../entombed_quirk/code/entombed_mod.dm | 4 +- .../mob/living/carbon/human/examine.dm | 19 ++++ tgstation.dme | 1 + 326 files changed, 948 insertions(+), 850 deletions(-) create mode 100644 modular_zubbers/master_files/code/modules/mob/living/carbon/human/examine.dm diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS index 5054df92acc..5de033b4fca 100644 --- a/.github/CODEOWNERS +++ b/.github/CODEOWNERS @@ -20,4 +20,4 @@ modular_skyrat/modules @projectkepler-ru /code/modules/surgery @Majkl-J /modular_skyrat/master_files/code/modules/surgery @Majkl-J /modular_skyrat/modules/synths @Majkl-J -/modular_zubbers +/modular_zubbers @Majkl-J diff --git a/_maps/RandomRuins/IceRuins/bubberstation/icemoon_interdyne.dmm b/_maps/RandomRuins/IceRuins/bubberstation/icemoon_interdyne.dmm index 45b312c0b1c..02ae56925ef 100644 --- a/_maps/RandomRuins/IceRuins/bubberstation/icemoon_interdyne.dmm +++ b/_maps/RandomRuins/IceRuins/bubberstation/icemoon_interdyne.dmm @@ -2666,7 +2666,7 @@ /area/ruin/syndicate_lava_base/main) "tf" = ( /obj/machinery/light/directional/south, -/obj/machinery/vending/medical/syndicate_access/cybersun{ +/obj/machinery/vending/medical/syndicate/cybersun{ desc = "An advanced vendor that dispenses medical drugs, both recreational and medicinal. It's said to have been salvaged from an old decommissioned Cybersun Cruiser."; name = "\improper SyndiMed ++"; onstation = 0; @@ -7168,7 +7168,7 @@ /area/ruin/syndicate_lava_base/main) "Zi" = ( /obj/effect/turf_decal/tile/bar, -/obj/machinery/vending/boozeomat/syndicate_access{ +/obj/machinery/vending/boozeomat/syndicate{ onstation = 0; onstation_override = 1 }, diff --git a/_maps/RandomRuins/IceRuins/skyrat/icemoon_underground_syndicate_base1_skyrat.dmm b/_maps/RandomRuins/IceRuins/skyrat/icemoon_underground_syndicate_base1_skyrat.dmm index 307c75b0115..a15227c437c 100644 --- a/_maps/RandomRuins/IceRuins/skyrat/icemoon_underground_syndicate_base1_skyrat.dmm +++ b/_maps/RandomRuins/IceRuins/skyrat/icemoon_underground_syndicate_base1_skyrat.dmm @@ -5492,7 +5492,7 @@ /area/ruin/syndicate_lava_base/medbay) "IP" = ( /obj/effect/turf_decal/tile/dark/full, -/obj/machinery/vending/boozeomat/syndicate_access{ +/obj/machinery/vending/boozeomat/syndicate{ onstation = 0 }, /turf/open/floor/iron/dark/textured_large, diff --git a/_maps/RandomRuins/LavaRuins/bubberstation/lavaland_dauntless.dmm b/_maps/RandomRuins/LavaRuins/bubberstation/lavaland_dauntless.dmm index 7336a1da4fc..76a27f38f52 100644 --- a/_maps/RandomRuins/LavaRuins/bubberstation/lavaland_dauntless.dmm +++ b/_maps/RandomRuins/LavaRuins/bubberstation/lavaland_dauntless.dmm @@ -537,7 +537,7 @@ /obj/effect/turf_decal/trimline/dark_blue/filled/line{ dir = 8 }, -/obj/machinery/vending/medical/syndicate_access/cybersun{ +/obj/machinery/vending/medical/syndicate/cybersun{ desc = "An advanced vendor that dispenses medical drugs, both recreational and medicinal. It's said to have been salvaged from an old decommissioned Cybersun Cruiser."; name = "\improper SyndiMed ++"; onstation = 0; @@ -5074,7 +5074,7 @@ /turf/open/floor/stone, /area/ruin/space/has_grav/bubbers/dauntless/service/hydro) "vX" = ( -/obj/machinery/vending/boozeomat/syndicate_access{ +/obj/machinery/vending/boozeomat/syndicate{ onstation = 0; onstation_override = 1 }, diff --git a/_maps/RandomRuins/LavaRuins/skyrat/lavaland_surface_syndicate_base1_skyrat.dmm b/_maps/RandomRuins/LavaRuins/skyrat/lavaland_surface_syndicate_base1_skyrat.dmm index e17ed5908b3..e44cefcbc5d 100644 --- a/_maps/RandomRuins/LavaRuins/skyrat/lavaland_surface_syndicate_base1_skyrat.dmm +++ b/_maps/RandomRuins/LavaRuins/skyrat/lavaland_surface_syndicate_base1_skyrat.dmm @@ -5609,7 +5609,7 @@ /area/ruin/syndicate_lava_base/main) "KB" = ( /obj/effect/turf_decal/tile/dark/full, -/obj/machinery/vending/boozeomat/syndicate_access{ +/obj/machinery/vending/boozeomat/syndicate{ onstation = 0 }, /turf/open/floor/iron/dark/textured_large, diff --git a/_maps/RandomRuins/SpaceRuins/bubberstation/space_dauntless.dmm b/_maps/RandomRuins/SpaceRuins/bubberstation/space_dauntless.dmm index 702af17133e..9ae0dec200c 100644 --- a/_maps/RandomRuins/SpaceRuins/bubberstation/space_dauntless.dmm +++ b/_maps/RandomRuins/SpaceRuins/bubberstation/space_dauntless.dmm @@ -2015,7 +2015,7 @@ /obj/effect/turf_decal/trimline/dark_blue/filled/line{ dir = 8 }, -/obj/machinery/vending/medical/syndicate_access/cybersun{ +/obj/machinery/vending/medical/syndicate/cybersun{ desc = "An advanced vendor that dispenses medical drugs, both recreational and medicinal. It's said to have been salvaged from an old decommissioned Cybersun Cruiser."; name = "\improper SyndiMed ++"; onstation = 0; @@ -9555,7 +9555,7 @@ /turf/open/floor/catwalk_floor/iron_dark, /area/ruin/space/has_grav/bubbers/dauntless_space/engineering) "Py" = ( -/obj/machinery/vending/boozeomat/syndicate_access{ +/obj/machinery/vending/boozeomat/syndicate{ onstation = 0; onstation_override = 1 }, diff --git a/_maps/RandomRuins/SpaceRuins/skyrat/cargodiselost.dmm b/_maps/RandomRuins/SpaceRuins/skyrat/cargodiselost.dmm index fae511289b9..4a0d1475cab 100644 --- a/_maps/RandomRuins/SpaceRuins/skyrat/cargodiselost.dmm +++ b/_maps/RandomRuins/SpaceRuins/skyrat/cargodiselost.dmm @@ -2150,7 +2150,7 @@ /turf/open/floor/catwalk_floor/iron_dark, /area/ruin/space/has_grav/cargodise_freighter/primaryhall) "Iy" = ( -/obj/machinery/vending/medical/syndicate_access/cybersun{ +/obj/machinery/vending/medical/syndicate/cybersun{ req_access = null }, /obj/effect/turf_decal/tile/blue/anticorner/contrasted{ @@ -2556,7 +2556,7 @@ /turf/open/floor/iron/dark, /area/ruin/space/has_grav/cargodise_freighter/mining) "Ox" = ( -/obj/machinery/vending/boozeomat/all_access, +/obj/machinery/vending/boozeomat, /turf/open/floor/iron/kitchen, /area/ruin/space/has_grav/cargodise_freighter/kitchen) "Oy" = ( diff --git a/_maps/RandomRuins/SpaceRuins/skyrat/interdynefob.dmm b/_maps/RandomRuins/SpaceRuins/skyrat/interdynefob.dmm index 9573a9a60b9..828abf3212d 100644 --- a/_maps/RandomRuins/SpaceRuins/skyrat/interdynefob.dmm +++ b/_maps/RandomRuins/SpaceRuins/skyrat/interdynefob.dmm @@ -2498,7 +2498,7 @@ /obj/effect/turf_decal/siding/wideplating/dark{ dir = 1 }, -/obj/machinery/vending/medical/syndicate_access/cybersun{ +/obj/machinery/vending/medical/syndicate/cybersun{ desc = "An advanced vendor that dispenses medical drugs, both recreational and medicinal. It's said to have been salvaged from an old decomissioned Cybersun Cruiser."; name = "\improper SyndiMed ++" }, @@ -5854,7 +5854,7 @@ /turf/open/floor/iron, /area/ruin/space/has_grav/skyrat/interdynefob/service/dorms/fitness) "AZ" = ( -/obj/machinery/vending/boozeomat/syndicate_access, +/obj/machinery/vending/boozeomat/syndicate, /turf/closed/wall/r_wall/syndicate/nodiagonal, /area/ruin/space/has_grav/skyrat/interdynefob/service/diner) "Bb" = ( diff --git a/_maps/RandomRuins/SpaceRuins/skyrat/piratefort.dmm b/_maps/RandomRuins/SpaceRuins/skyrat/piratefort.dmm index b0770c8277a..88f83ea5e67 100644 --- a/_maps/RandomRuins/SpaceRuins/skyrat/piratefort.dmm +++ b/_maps/RandomRuins/SpaceRuins/skyrat/piratefort.dmm @@ -130,7 +130,7 @@ /turf/open/floor/iron/dark, /area/ruin/space/has_grav/powered) "ff" = ( -/obj/machinery/vending/boozeomat/all_access, +/obj/machinery/vending/boozeomat, /turf/open/floor/iron/kitchen, /area/ruin/space/has_grav/powered) "fl" = ( diff --git a/_maps/RandomRuins/SpaceRuins/spacehotel_skyrat.dmm b/_maps/RandomRuins/SpaceRuins/spacehotel_skyrat.dmm index 3919ab235d0..03999ed1245 100644 --- a/_maps/RandomRuins/SpaceRuins/spacehotel_skyrat.dmm +++ b/_maps/RandomRuins/SpaceRuins/spacehotel_skyrat.dmm @@ -2465,7 +2465,7 @@ pixel_y = 24 }, /obj/effect/turf_decal/siding/dark, -/obj/machinery/vending/autodrobe/all_access, +/obj/machinery/vending/autodrobe, /turf/open/floor/carpet/black, /area/ruin/space/has_grav/hotel) "lA" = ( diff --git a/_maps/bubber/automapper/templates/IceBoxStation/Icebox_ntrep_office.dmm b/_maps/bubber/automapper/templates/IceBoxStation/Icebox_ntrep_office.dmm index 60e1d48f484..a53b9c3712e 100644 --- a/_maps/bubber/automapper/templates/IceBoxStation/Icebox_ntrep_office.dmm +++ b/_maps/bubber/automapper/templates/IceBoxStation/Icebox_ntrep_office.dmm @@ -234,7 +234,7 @@ /turf/open/floor/carpet/green, /area/station/command/heads_quarters/nt_rep) "zI" = ( -/obj/machinery/vending/boozeomat/all_access, +/obj/machinery/vending/boozeomat, /turf/closed/wall/r_wall, /area/station/command/heads_quarters/nt_rep) "Fk" = ( diff --git a/_maps/bubber/automapper/templates/MetaStation/metastation_ntrep_office.dmm b/_maps/bubber/automapper/templates/MetaStation/metastation_ntrep_office.dmm index a89a0533574..1f5c31bf21d 100644 --- a/_maps/bubber/automapper/templates/MetaStation/metastation_ntrep_office.dmm +++ b/_maps/bubber/automapper/templates/MetaStation/metastation_ntrep_office.dmm @@ -188,7 +188,7 @@ /turf/open/floor/wood, /area/station/command/heads_quarters/nt_rep) "H" = ( -/obj/machinery/vending/boozeomat/all_access, +/obj/machinery/vending/boozeomat, /turf/closed/wall/r_wall, /area/station/command/heads_quarters/nt_rep) "I" = ( diff --git a/_maps/bubber/automapper/templates/kilostation/kilostation_ert_bay.dmm b/_maps/bubber/automapper/templates/kilostation/kilostation_ert_bay.dmm index 4ad0a4d10b3..dfcfda5ec52 100644 --- a/_maps/bubber/automapper/templates/kilostation/kilostation_ert_bay.dmm +++ b/_maps/bubber/automapper/templates/kilostation/kilostation_ert_bay.dmm @@ -1522,7 +1522,7 @@ /obj/effect/turf_decal/siding/wood{ dir = 4 }, -/obj/machinery/vending/boozeomat/all_access, +/obj/machinery/vending/boozeomat, /turf/closed/wall/r_wall, /area/station/command/heads_quarters/nt_rep) "Nu" = ( diff --git a/_maps/bubber/automapper/templates/tramstation/tramstation_ntrep_office.dmm b/_maps/bubber/automapper/templates/tramstation/tramstation_ntrep_office.dmm index 650024ae354..bcd6ec3f0b0 100644 --- a/_maps/bubber/automapper/templates/tramstation/tramstation_ntrep_office.dmm +++ b/_maps/bubber/automapper/templates/tramstation/tramstation_ntrep_office.dmm @@ -87,7 +87,7 @@ /obj/effect/turf_decal/siding/wood/corner{ dir = 1 }, -/obj/machinery/vending/boozeomat/all_access, +/obj/machinery/vending/boozeomat, /turf/closed/wall, /area/station/command/heads_quarters/nt_rep) "m" = ( diff --git a/_maps/bubber/automapper/templates/wawastation/wawastation_ntrep_office.dmm b/_maps/bubber/automapper/templates/wawastation/wawastation_ntrep_office.dmm index 1ee4435c206..0e9e8e8ea98 100644 --- a/_maps/bubber/automapper/templates/wawastation/wawastation_ntrep_office.dmm +++ b/_maps/bubber/automapper/templates/wawastation/wawastation_ntrep_office.dmm @@ -48,7 +48,7 @@ /turf/open/floor/carpet/green, /area/station/command/heads_quarters/nt_rep) "f" = ( -/obj/machinery/vending/boozeomat/all_access, +/obj/machinery/vending/boozeomat, /turf/closed/wall/r_wall, /area/station/command/heads_quarters/nt_rep) "g" = ( diff --git a/_maps/map_files/BoxStation/BoxStation.dmm b/_maps/map_files/BoxStation/BoxStation.dmm index 56dc5fafd28..43a3dab37e7 100644 --- a/_maps/map_files/BoxStation/BoxStation.dmm +++ b/_maps/map_files/BoxStation/BoxStation.dmm @@ -6148,7 +6148,7 @@ /obj/effect/turf_decal/tile/neutral{ dir = 8 }, -/obj/machinery/vending/autodrobe/all_access, +/obj/machinery/vending/autodrobe, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2{ dir = 8 }, @@ -9503,7 +9503,7 @@ /obj/machinery/light_switch{ pixel_y = 28 }, -/obj/machinery/vending/autodrobe/all_access, +/obj/machinery/vending/autodrobe, /turf/open/floor/iron, /area/station/commons/locker) "aQQ" = ( @@ -47087,7 +47087,7 @@ /turf/open/floor/engine, /area/station/science/explab) "mrX" = ( -/obj/machinery/vending/autodrobe/all_access, +/obj/machinery/vending/autodrobe, /turf/open/floor/plating, /area/station/maintenance/starboard/fore) "msc" = ( @@ -60657,7 +60657,7 @@ /turf/open/floor/plating, /area/station/science/server) "vOr" = ( -/obj/machinery/vending/autodrobe/all_access, +/obj/machinery/vending/autodrobe, /obj/effect/decal/cleanable/dirt, /turf/open/floor/wood, /area/station/maintenance/abandon_cafeteria) @@ -61758,7 +61758,7 @@ /area/station/science/xenobiology) "wCp" = ( /obj/effect/decal/cleanable/dirt, -/obj/machinery/vending/boozeomat/all_access, +/obj/machinery/vending/boozeomat, /turf/open/floor/wood, /area/station/maintenance/abandon_cafeteria) "wCx" = ( diff --git a/_maps/map_files/KiloStation/KiloStation.dmm b/_maps/map_files/KiloStation/KiloStation.dmm index 6d16e9a1f20..2bfbb6c697c 100644 --- a/_maps/map_files/KiloStation/KiloStation.dmm +++ b/_maps/map_files/KiloStation/KiloStation.dmm @@ -16495,7 +16495,7 @@ /turf/closed/wall, /area/station/maintenance/solars/port/fore) "fzk" = ( -/obj/machinery/vending/autodrobe/all_access, +/obj/machinery/vending/autodrobe, /obj/effect/turf_decal/delivery, /obj/effect/turf_decal/tile/neutral/half/contrasted, /turf/open/floor/iron/dark, @@ -59265,7 +59265,7 @@ /turf/open/floor/plating, /area/station/maintenance/department/electrical) "tpY" = ( -/obj/machinery/vending/autodrobe/all_access, +/obj/machinery/vending/autodrobe, /obj/structure/noticeboard/directional/west, /obj/effect/decal/cleanable/dirt, /obj/effect/turf_decal/tile/neutral/half/contrasted{ diff --git a/_maps/map_files/VoidRaptor/VoidRaptor.dmm b/_maps/map_files/VoidRaptor/VoidRaptor.dmm index 59c408cbba6..30caa536bdb 100644 --- a/_maps/map_files/VoidRaptor/VoidRaptor.dmm +++ b/_maps/map_files/VoidRaptor/VoidRaptor.dmm @@ -63984,7 +63984,7 @@ /obj/effect/turf_decal/siding/wood{ dir = 5 }, -/obj/machinery/vending/autodrobe/all_access, +/obj/machinery/vending/autodrobe, /turf/open/floor/wood/large, /area/station/commons/fitness/recreation/entertainment) "rSu" = ( diff --git a/_maps/map_files/biodome/biodome.dmm b/_maps/map_files/biodome/biodome.dmm index a035c3332ba..58e72f6b34d 100644 --- a/_maps/map_files/biodome/biodome.dmm +++ b/_maps/map_files/biodome/biodome.dmm @@ -4618,7 +4618,7 @@ /turf/closed/wall, /area/station/command/heads_quarters/qm) "bEJ" = ( -/obj/machinery/vending/boozeomat/all_access, +/obj/machinery/vending/boozeomat, /turf/closed/wall, /area/station/command/heads_quarters/nt_rep) "bES" = ( @@ -13791,7 +13791,7 @@ /turf/open/floor/iron/dark/textured, /area/station/engineering/atmos/mix) "eOA" = ( -/obj/machinery/vending/autodrobe/all_access, +/obj/machinery/vending/autodrobe, /turf/open/floor/plating, /area/station/maintenance/aft/upper) "eOC" = ( @@ -20430,7 +20430,7 @@ /turf/open/floor/plating, /area/station/maintenance/port/central) "heh" = ( -/obj/machinery/vending/boozeomat/all_access, +/obj/machinery/vending/boozeomat, /turf/open/floor/wood, /area/station/maintenance/fore/greater) "hei" = ( @@ -60194,7 +60194,7 @@ /turf/open/misc/asteroid, /area/station/maintenance/central/greater) "uUp" = ( -/obj/machinery/vending/autodrobe/all_access, +/obj/machinery/vending/autodrobe, /obj/effect/turf_decal/tile/neutral/half, /turf/open/floor/iron, /area/station/commons/locker) diff --git a/_maps/map_files/generic/CentCom_skyrat_z2.dmm b/_maps/map_files/generic/CentCom_skyrat_z2.dmm index 80300a0c849..b9099ef5dd5 100644 --- a/_maps/map_files/generic/CentCom_skyrat_z2.dmm +++ b/_maps/map_files/generic/CentCom_skyrat_z2.dmm @@ -16221,7 +16221,7 @@ /turf/open/indestructible/hotelwood, /area/centcom/holding/cafe/park) "tYf" = ( -/obj/machinery/vending/autodrobe/all_access, +/obj/machinery/vending/autodrobe, /obj/effect/turf_decal/bot, /turf/open/floor/iron/dark, /area/centcom/interlink) diff --git a/_maps/map_files/moonstation/moonstation.dmm b/_maps/map_files/moonstation/moonstation.dmm index 2ae5dc66933..4049f0b4ae3 100644 --- a/_maps/map_files/moonstation/moonstation.dmm +++ b/_maps/map_files/moonstation/moonstation.dmm @@ -13544,7 +13544,7 @@ /obj/effect/turf_decal/siding/dark{ dir = 4 }, -/obj/machinery/vending/boozeomat/all_access, +/obj/machinery/vending/boozeomat, /turf/open/floor/iron/dark{ initial_gas_mix = "n2=100;TEMP=293.15" }, @@ -43678,7 +43678,7 @@ dir = 4; pixel_x = -32 }, -/obj/machinery/vending/boozeomat/all_access, +/obj/machinery/vending/boozeomat, /turf/open/floor/wood, /area/station/command/heads_quarters/captain) "mbQ" = ( @@ -46091,7 +46091,7 @@ /turf/closed/wall/r_wall/rust, /area/station/ai_monitored/turret_protected/aisat/service) "mMN" = ( -/obj/machinery/vending/autodrobe/all_access, +/obj/machinery/vending/autodrobe, /obj/effect/turf_decal/tile/neutral/anticorner/contrasted{ dir = 1 }, @@ -67585,7 +67585,7 @@ /turf/open/floor/plating/rust/moonstation, /area/moonstation/underground) "sJO" = ( -/obj/machinery/vending/boozeomat/all_access, +/obj/machinery/vending/boozeomat, /obj/effect/decal/cleanable/dirt/dust, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /turf/open/floor/wood, @@ -74681,7 +74681,7 @@ /turf/open/lava/smooth/lava_land_surface, /area/ruin/unpowered/ash_walkers) "uHW" = ( -/obj/machinery/vending/boozeomat/all_access, +/obj/machinery/vending/boozeomat, /obj/structure/sign/poster/contraband/syndicate_pistol/directional/north, /obj/effect/turf_decal/tile/purple/opposingcorners, /obj/item/radio/intercom/directional/west, diff --git a/_maps/shuttles/skyrat/goldeneye_cruiser.dmm b/_maps/shuttles/skyrat/goldeneye_cruiser.dmm index 4bcb2d3e845..68d437b0d26 100644 --- a/_maps/shuttles/skyrat/goldeneye_cruiser.dmm +++ b/_maps/shuttles/skyrat/goldeneye_cruiser.dmm @@ -641,7 +641,7 @@ /turf/closed/wall/mineral/titanium, /area/shuttle/syndicate/cruiser/brig) "GN" = ( -/obj/machinery/vending/medical/syndicate_access, +/obj/machinery/vending/medical/syndicate, /obj/structure/extinguisher_cabinet/directional/north, /turf/open/floor/iron/dark/textured_large, /area/shuttle/syndicate/cruiser/medical) diff --git a/_maps/shuttles/skyrat/whiteship_blueshift.dmm b/_maps/shuttles/skyrat/whiteship_blueshift.dmm index 4986af08bc3..114e689a14a 100644 --- a/_maps/shuttles/skyrat/whiteship_blueshift.dmm +++ b/_maps/shuttles/skyrat/whiteship_blueshift.dmm @@ -1855,7 +1855,7 @@ /area/shuttle/abandoned/crew) "qM" = ( /obj/effect/decal/cleanable/dirt, -/obj/machinery/vending/boozeomat/all_access, +/obj/machinery/vending/boozeomat, /obj/structure/alien/weeds, /turf/open/floor/iron/dark, /area/shuttle/abandoned/bar) diff --git a/_maps/shuttles/zubbers/emergency_vortex.dmm b/_maps/shuttles/zubbers/emergency_vortex.dmm index 862fb909cea..576300c811d 100644 --- a/_maps/shuttles/zubbers/emergency_vortex.dmm +++ b/_maps/shuttles/zubbers/emergency_vortex.dmm @@ -3303,7 +3303,7 @@ /obj/effect/turf_decal/trimline/dark_blue/filled/warning{ dir = 9 }, -/obj/machinery/vending/boozeomat/all_access{ +/obj/machinery/vending/boozeomat{ onstation = 0 }, /turf/open/floor/iron/dark, diff --git a/_maps/skyrat/automapper/templates/tramstation/tramstation_cryo.dmm b/_maps/skyrat/automapper/templates/tramstation/tramstation_cryo.dmm index 46050813a92..94883b8e91e 100644 --- a/_maps/skyrat/automapper/templates/tramstation/tramstation_cryo.dmm +++ b/_maps/skyrat/automapper/templates/tramstation/tramstation_cryo.dmm @@ -144,7 +144,7 @@ /obj/effect/turf_decal/tile/blue{ dir = 8 }, -/obj/machinery/vending/autodrobe/all_access, +/obj/machinery/vending/autodrobe, /turf/open/floor/iron/cafeteria, /area/station/commons/dorms/laundry) "v" = ( diff --git a/_maps/skyrat/automapper/templates/wawastation/wawastation_lockers.dmm b/_maps/skyrat/automapper/templates/wawastation/wawastation_lockers.dmm index e2d17dfd67a..8c9162de307 100644 --- a/_maps/skyrat/automapper/templates/wawastation/wawastation_lockers.dmm +++ b/_maps/skyrat/automapper/templates/wawastation/wawastation_lockers.dmm @@ -28,7 +28,7 @@ /turf/open/floor/iron/freezer, /area/station/commons/toilet/restrooms) "f" = ( -/obj/machinery/vending/autodrobe/all_access, +/obj/machinery/vending/autodrobe, /obj/effect/turf_decal/delivery, /obj/structure/window/spawner/directional/east, /turf/open/floor/iron, diff --git a/_maps/skyrat/automapper/templates/wawastation/wawastation_ntrep_office.dmm b/_maps/skyrat/automapper/templates/wawastation/wawastation_ntrep_office.dmm index 22430051935..a4b52af49f4 100644 --- a/_maps/skyrat/automapper/templates/wawastation/wawastation_ntrep_office.dmm +++ b/_maps/skyrat/automapper/templates/wawastation/wawastation_ntrep_office.dmm @@ -48,7 +48,7 @@ /turf/open/floor/carpet/green, /area/station/command/heads_quarters/nt_rep) "f" = ( -/obj/machinery/vending/boozeomat/all_access, +/obj/machinery/vending/boozeomat, /turf/closed/wall/r_wall, /area/station/command/heads_quarters/nt_rep) "g" = ( diff --git a/code/__DEFINES/~skyrat_defines/span.dm b/code/__DEFINES/~skyrat_defines/span.dm index 260f1913905..42eea1aaf0b 100644 --- a/code/__DEFINES/~skyrat_defines/span.dm +++ b/code/__DEFINES/~skyrat_defines/span.dm @@ -1,12 +1,9 @@ -#define span_emote(str) ("" + str + "") -#define span_italics(str) ("" + str + "") #define span_maptext(str) ("" + str + "") #define span_mentor(str) ("" + str + "") #define span_mentornotice(str) ("" + str + "") #define span_oocplain(str) ("" + str + "") #define span_pink(str) ("" + str + "") #define span_rlooc(str) ("" + str + "") -#define span_smalldanger(str) ("" + str + "") #define span_userlove(str) ("" + str + "") #define span_warningplain(str) ("" + str + "") #define span_crossooc(str) ("" + str + "") diff --git a/code/__HELPERS/priority_announce.dm b/code/__HELPERS/priority_announce.dm index 6efabd544b2..7375509a363 100644 --- a/code/__HELPERS/priority_announce.dm +++ b/code/__HELPERS/priority_announce.dm @@ -142,7 +142,7 @@ else finalized_announcement = CHAT_ALERT_DEFAULT_SPAN(jointext(minor_announcement_strings, "")) - var/custom_sound = sound_override || (alert ? 'modular_skyrat/modules/alerts/sound/alerts/alert1.ogg' : 'sound/announcer/notice/notice2.ogg') // SKYRAT EDIT CHANGE - CUSTOM ANNOUNCEMENTS - Original: 'sound/misc/notice1.ogg' + var/custom_sound = sound_override || (alert ? 'modular_skyrat/modules/alerts/sound/alerts/alert1.ogg' : 'sound/announcer/notice/notice2.ogg') // SKYRAT EDIT CHANGE - CUSTOM ANNOUNCEMENTS - Original: 'sound/announcer/notice/notice1.ogg' dispatch_announcement_to_players(finalized_announcement, players, custom_sound, should_play_sound) /// Sends an announcement about the level changing to players. Uses the passed in datum and the subsystem's previous security level to generate the message. @@ -211,7 +211,7 @@ if(!isnull(sound_override)) sound_override = sound(sound_override) - var/sound_to_play = !isnull(sound_override) ? sound_override : 'sound/misc/notice2.ogg' + var/sound_to_play = !isnull(sound_override) ? sound_override : 'sound/announcer/notice/notice2.ogg' alert_sound_to_playing(sound_to_play, players = players) for(var/mob/target in players) diff --git a/code/_onclick/hud/hud.dm b/code/_onclick/hud/hud.dm index e5780c0f590..3e498aa678c 100644 --- a/code/_onclick/hud/hud.dm +++ b/code/_onclick/hud/hud.dm @@ -451,10 +451,12 @@ GLOBAL_LIST_INIT(available_erp_ui_styles, list( return update_robot_modules_display() +/* BUBBER EDIT REMOVAL - We use a different lobby hud /datum/hud/new_player/show_hud(version = 0, mob/viewmob) . = ..() if(.) show_station_trait_buttons() +*/ /datum/hud/proc/hidden_inventory_update() return diff --git a/code/controllers/subsystem/job.dm b/code/controllers/subsystem/job.dm index 0197ed2290b..3eed78a892a 100644 --- a/code/controllers/subsystem/job.dm +++ b/code/controllers/subsystem/job.dm @@ -298,7 +298,7 @@ SUBSYSTEM_DEF(job) //SKYRAT EDIT ADDITION if(job.departments_bitflags & DEPARTMENT_BITFLAG_CENTRAL_COMMAND) //If you want a CC position, select it! - JobDebug("GRJ skipping Central Command role, Player: [player], Job: [job]") + job_debug("GRJ skipping Central Command role, Player: [player], Job: [job]") continue //SKYRAT EDIT END @@ -947,19 +947,19 @@ SUBSYSTEM_DEF(job) //SKYRAT EDIT ADDITION BEGIN - CUSTOMIZATION if(!CONFIG_GET(flag/bypass_veteran_system) && possible_job.veteran_only && !SSplayer_ranks.is_veteran(player.client)) - JobDebug("[debug_prefix] Error: [get_job_unavailable_error_message(JOB_NOT_VETERAN)], Player: [player][add_job_to_log ? ", Job: [possible_job]" : ""]") + job_debug("[debug_prefix] Error: [get_job_unavailable_error_message(JOB_NOT_VETERAN)], Player: [player][add_job_to_log ? ", Job: [possible_job]" : ""]") return JOB_NOT_VETERAN if(possible_job.has_banned_quirk(player.client.prefs)) - JobDebug("[debug_prefix] Error: [get_job_unavailable_error_message(JOB_UNAVAILABLE_QUIRK)], Player: [player][add_job_to_log ? ", Job: [possible_job]" : ""]") + job_debug("[debug_prefix] Error: [get_job_unavailable_error_message(JOB_UNAVAILABLE_QUIRK)], Player: [player][add_job_to_log ? ", Job: [possible_job]" : ""]") return JOB_UNAVAILABLE_QUIRK if(!possible_job.has_required_languages(player.client.prefs)) - JobDebug("[debug_prefix] Error: [get_job_unavailable_error_message(JOB_UNAVAILABLE_LANGUAGE)], Player: [player][add_job_to_log ? ", Job: [possible_job]" : ""]") + job_debug("[debug_prefix] Error: [get_job_unavailable_error_message(JOB_UNAVAILABLE_LANGUAGE)], Player: [player][add_job_to_log ? ", Job: [possible_job]" : ""]") return JOB_UNAVAILABLE_LANGUAGE if(possible_job.has_banned_species(player.client.prefs)) - JobDebug("[debug_prefix] Error: [get_job_unavailable_error_message(JOB_UNAVAILABLE_SPECIES)], Player: [player][add_job_to_log ? ", Job: [possible_job]" : ""]") + job_debug("[debug_prefix] Error: [get_job_unavailable_error_message(JOB_UNAVAILABLE_SPECIES)], Player: [player][add_job_to_log ? ", Job: [possible_job]" : ""]") return JOB_UNAVAILABLE_SPECIES if(CONFIG_GET(flag/min_flavor_text)) @@ -967,15 +967,15 @@ SUBSYSTEM_DEF(job) var/uses_silicon_flavortext = (is_silicon_job(possible_job) && length_char(player.client?.prefs.read_preference(/datum/preference/text/silicon_flavor_text)) <= CONFIG_GET(number/silicon_flavor_text_character_requirement)) var/uses_normal_flavortext = (!is_silicon_job(possible_job) && length_char(player.client?.prefs.read_preference(/datum/preference/text/flavor_text)) <= CONFIG_GET(number/flavor_text_character_requirement)) if(uses_silicon_flavortext) - JobDebug("[debug_prefix] Error: [get_job_unavailable_error_message(JOB_UNAVAILABLE_FLAVOUR)], Player: [player][add_job_to_log ? ", Job: [possible_job]" : ""]") + job_debug("[debug_prefix] Error: [get_job_unavailable_error_message(JOB_UNAVAILABLE_FLAVOUR)], Player: [player][add_job_to_log ? ", Job: [possible_job]" : ""]") return JOB_UNAVAILABLE_FLAVOUR_SILICON if(uses_normal_flavortext) //BUBBER EDIT END: SILICON FLAVOR TEXT CHECK - JobDebug("[debug_prefix] Error: [get_job_unavailable_error_message(JOB_UNAVAILABLE_FLAVOUR)], Player: [player][add_job_to_log ? ", Job: [possible_job]" : ""]") + job_debug("[debug_prefix] Error: [get_job_unavailable_error_message(JOB_UNAVAILABLE_FLAVOUR)], Player: [player][add_job_to_log ? ", Job: [possible_job]" : ""]") return JOB_UNAVAILABLE_FLAVOUR if(possible_job.has_banned_augment(player.client.prefs)) - JobDebug("[debug_prefix] Error: [get_job_unavailable_error_message(JOB_UNAVAILABLE_AUGMENT)], Player: [player][add_job_to_log ? ", Job: [possible_job]" : ""]") + job_debug("[debug_prefix] Error: [get_job_unavailable_error_message(JOB_UNAVAILABLE_AUGMENT)], Player: [player][add_job_to_log ? ", Job: [possible_job]" : ""]") return JOB_UNAVAILABLE_AUGMENT diff --git a/code/controllers/subsystem/shuttle.dm b/code/controllers/subsystem/shuttle.dm index 19248f83c0c..f2bb23ed671 100644 --- a/code/controllers/subsystem/shuttle.dm +++ b/code/controllers/subsystem/shuttle.dm @@ -286,7 +286,7 @@ SUBSYSTEM_DEF(shuttle) priority_announce( text = "Emergency shuttle uplink interference detected, shuttle call disabled while the system reinitializes. Estimated restore in [DisplayTimeText(lockout_timer, round_seconds_to = 60)].", title = "Uplink Interference", - sound = ANNOUNCER_SHUTTLE, // SKYRAT EDIT CHANGE - Announcer Sounds - ORIGINAL: sound = 'sound/misc/announce_dig.ogg', + sound = ANNOUNCER_SHUTTLE, // SKYRAT EDIT CHANGE - Announcer Sounds - ORIGINAL: sound = 'sound/announcer/announcement/announce_dig.ogg', sender_override = "Emergency Shuttle Uplink Alert", color_override = "grey", ) @@ -300,7 +300,7 @@ SUBSYSTEM_DEF(shuttle) priority_announce( text= "Emergency shuttle uplink services are now back online.", title = "Uplink Restored", - sound = ANNOUNCER_SHUTTLE, // SKYRAT EDIT CHANGE - Announcer Sounds - ORIGINAL: sound = 'sound/misc/announce_dig.ogg', + sound = ANNOUNCER_SHUTTLE, // SKYRAT EDIT CHANGE - Announcer Sounds - ORIGINAL: sound = 'sound/announcer/announcement/announce_dig.ogg', sender_override = "Emergency Shuttle Uplink Alert", color_override = "green", ) diff --git a/code/controllers/subsystem/statpanel.dm b/code/controllers/subsystem/statpanel.dm index 490099fb143..535cbd33503 100644 --- a/code/controllers/subsystem/statpanel.dm +++ b/code/controllers/subsystem/statpanel.dm @@ -43,7 +43,7 @@ SUBSYSTEM_DEF(statpanels) var/timeinworld = "[time2text(world.realtime, "DD of Month,")] [CURRENT_STATION_YEAR]" global_data = list( "Time Dilation: [round(SStime_track.time_dilation_current,1)]% AVG:([round(SStime_track.time_dilation_avg_fast,1)]%, [round(SStime_track.time_dilation_avg,1)]%, [round(SStime_track.time_dilation_avg_slow,1)]%)", - "Map: [SSmapping.config?.map_name || "Loading..."]", + "Map: [SSmapping.current_map?.map_name || "Loading..."]", cached ? "Next Map: [cached.map_name]" : null, "Storyteller: [SSgamemode.storyteller ? SSgamemode.storyteller.name : "N/A"]", // BUBBER EDIT ADDITION "Round ID: [GLOB.round_id ? GLOB.round_id : "NULL"]", diff --git a/code/controllers/subsystem/ticker.dm b/code/controllers/subsystem/ticker.dm index 0e098e3814b..6929ed0f289 100644 --- a/code/controllers/subsystem/ticker.dm +++ b/code/controllers/subsystem/ticker.dm @@ -162,7 +162,7 @@ SUBSYSTEM_DEF(ticker) window_flash(C, ignorepref = TRUE) //let them know lobby has opened up. to_chat(world, span_notice("Welcome to [station_name()]!")) /* ORIGINAL: - send2chat("New round starting on [SSmapping.config.map_name]!", CONFIG_GET(string/channel_announce_new_game)) + send2chat("New round starting on [SSmapping.current_map.map_name]!", CONFIG_GET(string/channel_announce_new_game)) */ // SKYRAT EDIT START - DISCORD SPAM PREVENTION if(!discord_alerted) discord_alerted = TRUE diff --git a/code/datums/ai/_ai_controller.dm b/code/datums/ai/_ai_controller.dm index 16c05d21b79..d6230ec8d35 100644 --- a/code/datums/ai/_ai_controller.dm +++ b/code/datums/ai/_ai_controller.dm @@ -90,8 +90,17 @@ multiple modular subtrees with behaviors ///Sets the current movement target, with an optional param to override the movement behavior /datum/ai_controller/proc/set_movement_target(source, atom/target, datum/ai_movement/new_movement) + if(current_movement_target) + UnregisterSignal(current_movement_target, list(COMSIG_MOVABLE_MOVED, COMSIG_PREQDELETED)) + if(!isnull(target) && !isatom(target)) + stack_trace("[pawn]'s current movement target is not an atom, rather a [target.type]! Did you accidentally set it to a weakref?") + CancelActions() + return movement_target_source = source current_movement_target = target + if(!isnull(current_movement_target)) + RegisterSignal(current_movement_target, COMSIG_MOVABLE_MOVED, PROC_REF(on_movement_target_move)) + RegisterSignal(current_movement_target, COMSIG_PREQDELETED, PROC_REF(on_movement_target_delete)) if(new_movement) change_ai_movement_type(new_movement) @@ -153,6 +162,20 @@ multiple modular subtrees with behaviors SIGNAL_HANDLER set_new_cells() + if(current_movement_target) + check_target_max_distance() + +/datum/ai_controller/proc/on_movement_target_move(atom/source) + SIGNAL_HANDLER + check_target_max_distance() + +/datum/ai_controller/proc/on_movement_target_delete(atom/source) + SIGNAL_HANDLER + set_movement_target(source = type, target = null) + +/datum/ai_controller/proc/check_target_max_distance() + if(get_dist(current_movement_target, pawn) > max_target_distance) + CancelActions() /datum/ai_controller/proc/set_new_cells() if(isnull(our_cells)) @@ -341,20 +364,6 @@ multiple modular subtrees with behaviors ///Runs any actions that are currently running /datum/ai_controller/process(seconds_per_tick) - if(!length(current_behaviors) && idle_behavior) - idle_behavior.perform_idle_behavior(seconds_per_tick, src) //Do some stupid shit while we have nothing to do - return - - if(current_movement_target) - if(!isatom(current_movement_target)) - stack_trace("[pawn]'s current movement target is not an atom, rather a [current_movement_target.type]! Did you accidentally set it to a weakref?") - CancelActions() - return - - if(get_dist(pawn, current_movement_target) > max_target_distance) //The distance is out of range - CancelActions() - return - for(var/datum/ai_behavior/current_behavior as anything in current_behaviors) // Convert the current behaviour action cooldown to realtime seconds from deciseconds.current_behavior @@ -368,9 +377,9 @@ multiple modular subtrees with behaviors ProcessBehavior(action_seconds_per_tick, current_behavior) return - if(!current_movement_target) - stack_trace("[pawn] wants to perform action type [current_behavior.type] which requires movement, but has no current movement target!") - return //This can cause issues, so don't let these slide. + if(isnull(current_movement_target)) + fail_behavior(current_behavior) + return ///Stops pawns from performing such actions that should require the target to be adjacent. var/atom/movable/moving_pawn = pawn var/can_reach = !(current_behavior.behavior_flags & AI_BEHAVIOR_REQUIRE_REACH) || moving_pawn.CanReach(current_movement_target) @@ -476,6 +485,7 @@ multiple modular subtrees with behaviors if(!behavior.setup(arglist(arguments))) return + var/should_exit_unplanned = !length(current_behaviors) planned_behaviors[behavior] = TRUE current_behaviors[behavior] = TRUE @@ -488,6 +498,9 @@ multiple modular subtrees with behaviors if(!(behavior.behavior_flags & AI_BEHAVIOR_CAN_PLAN_DURING_EXECUTION)) //this one blocks planning! able_to_plan = FALSE + if(should_exit_unplanned) + exit_unplanned_mode() + SEND_SIGNAL(src, AI_CONTROLLER_BEHAVIOR_QUEUED(behavior_type), arguments) /datum/ai_controller/proc/check_able_to_plan() @@ -499,6 +512,16 @@ multiple modular subtrees with behaviors /datum/ai_controller/proc/dequeue_behavior(datum/ai_behavior/behavior) current_behaviors -= behavior able_to_plan = check_able_to_plan() + if(!length(current_behaviors)) + enter_unplanned_mode() + +/datum/ai_controller/proc/exit_unplanned_mode() + remove_from_unplanned_controllers() + start_ai_processing() + +/datum/ai_controller/proc/enter_unplanned_mode() + add_to_unplanned_controllers() + stop_previous_processing() /datum/ai_controller/proc/ProcessBehavior(seconds_per_tick, datum/ai_behavior/behavior) var/list/arguments = list(seconds_per_tick, src) @@ -522,11 +545,14 @@ multiple modular subtrees with behaviors if(!length(current_behaviors)) return for(var/datum/ai_behavior/current_behavior as anything in current_behaviors) - var/list/arguments = list(src, FALSE) - var/list/stored_arguments = behavior_args[current_behavior.type] - if(stored_arguments) - arguments += stored_arguments - current_behavior.finish_action(arglist(arguments)) + fail_behavior(current_behavior) + +/datum/ai_controller/proc/fail_behavior(datum/ai_behavior/current_behavior) + var/list/arguments = list(src, FALSE) + var/list/stored_arguments = behavior_args[current_behavior.type] + if(stored_arguments) + arguments += stored_arguments + current_behavior.finish_action(arglist(arguments)) /// Turn the controller on or off based on if you're alive, we only register to this if the flag is present so don't need to check again /datum/ai_controller/proc/on_stat_changed(mob/living/source, new_stat) diff --git a/code/datums/station_traits/_station_trait.dm b/code/datums/station_traits/_station_trait.dm index e4d21caf063..be2f14dea39 100644 --- a/code/datums/station_traits/_station_trait.dm +++ b/code/datums/station_traits/_station_trait.dm @@ -49,10 +49,12 @@ GLOBAL_LIST_EMPTY(lobby_station_traits) GLOB.dynamic_station_traits[src] = threat_reduction if(dynamic_category) GLOB.dynamic_ruleset_categories = dynamic_category + /* BUBBER EDIT REMOVAL - We have our own lobby buttons if(sign_up_button) GLOB.lobby_station_traits += src if(SSstation.initialized) SSstation.display_lobby_traits() + */ if(trait_processes) START_PROCESSING(SSstation, src) if(trait_to_give) @@ -135,11 +137,13 @@ GLOBAL_LIST_EMPTY(lobby_station_traits) if (QDELETED(hud_owner)) qdel(button) continue + /* BUBBER EDIT REMOVAL - We use our own lobby buttons var/datum/hud/new_player/using_hud = hud_owner.hud_used if(!using_hud) qdel(button) continue using_hud.remove_station_trait_button(src) + */ /// Called when overriding a pulsar star command report message. /datum/station_trait/proc/get_pulsar_message() diff --git a/code/datums/station_traits/job_traits.dm b/code/datums/station_traits/job_traits.dm index 91d96869055..ce6524cc77a 100644 --- a/code/datums/station_traits/job_traits.dm +++ b/code/datums/station_traits/job_traits.dm @@ -269,9 +269,11 @@ new /obj/effect/landmark/start/pun_pun(GLOB.the_one_and_only_punpun.loc) qdel(GLOB.the_one_and_only_punpun) +/* BUBBER EDIT REMOVAL - We use our own lobby buttons /datum/station_trait/job/pun_pun/on_lobby_button_update_overlays(atom/movable/screen/lobby/button/sign_up/lobby_button, list/overlays) . = ..() overlays += LAZYFIND(lobby_candidates, lobby_button.get_mob()) ? "pun_pun_on" : "pun_pun_off" +*/ #undef CAN_ROLL_ALWAYS #undef CAN_ROLL_PROTECTED diff --git a/code/game/machinery/computer/communications.dm b/code/game/machinery/computer/communications.dm index 0ea20d3bf03..2e50520f61b 100755 --- a/code/game/machinery/computer/communications.dm +++ b/code/game/machinery/computer/communications.dm @@ -491,7 +491,7 @@ GLOBAL_VAR_INIT(cops_arrived, FALSE) GLOB.pizza_order = pick(GLOB.pizza_names) call_911(EMERGENCY_RESPONSE_EMAG) to_chat(usr, span_notice("Thank you for choosing Dogginos, [GLOB.pizza_order]!")) - playsound(src, 'sound/machines/terminal_prompt_confirm.ogg', 50, FALSE) + playsound(src, 'sound/machines/terminal/terminal_prompt_confirm.ogg', 50, FALSE) if("toggleEngOverride") if(emergency_access_cooldown(usr)) //if were in cooldown, dont allow the following code return diff --git a/code/game/objects/items/melee/energy.dm b/code/game/objects/items/melee/energy.dm index ed791e5ca2e..eec42f8b60d 100644 --- a/code/game/objects/items/melee/energy.dm +++ b/code/game/objects/items/melee/energy.dm @@ -33,10 +33,10 @@ // SKYRAT EDIT ADD START /// The sound played when the item is turned on - var/enable_sound = 'sound/weapons/saberon.ogg' + var/enable_sound = 'sound/items/weapons/saberon.ogg' /// The sound played when the item is turned off - var/disable_sound = 'sound/weapons/saberoff.ogg' + var/disable_sound = 'sound/items/weapons/saberoff.ogg' // SKYRAT EDIT ADD END diff --git a/code/game/objects/items/tools/weldingtool.dm b/code/game/objects/items/tools/weldingtool.dm index 017a79e5d0f..01342aeb05b 100644 --- a/code/game/objects/items/tools/weldingtool.dm +++ b/code/game/objects/items/tools/weldingtool.dm @@ -409,6 +409,3 @@ if(get_fuel() < max_fuel && nextrefueltick < world.time) nextrefueltick = world.time + 10 reagents.add_reagent(/datum/reagent/fuel, 1) - - -#undef WELDER_FUEL_BURN_INTERVAL diff --git a/code/game/say.dm b/code/game/say.dm index c94a1db85a1..28a868a5c16 100644 --- a/code/game/say.dm +++ b/code/game/say.dm @@ -295,7 +295,7 @@ GLOBAL_LIST_INIT(freqtospan, list( //HACKY VIRTUALSPEAKER STUFF BEYOND THIS POINT //these exist mostly to deal with the AIs hrefs and job stuff. -/atom/movable/proc/GetJob() //Get a job, you lazy butte +/atom/movable/proc/get_job() //Get a job, you lazy butte /atom/movable/proc/GetSource() @@ -342,7 +342,7 @@ INITIALIZE_IMMEDIATE(/atom/movable/virtualspeaker) else // Unidentifiable mob job = "Unknown" -/atom/movable/virtualspeaker/GetJob() +/atom/movable/virtualspeaker/get_job() return job /atom/movable/virtualspeaker/GetSource() diff --git a/code/modules/admin/verbs/adminevents.dm b/code/modules/admin/verbs/adminevents.dm index 98b177cad64..7ecadd4891c 100644 --- a/code/modules/admin/verbs/adminevents.dm +++ b/code/modules/admin/verbs/adminevents.dm @@ -168,7 +168,7 @@ ADMIN_VERB(disable_shuttle, R_ADMIN, "Disable Shuttle", "Those fuckers aren't ge priority_announce( text = "Emergency Shuttle uplink failure, shuttle disabled until further notice.", title = "Uplink Failure", - sound = ANNOUNCER_SHUTTLE, // SKYRAT EDIT CHANGE - Announcer Sounds - ORIGINAL: sound = 'sound/misc/announce_dig.ogg', + sound = ANNOUNCER_SHUTTLE, // SKYRAT EDIT CHANGE - Announcer Sounds - ORIGINAL: sound = 'sound/announcer/announcement/announce_dig.ogg', sender_override = "Emergency Shuttle Uplink Alert", color_override = "grey", ) @@ -194,7 +194,7 @@ ADMIN_VERB(enable_shuttle, R_ADMIN, "Enable Shuttle", "Those fuckers ARE getting priority_announce( text = "Emergency Shuttle uplink reestablished, shuttle enabled.", title = "Uplink Restored", - sound = ANNOUNCER_SHUTTLE, // SKYRAT EDIT CHANGE - Announcer Sounds - ORIGINAL: sound = 'sound/misc/announce_dig.ogg', + sound = ANNOUNCER_SHUTTLE, // SKYRAT EDIT CHANGE - Announcer Sounds - ORIGINAL: sound = 'sound/announcer/announcement/announce_dig.ogg', sender_override = "Emergency Shuttle Uplink Alert", color_override = "green", ) diff --git a/code/modules/admin/view_variables/admin_delete.dm b/code/modules/admin/view_variables/admin_delete.dm index fe6e3380787..a2bd8d0b8ed 100644 --- a/code/modules/admin/view_variables/admin_delete.dm +++ b/code/modules/admin/view_variables/admin_delete.dm @@ -27,7 +27,7 @@ vv_update_display(D, "deleted", "") // Skyrat edit addition start -- optional bluespace sparks on delete if(T && prefs.read_preference(/datum/preference/toggle/admin/delete_sparks)) - playsound(T, 'sound/magic/Repulse.ogg', 100, 1) + playsound(T, 'sound/effects/magic/repulse.ogg', 100, 1) var/datum/effect_system/spark_spread/quantum/sparks = new sparks.set_up(10, 1, T) sparks.attach(T) diff --git a/code/modules/antagonists/malf_ai/malf_ai_modules.dm b/code/modules/antagonists/malf_ai/malf_ai_modules.dm index 5db4bfd546a..c54714f21c5 100644 --- a/code/modules/antagonists/malf_ai/malf_ai_modules.dm +++ b/code/modules/antagonists/malf_ai/malf_ai_modules.dm @@ -52,7 +52,7 @@ GLOBAL_LIST_INIT(blacklisted_malf_machines, typecacheof(list( /obj/machinery/computer/gateway_control, ))) -GLOBAL_LIST_INIT(malf_modules, subtypesof(/datum/ai_module/malf - /datum/ai_module/malf/destructive/nuke_station)) // BUBBER EDIT - REMOVES NUKE STATION ROUNDSTART MODULE +GLOBAL_LIST_INIT(malf_modules, subtypesof(/datum/ai_module/malf) - /datum/ai_module/malf/destructive/nuke_station) // BUBBER EDIT - REMOVES NUKE STATION ROUNDSTART MODULE /// The malf AI action subtype. All malf actions are subtypes of this. /datum/action/innate/ai diff --git a/code/modules/buildmode/submodes/advanced.dm b/code/modules/buildmode/submodes/advanced.dm index 2167a85a57c..2b5db1552da 100644 --- a/code/modules/buildmode/submodes/advanced.dm +++ b/code/modules/buildmode/submodes/advanced.dm @@ -62,7 +62,7 @@ var/turf/T = get_turf(object) qdel(object) if(T && c.prefs.read_preference(/datum/preference/toggle/admin/delete_sparks)) - playsound(T, 'sound/magic/Repulse.ogg', 100, 1) + playsound(T, 'sound/effects/magic/repulse.ogg', 100, 1) var/datum/effect_system/spark_spread/quantum/sparks = new sparks.set_up(10, 1, T) sparks.attach(T) diff --git a/code/modules/buildmode/submodes/basic.dm b/code/modules/buildmode/submodes/basic.dm index a37c6becfa1..4aacc5a6dba 100644 --- a/code/modules/buildmode/submodes/basic.dm +++ b/code/modules/buildmode/submodes/basic.dm @@ -41,7 +41,7 @@ var/turf/T = get_turf(object) qdel(object) if(T && c.prefs.read_preference(/datum/preference/toggle/admin/delete_sparks)) - playsound(T, 'sound/magic/Repulse.ogg', 100, 1) + playsound(T, 'sound/effects/magic/repulse.ogg', 100, 1) var/datum/effect_system/spark_spread/quantum/sparks = new sparks.set_up(10, 1, T) sparks.attach(T) diff --git a/code/modules/buildmode/submodes/delete.dm b/code/modules/buildmode/submodes/delete.dm index 79daeaa2c9d..cab05b45ae2 100644 --- a/code/modules/buildmode/submodes/delete.dm +++ b/code/modules/buildmode/submodes/delete.dm @@ -19,7 +19,7 @@ var/turf/T = get_turf(object) qdel(object) if(T && c.prefs.read_preference(/datum/preference/toggle/admin/delete_sparks)) - playsound(T, 'sound/magic/Repulse.ogg', 100, 1) + playsound(T, 'sound/effects/magic/repulse.ogg', 100, 1) var/datum/effect_system/spark_spread/quantum/sparks = new sparks.set_up(10, 1, T) sparks.attach(T) diff --git a/code/modules/client/preferences/middleware/jobs.dm b/code/modules/client/preferences/middleware/jobs.dm index 90fa6f9313a..8aefa3d3643 100644 --- a/code/modules/client/preferences/middleware/jobs.dm +++ b/code/modules/client/preferences/middleware/jobs.dm @@ -33,7 +33,7 @@ var/job_title = params["job"] var/new_job_title = params["new_title"] - var/datum/job/job = SSjob.GetJob(job_title) + var/datum/job/job = SSjob.get_job(job_title) if (isnull(job)) return FALSE diff --git a/code/modules/clothing/under/_under.dm b/code/modules/clothing/under/_under.dm index 4c95adefdf8..e9f4dda6669 100644 --- a/code/modules/clothing/under/_under.dm +++ b/code/modules/clothing/under/_under.dm @@ -233,7 +233,7 @@ else sensor_mode = pick(SENSOR_OFF, SENSOR_OFF, SENSOR_OFF, SENSOR_LIVING, SENSOR_LIVING, SENSOR_VITALS, SENSOR_VITALS, SENSOR_COORDS) - playsound(source = src, soundin = 'sound/effects/sparks3.ogg', vol = 75, vary = TRUE, extrarange = SHORT_RANGE_SOUND_EXTRARANGE, ignore_walls = FALSE) + playsound(source = src, soundin = 'sound/effects/sparks/sparks3.ogg', vol = 75, vary = TRUE, extrarange = SHORT_RANGE_SOUND_EXTRARANGE, ignore_walls = FALSE) visible_message(span_warning("The [src]'s medical sensors flash and change rapidly!"), blind_message = span_warning("The [src] makes an electronic sizzling sound!"), vision_distance = COMBAT_MESSAGE_RANGE) update_wearer_status() diff --git a/code/modules/mob/dead/observer/observer.dm b/code/modules/mob/dead/observer/observer.dm index d9b1d775a21..5b1cf278a64 100644 --- a/code/modules/mob/dead/observer/observer.dm +++ b/code/modules/mob/dead/observer/observer.dm @@ -417,7 +417,7 @@ This is the proc mobs get to turn into a ghost. Forked from ghostize due to comp //SKYRAT EDIT ADDITION - DNR TRAIT (Technically this is just to fix ghost-DNR'ing not actually DNR'ing, but it pairs with the trait so) if(!current_mob.has_quirk(/datum/quirk/dnr)) current_mob.add_quirk(/datum/quirk/dnr) - var/datum/job/job_to_free = SSjob.GetJob(current_mob.mind.assigned_role.title) + var/datum/job/job_to_free = SSjob.get_job(current_mob.mind.assigned_role.title) if(job_to_free) job_to_free.current_positions = max(0, job_to_free.current_positions - 1) //SKYRAT EDIT ADDITION END - DNR TRAIT diff --git a/code/modules/mob/living/carbon/examine.dm b/code/modules/mob/living/carbon/examine.dm index dc03dce8541..a70354beb56 100644 --- a/code/modules/mob/living/carbon/examine.dm +++ b/code/modules/mob/living/carbon/examine.dm @@ -279,6 +279,50 @@ ADD_NEWLINE_IF_NECESSARY(.) . += "Quirks: [get_quirk_string(FALSE, CAT_QUIRK_ALL)]" + //SKYRAT EDIT ADDITION BEGIN - GUNPOINT + if(gunpointing) + . += "[t_He] [t_is] holding [gunpointing.target.name] at gunpoint with [gunpointing.aimed_gun.name]!\n" + if(length(gunpointed)) + for(var/datum/gunpoint/GP in gunpointed) + . += "[GP.source.name] [GP.source.p_are()] holding [t_him] at gunpoint with [GP.aimed_gun.name]!\n" + + //SKYRAT EDIT ADDITION BEGIN - CUSTOMIZATION + for(var/genital in GLOB.possible_genitals) + if(dna.species.mutant_bodyparts[genital]) + var/datum/sprite_accessory/genital/G = SSaccessories.sprite_accessories[genital][dna.species.mutant_bodyparts[genital][MUTANT_INDEX_NAME]] + if(G) + if(!(G.is_hidden(src))) + . += "[t_He] [t_has] exposed genitals... \[Look closer...\]" + break + + var/flavor_text_link + /// The first 1-FLAVOR_PREVIEW_LIMIT characters in the mob's "flavor_text" DNA feature. FLAVOR_PREVIEW_LIMIT is defined in flavor_defines.dm. + var/preview_text = copytext_char((dna.features["flavor_text"]), 1, FLAVOR_PREVIEW_LIMIT) + // What examine_tgui.dm uses to determine if flavor text appears as "Obscured". + var/obscurity_examine_pref = (client?.prefs?.read_preference(/datum/preference/toggle/obscurity_examine)) //BUBBERSTATION EDIT + var/face_obscured = (wear_mask && (wear_mask.flags_inv & HIDEFACE) && obscurity_examine_pref) || (head && (head.flags_inv & HIDEFACE) && obscurity_examine_pref) // BUBBERSTATION EDIT + + if (!(face_obscured)) + flavor_text_link = span_notice("[preview_text]... \[Look closer?\]") + else + flavor_text_link = span_notice("\[Examine closely...\]") + if (flavor_text_link) + . += flavor_text_link + + //Temporary flavor text addition: + if(temporary_flavor_text) + if(length_char(temporary_flavor_text) < TEMPORARY_FLAVOR_PREVIEW_LIMIT) + . += span_revennotice("
They look different than usual: [temporary_flavor_text]") + else + . += span_revennotice("
They look different than usual: [copytext_char(temporary_flavor_text, 1, TEMPORARY_FLAVOR_PREVIEW_LIMIT)]... More...") + + if(client) + var/erp_status_pref = client.prefs.read_preference(/datum/preference/choiced/erp_status) + if(erp_status_pref && !CONFIG_GET(flag/disable_erp_preferences)) + . += EXAMINE_SECTION_BREAK + . += span_info("ERP Status: [span_revenboldnotice(erp_status_pref)]") + // SKYRAT EDIT END + SEND_SIGNAL(src, COMSIG_ATOM_EXAMINE, user, .) if(length(.)) .[1] = "" + .[1] @@ -549,10 +593,10 @@ return var/age_text switch(age) - if(-INFINITY to 25) - age_text = "very young" - if(26 to 35) - age_text = "of adult age" + if(-INFINITY to 17) // SKYRAT EDIT ADD START -- AGE EXAMINE + age_text = "too young to be here" + if(18 to 25) + age_text = "a young adult" // SKYRAT EDIT END if(36 to 55) age_text = "middle-aged" if(56 to 75) diff --git a/code/modules/mob/living/carbon/human/_species.dm b/code/modules/mob/living/carbon/human/_species.dm index bdf9a3b4add..da40b4fd6fc 100644 --- a/code/modules/mob/living/carbon/human/_species.dm +++ b/code/modules/mob/living/carbon/human/_species.dm @@ -1667,6 +1667,8 @@ GLOBAL_LIST_EMPTY(features_by_species) to_store += mutant_organs for(var/obj/item/organ/external/horny as anything in external_organs) to_store += horny //Haha get it? + return to_store + /* /datum/species/proc/get_mut_organs(include_brain = TRUE) var/list/mut_organs = list() @@ -1683,11 +1685,11 @@ GLOBAL_LIST_EMPTY(features_by_species) mut_organs += mutantappendix list_clear_nulls(mut_organs) return mut_organs -*/ // BUBBER EDIT - OR END + /datum/species/proc/get_types_to_preload() return get_mut_organs(FALSE) - +*/ // BUBBER EDIT - OR END /** * Owner login diff --git a/code/modules/mob/living/silicon/ai/ai_say.dm b/code/modules/mob/living/silicon/ai/ai_say.dm index a090bd68ab3..0f11fd7814c 100644 --- a/code/modules/mob/living/silicon/ai/ai_say.dm +++ b/code/modules/mob/living/silicon/ai/ai_say.dm @@ -6,7 +6,7 @@ /mob/living/silicon/ai/compose_job(atom/movable/speaker, message_langs, raw_message, radio_freq) //Also includes the for AI hrefs, for convenience. - return "[radio_freq ? " (" + speaker.GetJob() + ")" : ""]" + "[speaker.GetSource() ? "" : ""]" + return "[radio_freq ? " (" + speaker.get_job() + ")" : ""]" + "[speaker.GetSource() ? "" : ""]" /mob/living/silicon/ai/try_speak(message, ignore_spam = FALSE, forced = null, filterproof = FALSE) // AIs cannot speak if silent AI is on. diff --git a/code/modules/mob/mob.dm b/code/modules/mob/mob.dm index d0acc6e2ba0..2374d6e2323 100644 --- a/code/modules/mob/mob.dm +++ b/code/modules/mob/mob.dm @@ -580,7 +580,8 @@ var/list/result = examinify.examine(src) var/atom_title = examinify.examine_title(src, thats = TRUE) SEND_SIGNAL(src, COMSIG_MOB_EXAMINING, examinify, result) - result_combined = (atom_title ? fieldset_block("[span_slightly_larger(atom_title)].", jointext(result, "
"), "examine_block") : examine_block(jointext(result, "
"))) + result_combined = (atom_title ? "[span_slightly_larger("[atom_title][ismob(examinify) ? "!" :"."][EXAMINE_SECTION_BREAK]")]" : "") + jointext(result, "
") // BUBBER EDIT CHANGE - No centered title + exclamation point for mobs - ORIGINAL: result_combined = (atom_title ? fieldset_block("[span_slightly_larger(atom_title)].", jointext(result, "
"), "examine_block") : examine_block(jointext(result, "
"))) + result_combined = examine_block(replacetext(result_combined, "

", "
")) // BUBBER EDIT ADDITION - bit of a hack here to make sure we don't get linebreaks coming after headers, as well as properly adding the examine_block to_chat(src, span_infoplain(result_combined)) SEND_SIGNAL(src, COMSIG_MOB_EXAMINATE, examinify) diff --git a/code/modules/mod/mod_control.dm b/code/modules/mod/mod_control.dm index e19c605a31e..162f5fc63b5 100644 --- a/code/modules/mod/mod_control.dm +++ b/code/modules/mod/mod_control.dm @@ -239,7 +239,7 @@ if(active) if(!wearer.incapacitated) balloon_alert(wearer, "deactivate first!") - playsound(src, 'sound/machines/scanbuzz.ogg', 25, FALSE, SILENCED_SOUND_EXTRARANGE) + playsound(src, 'sound/machines/scanner/scanbuzz.ogg', 25, FALSE, SILENCED_SOUND_EXTRARANGE) return // SKYRAT EDIT ADDITION END diff --git a/code/modules/power/supermatter/supermatter_delamination/_sm_delam.dm b/code/modules/power/supermatter/supermatter_delamination/_sm_delam.dm index de45b46b33c..aaed210b1bd 100644 --- a/code/modules/power/supermatter/supermatter_delamination/_sm_delam.dm +++ b/code/modules/power/supermatter/supermatter_delamination/_sm_delam.dm @@ -64,7 +64,7 @@ GLOBAL_LIST_INIT(sm_delam_list, list( if(SUPERMATTER_EMERGENCY) // SKYRAT EDIT ADDITION alert_sound_to_playing('modular_skyrat/master_files/sound/effects/reactor/core_overheating.ogg', override_volume = TRUE) - alert_sound_to_playing('sound/misc/notice1.ogg', override_volume = TRUE) + alert_sound_to_playing('sound/announcer/notice/notice1.ogg', override_volume = TRUE) // SKYRAT EDIT END if(SUPERMATTER_DANGER) playsound(sm, 'sound/machines/engine_alert/engine_alert2.ogg', 100, FALSE, 30, 30, falloff_distance = 10) diff --git a/code/modules/power/supermatter/supermatter_delamination/delamination_effects.dm b/code/modules/power/supermatter/supermatter_delamination/delamination_effects.dm index 038a9153a0c..1d7cec3dd09 100644 --- a/code/modules/power/supermatter/supermatter_delamination/delamination_effects.dm +++ b/code/modules/power/supermatter/supermatter_delamination/delamination_effects.dm @@ -140,7 +140,7 @@ priority_announce( text = "Fatal error occurred in emergency shuttle uplink during transit. Unable to reestablish connection.", title = "Shuttle Failure", - sound = ANNOUNCER_SHUTTLE, // SKYRAT EDIT CHANGE - Announcer Sounds - ORIGINAL: sound = 'sound/misc/announce_dig.ogg', + sound = ANNOUNCER_SHUTTLE, // SKYRAT EDIT CHANGE - Announcer Sounds - ORIGINAL: sound = 'sound/announcer/announcement/announce_dig.ogg', sender_override = "Emergency Shuttle Uplink Alert", color_override = "grey", ) diff --git a/code/modules/surgery/organs/external/restyling.dm b/code/modules/surgery/organs/external/restyling.dm index 0d055432057..0ae13b68c6a 100644 --- a/code/modules/surgery/organs/external/restyling.dm +++ b/code/modules/surgery/organs/external/restyling.dm @@ -41,13 +41,13 @@ target_organ = valid_features[1] if(2 to INFINITY) var/choose_options = list() -// BUBBER EDIT - OR BEGIN + // BUBBER EDIT - OR BEGIN var/name_to_organ = list() //literally so I dont have to loop again after someones made their choice for(var/obj/item/organ/external/organ_choice as anything in valid_features) -/* + /* var/name_to_organ = list() //literally so I don't have to loop again after someone's made their choice for(var/obj/item/organ/organ_choice as anything in valid_features) -*/ // BUBBER EDIT - OR END + */ // BUBBER EDIT - OR END choose_options[organ_choice.name] = image(organ_choice) name_to_organ[organ_choice.name] = organ_choice var/picked_option = show_radial_menu(trimmer, original_target, choose_options, radius = 38, require_near = TRUE) diff --git a/modular_skyrat/master_files/code/datums/components/crusher.dm b/modular_skyrat/master_files/code/datums/components/crusher.dm index 1e69decd78a..4819adf91d7 100644 --- a/modular_skyrat/master_files/code/datums/components/crusher.dm +++ b/modular_skyrat/master_files/code/datums/components/crusher.dm @@ -151,7 +151,7 @@ if(target.dir & get_dir(user, target)) backstabbed = TRUE dealt_damage += backstab_bonus - playsound(user, 'sound/weapons/kinetic_accel.ogg', 100, TRUE) + playsound(user, 'sound/items/weapons/kinetic_accel.ogg', 100, TRUE) damage_effect.total_damage += dealt_damage new /obj/effect/temp_visual/kinetic_blast(get_turf(target)) @@ -206,7 +206,7 @@ // just typing spawn(-1) is faster ugghhh tg INVOKE_ASYNC(destabilizer, TYPE_PROC_REF(/obj/projectile, fire)) - playsound(user, 'sound/weapons/plasma_cutter.ogg', 100, TRUE) + playsound(user, 'sound/items/weapons/plasma_cutter.ogg', 100, TRUE) var/obj/item/crusher = parent charged = FALSE @@ -220,5 +220,5 @@ var/obj/item/crusher = parent charged = TRUE crusher.update_appearance() - playsound(crusher.loc, 'sound/weapons/kinetic_reload.ogg', 60, TRUE) + playsound(crusher.loc, 'sound/items/weapons/kinetic_reload.ogg', 60, TRUE) diff --git a/modular_skyrat/master_files/code/datums/components/shielded_suit.dm b/modular_skyrat/master_files/code/datums/components/shielded_suit.dm index 94601de771a..50767c2c0c5 100644 --- a/modular_skyrat/master_files/code/datums/components/shielded_suit.dm +++ b/modular_skyrat/master_files/code/datums/components/shielded_suit.dm @@ -13,7 +13,7 @@ var/obj/item/item_parent = parent COOLDOWN_START(src, charge_add_cd, charge_increment_delay) adjust_charge(charge_recovery) // set the number of charges to current + recovery per increment, clamped from zero to max_charges - playsound(item_parent, 'sound/magic/charge.ogg', 50, TRUE) + playsound(item_parent, 'sound/effects/magic/charge.ogg', 50, TRUE) /datum/component/shielded/suit/default_run_hit_callback(mob/living/owner, attack_text, current_charges) diff --git a/modular_skyrat/master_files/code/datums/votes/_vote_datum.dm b/modular_skyrat/master_files/code/datums/votes/_vote_datum.dm index 7c0b057ce2a..9f31c7a3a1c 100644 --- a/modular_skyrat/master_files/code/datums/votes/_vote_datum.dm +++ b/modular_skyrat/master_files/code/datums/votes/_vote_datum.dm @@ -5,4 +5,4 @@ */ /datum/vote /// The sound effect played to everyone when this vote is initiated. - vote_sound = 'sound/misc/announce_dig.ogg' + vote_sound = 'sound/announcer/announcement/announce_dig.ogg' diff --git a/modular_skyrat/master_files/code/game/objects/items/holy_weapons.dm b/modular_skyrat/master_files/code/game/objects/items/holy_weapons.dm index f4fa02707f7..01d200f5015 100644 --- a/modular_skyrat/master_files/code/game/objects/items/holy_weapons.dm +++ b/modular_skyrat/master_files/code/game/objects/items/holy_weapons.dm @@ -171,7 +171,7 @@ slot_flags = ITEM_SLOT_BELT sharpness = SHARP_EDGED w_class = WEIGHT_CLASS_NORMAL - hitsound = 'sound/weapons/bladeslice.ogg' + hitsound = 'sound/items/weapons/bladeslice.ogg' attack_verb_continuous = list("attacks", "slashes", "stabs", "slices", "tears", "lacerates", "rips", "dices", "rends") attack_verb_simple = list("attack", "slash", "stab", "slice", "tear", "lacerate", "rip", "dice", "rend") diff --git a/modular_skyrat/master_files/code/modules/clothing/back/antigravityharness.dm b/modular_skyrat/master_files/code/modules/clothing/back/antigravityharness.dm index 0cff51c5959..ec0e8ca0b55 100644 --- a/modular_skyrat/master_files/code/modules/clothing/back/antigravityharness.dm +++ b/modular_skyrat/master_files/code/modules/clothing/back/antigravityharness.dm @@ -259,12 +259,12 @@ if(!cell_cover_open) balloon_alert(user, "open the cell cover first!") - playsound(src, 'sound/machines/buzz-sigh.ogg', 25, TRUE, SILENCED_SOUND_EXTRARANGE) + playsound(src, 'sound/machines/buzz/buzz-sigh.ogg', 25, TRUE, SILENCED_SOUND_EXTRARANGE) return ITEM_INTERACT_BLOCKING if(current_cell) balloon_alert(user, "cell already installed!") - playsound(src, 'sound/machines/buzz-sigh.ogg', 25, TRUE, SILENCED_SOUND_EXTRARANGE) + playsound(src, 'sound/machines/buzz/buzz-sigh.ogg', 25, TRUE, SILENCED_SOUND_EXTRARANGE) return ITEM_INTERACT_BLOCKING /// Shadow realm? I'm sending you to Lake City, FL! diff --git a/modular_skyrat/master_files/code/modules/clothing/head/monkey_magnification_helmet.dm b/modular_skyrat/master_files/code/modules/clothing/head/monkey_magnification_helmet.dm index c6eca255b1e..7ab31b43d1f 100644 --- a/modular_skyrat/master_files/code/modules/clothing/head/monkey_magnification_helmet.dm +++ b/modular_skyrat/master_files/code/modules/clothing/head/monkey_magnification_helmet.dm @@ -43,7 +43,7 @@ var/mob/living/something = user to_chat(something, span_boldnotice("You feel a stabbing pain in the back of your head for a moment.")) something.apply_damage(5, BRUTE, BODY_ZONE_HEAD, FALSE, FALSE, FALSE) // notably: no damage resist (it's in your helmet), no damage spread (it's in your helmet) - playsound(src, 'sound/machines/buzz-sigh.ogg', 30, TRUE) + playsound(src, 'sound/machines/buzz/buzz-sigh.ogg', 30, TRUE) return if(!(GLOB.ghost_role_flags & GHOSTROLE_STATION_SENTIENCE)) say("ERROR: Central Command has temporarily outlawed monkey sentience helmets in this sector. NEAREST LAWFUL SECTOR: 2.537 million light years away.") @@ -64,7 +64,7 @@ UnregisterSignal(magnification, COMSIG_SPECIES_LOSS) magnification = null visible_message(span_notice("[src] falls silent and drops on the floor. Maybe you should try again later?")) - playsound(src, 'sound/machines/buzz-sigh.ogg', 30, TRUE) + playsound(src, 'sound/machines/buzz/buzz-sigh.ogg', 30, TRUE) user.dropItemToGround(src) return @@ -88,7 +88,7 @@ return // either used up correctly or taken off before polling finished (punish this by having a chance to gib the monkey?) UnregisterSignal(magnification, COMSIG_SPECIES_LOSS) - playsound(src, 'sound/machines/buzz-sigh.ogg', 30, TRUE) + playsound(src, 'sound/machines/buzz/buzz-sigh.ogg', 30, TRUE) ADD_TRAIT(magnification, TRAIT_PRIMITIVE, SPECIES_TRAIT) // We removed it, now that they're back to being dumb, add the trait again. if(!polling)// put on a viable head, but taken off after polling finished. if(magnification.client) diff --git a/modular_skyrat/master_files/code/modules/mining/equipment/explorer_gear.dm b/modular_skyrat/master_files/code/modules/mining/equipment/explorer_gear.dm index bb167106187..f28eb8c9c9d 100644 --- a/modular_skyrat/master_files/code/modules/mining/equipment/explorer_gear.dm +++ b/modular_skyrat/master_files/code/modules/mining/equipment/explorer_gear.dm @@ -76,7 +76,7 @@ return success /obj/item/clothing/suit/hifl_suit/proc/make_sound() - playsound(src, 'sound/mecha/mechmove03.ogg', 25, TRUE, SHORT_RANGE_SOUND_EXTRARANGE) + playsound(src, 'sound/vehicles/mecha/mechmove03.ogg', 25, TRUE, SHORT_RANGE_SOUND_EXTRARANGE) /datum/movespeed_modifier/hifl_equip multiplicative_slowdown = 1.5 diff --git a/modular_skyrat/master_files/code/modules/mining/equipment/kinetic_crusher.dm b/modular_skyrat/master_files/code/modules/mining/equipment/kinetic_crusher.dm index 78019081b29..92206a3e055 100644 --- a/modular_skyrat/master_files/code/modules/mining/equipment/kinetic_crusher.dm +++ b/modular_skyrat/master_files/code/modules/mining/equipment/kinetic_crusher.dm @@ -18,7 +18,7 @@ /datum/material/iron = HALF_SHEET_MATERIAL_AMOUNT * 1.15, /datum/material/glass = HALF_SHEET_MATERIAL_AMOUNT * 2.075 ) - hitsound = 'sound/weapons/bladeslice.ogg' + hitsound = 'sound/items/weapons/bladeslice.ogg' attack_verb_continuous = list("smashes", "crushes", "cleaves", "chops", "pulps") attack_verb_simple = list("smash", "crush", "cleave", "chop", "pulp") sharpness = SHARP_EDGED @@ -39,7 +39,7 @@ AddComponent(/datum/component/butchering, speed = 6 SECONDS, effectiveness = 110) AddComponent(/datum/component/kinetic_crusher, detonation_damage, backstab_bonus, charge_time, CALLBACK(src, PROC_REF(attack_check)), CALLBACK(src, PROC_REF(attack_check))) AddComponent(/datum/component/two_handed, force_wielded = 20, force_unwielded = 0, unwield_callback = CALLBACK(src, PROC_REF(on_unwield))) - RegisterSignal(src, COMSIG_HIT_BY_SABOTEUR, PROC_REF(on_saboteur)) + RegisterSignal(src, COMSIG_ATOM_SABOTEUR_ACT, PROC_REF(do_saboteur)) /obj/item/kinetic_crusher/proc/attack_check(mob/user, cancel_attack) if(HAS_TRAIT(src, TRAIT_WIELDED)) @@ -53,7 +53,7 @@ /obj/item/kinetic_crusher/ui_action_click(mob/user, actiontype) set_light_on(!light_on) - playsound(user, 'sound/weapons/empty.ogg', 100, TRUE) + playsound(user, 'sound/items/weapons/empty.ogg', 100, TRUE) update_appearance() ////////////////////////////////////////////////////////////////////////////////// @@ -68,9 +68,9 @@ /////// HACK TO WORK AROUND TWOHANDED NOT RESPECTING FORCE_UNWIELDED=0 /////////// ////////////////////////////////////////////////////////////////////////////////// -/obj/item/kinetic_crusher/proc/on_saboteur(datum/source, disrupt_duration) +/obj/item/kinetic_crusher/proc/do_saboteur(datum/source, disrupt_duration) set_light_on(FALSE) - playsound(src, 'sound/weapons/empty.ogg', 100, TRUE) + playsound(src, 'sound/items/weapons/empty.ogg', 100, TRUE) return COMSIG_SABOTEUR_SUCCESS /obj/item/kinetic_crusher/update_icon_state() diff --git a/modular_skyrat/master_files/code/modules/mining/equipment/kinetic_gauntlets.dm b/modular_skyrat/master_files/code/modules/mining/equipment/kinetic_gauntlets.dm index eb29bc4c0fc..d92c6f55309 100644 --- a/modular_skyrat/master_files/code/modules/mining/equipment/kinetic_gauntlets.dm +++ b/modular_skyrat/master_files/code/modules/mining/equipment/kinetic_gauntlets.dm @@ -25,7 +25,7 @@ attack_verb_continuous = list("slaps", "challenges") attack_verb_simple = list("slap", "challenge") equip_delay_self = 2 SECONDS //that's a lot of bulky - hitsound = 'sound/weapons/slap.ogg' + hitsound = 'sound/items/weapons/slap.ogg' slot_flags = ITEM_SLOT_GLOVES w_class = WEIGHT_CLASS_BULKY @@ -74,7 +74,7 @@ return FALSE //you WILL glass cannon and you WILL like it. /obj/item/clothing/gloves/kinetic_gauntlets/proc/after_detonate(mob/living/user, mob/living/target) - playsound(src, 'sound/weapons/resonator_blast.ogg', 40, TRUE) + playsound(src, 'sound/items/weapons/resonator_blast.ogg', 40, TRUE) var/old_dir_user = user.dir var/old_dir_target = user.dir step(user, get_dir(target, user)) @@ -114,14 +114,14 @@ can_deploy = FALSE if(!can_deploy) - playsound(src, 'sound/machines/scanbuzz.ogg', 25, TRUE, SILENCED_SOUND_EXTRARANGE) + playsound(src, 'sound/machines/scanner/scanbuzz.ogg', 25, TRUE, SILENCED_SOUND_EXTRARANGE) to_chat(wearer, span_warning("You need both free hands to deploy [src]!")) return // equipping/unequipping shall take time wearer.add_movespeed_modifier(/datum/movespeed_modifier/equipping_gauntlets) if(!do_after(wearer, 1.5 SECONDS, src, IGNORE_USER_LOC_CHANGE, interaction_key = type)) - playsound(src, 'sound/machines/scanbuzz.ogg', 25, TRUE, SILENCED_SOUND_EXTRARANGE) + playsound(src, 'sound/machines/scanner/scanbuzz.ogg', 25, TRUE, SILENCED_SOUND_EXTRARANGE) to_chat(wearer, span_warning("You fail to deploy [src]!")) wearer.remove_movespeed_modifier(/datum/movespeed_modifier/equipping_gauntlets) return @@ -134,7 +134,7 @@ can_deploy = FALSE if(!can_deploy) - playsound(src, 'sound/machines/scanbuzz.ogg', 25, TRUE, SILENCED_SOUND_EXTRARANGE) + playsound(src, 'sound/machines/scanner/scanbuzz.ogg', 25, TRUE, SILENCED_SOUND_EXTRARANGE) to_chat(wearer, span_warning("You need both free hands to deploy [src]!")) return @@ -146,8 +146,8 @@ ADD_TRAIT(src, TRAIT_NODROP, type) - playsound(src, 'sound/mecha/mechmove03.ogg', 25, TRUE, SHORT_RANGE_SOUND_EXTRARANGE) - playsound(src, 'sound/mecha/mechmove01.ogg', 25, TRUE, SHORT_RANGE_SOUND_EXTRARANGE) + playsound(src, 'sound/vehicles/mecha/mechmove03.ogg', 25, TRUE, SHORT_RANGE_SOUND_EXTRARANGE) + playsound(src, 'sound/vehicles/mecha/mechmove01.ogg', 25, TRUE, SHORT_RANGE_SOUND_EXTRARANGE) to_chat(wearer, span_notice("You deploy [src].")) /obj/item/clothing/gloves/kinetic_gauntlets/proc/retract_gauntlets() @@ -165,7 +165,7 @@ wearer.add_movespeed_modifier(/datum/movespeed_modifier/equipping_gauntlets) if(!do_after(wearer, 1.5 SECONDS, src, IGNORE_USER_LOC_CHANGE)) wearer.remove_movespeed_modifier(/datum/movespeed_modifier/equipping_gauntlets) - playsound(src, 'sound/machines/scanbuzz.ogg', 25, TRUE, SILENCED_SOUND_EXTRARANGE) + playsound(src, 'sound/machines/scanner/scanbuzz.ogg', 25, TRUE, SILENCED_SOUND_EXTRARANGE) to_chat(wearer, span_warning("You fail to retract [src]!")) return @@ -175,8 +175,8 @@ right_gauntlet?.forceMove(src) REMOVE_TRAIT(src, TRAIT_NODROP, type) - playsound(src, 'sound/mecha/powerloader_turn2.ogg', 25, TRUE, SHORT_RANGE_SOUND_EXTRARANGE) - playsound(src, 'sound/mecha/mechmove01.ogg', 25, TRUE, SHORT_RANGE_SOUND_EXTRARANGE) + playsound(src, 'sound/vehicles/mecha/powerloader_turn2.ogg', 25, TRUE, SHORT_RANGE_SOUND_EXTRARANGE) + playsound(src, 'sound/vehicles/mecha/mechmove01.ogg', 25, TRUE, SHORT_RANGE_SOUND_EXTRARANGE) to_chat(wearer, span_notice("You retract [src].")) @@ -222,7 +222,7 @@ /obj/item/kinetic_gauntlet/attack(mob/living/target_mob, mob/living/user, params) . = ..() - playsound(src, 'sound/weapons/genhit2.ogg', 40, TRUE) + playsound(src, 'sound/items/weapons/genhit2.ogg', 40, TRUE) next_attack = world.time + 0.8 SECONDS // same as a crusher user.changeNext_move(CLICK_CD_HYPER_RAPID) //forgive me if(istype(user.get_inactive_held_item(), /obj/item/kinetic_gauntlet)) @@ -240,11 +240,11 @@ /obj/item/kinetic_gauntlet/left/Initialize(mapload) . = ..() if(linked_gauntlets) - RegisterSignal(linked_gauntlets, COMSIG_HIT_BY_SABOTEUR, PROC_REF(on_saboteur)) + RegisterSignal(linked_gauntlets, COMSIG_ATOM_SABOTEUR_ACT, PROC_REF(do_saboteur)) /obj/item/kinetic_gauntlet/left/Destroy(force) if(linked_gauntlets) - UnregisterSignal(linked_gauntlets, COMSIG_HIT_BY_SABOTEUR) + UnregisterSignal(linked_gauntlets, COMSIG_ATOM_SABOTEUR_ACT) linked_gauntlets.set_light_on(FALSE) return ..() @@ -255,11 +255,11 @@ /obj/item/kinetic_gauntlet/left/attack_self(mob/user, modifiers) linked_gauntlets.set_light_on(!linked_gauntlets.light_on) - playsound(src, 'sound/weapons/empty.ogg', 100, TRUE) + playsound(src, 'sound/items/weapons/empty.ogg', 100, TRUE) update_appearance() -/obj/item/kinetic_gauntlet/left/proc/on_saboteur(datum/source, disrupt_duration) +/obj/item/kinetic_gauntlet/left/proc/do_saboteur(datum/source, disrupt_duration) linked_gauntlets.set_light_on(FALSE) - playsound(src, 'sound/weapons/empty.ogg', 100, TRUE) + playsound(src, 'sound/items/weapons/empty.ogg', 100, TRUE) update_appearance() return COMSIG_SABOTEUR_SUCCESS diff --git a/modular_skyrat/master_files/code/modules/mob/living/carbon/carbon_defense.dm b/modular_skyrat/master_files/code/modules/mob/living/carbon/carbon_defense.dm index 89120849497..fb1c1c2a842 100644 --- a/modular_skyrat/master_files/code/modules/mob/living/carbon/carbon_defense.dm +++ b/modular_skyrat/master_files/code/modules/mob/living/carbon/carbon_defense.dm @@ -7,7 +7,7 @@ var/target_on_help_and_unarmed = !target.combat_mode && !target.get_active_held_item() if(target_on_help_and_unarmed || HAS_TRAIT(target, TRAIT_RESTRAINED)) do_slap_animation(target) - playsound(target.loc, 'sound/weapons/slap.ogg', 50, TRUE, -1) + playsound(target.loc, 'sound/items/weapons/slap.ogg', 50, TRUE, -1) visible_message("[src] slaps [target] in the face!", "You slap [target] in the face! ",\ "You hear a slap.") @@ -29,12 +29,12 @@ visible_message(span_danger("[src] tried slapping [target]'s ass, but they were blocked!"), span_danger("You tried slapping [target]'s ass, but they blocked you!"), "You hear a slap.", ignored_mobs = list(target)) - playsound(target.loc, 'sound/weapons/thudswoosh.ogg', 50, TRUE, ASS_SLAP_EXTRA_RANGE) + playsound(target.loc, 'sound/items/weapons/thudswoosh.ogg', 50, TRUE, ASS_SLAP_EXTRA_RANGE) to_chat(target, span_danger("[src] tried slapping your ass, but you blocked them!")) return else do_ass_slap_animation(target) - playsound(target.loc, 'sound/weapons/slap.ogg', 50, TRUE, ASS_SLAP_EXTRA_RANGE) + playsound(target.loc, 'sound/items/weapons/slap.ogg', 50, TRUE, ASS_SLAP_EXTRA_RANGE) visible_message("[src] slaps [target] right on the ass!",\ "You slap [target] on the ass, how satisfying.",\ "You hear a slap.", ignored_mobs = list(target)) diff --git a/modular_skyrat/master_files/code/modules/mob/living/simple_animal/friendly/dogs.dm b/modular_skyrat/master_files/code/modules/mob/living/simple_animal/friendly/dogs.dm index bbc1aa7b916..1001513b695 100644 --- a/modular_skyrat/master_files/code/modules/mob/living/simple_animal/friendly/dogs.dm +++ b/modular_skyrat/master_files/code/modules/mob/living/simple_animal/friendly/dogs.dm @@ -209,7 +209,7 @@ fired_projectile = new /obj/projectile/beam(loc) fired_projectile.icon = 'icons/mob/effects/genetics.dmi' fired_projectile.icon_state = "eyelasers" - fire_sound = 'sound/weapons/taser.ogg' + fire_sound = 'sound/items/weapons/taser.ogg' playsound(loc, fire_sound, vol = 75, vary = TRUE) fired_projectile.preparePixelProjectile(target, source_turf) diff --git a/modular_skyrat/master_files/code/modules/mob/living/simple_animal/friendly/pets.dm b/modular_skyrat/master_files/code/modules/mob/living/simple_animal/friendly/pets.dm index cfab59da88f..b49984fa55c 100644 --- a/modular_skyrat/master_files/code/modules/mob/living/simple_animal/friendly/pets.dm +++ b/modular_skyrat/master_files/code/modules/mob/living/simple_animal/friendly/pets.dm @@ -147,7 +147,7 @@ melee_damage_upper = 5 attack_verb_continuous = "bites" attack_verb_simple = "bite" - attack_sound = 'sound/weapons/bite.ogg' + attack_sound = 'sound/items/weapons/bite.ogg' attack_vis_effect = ATTACK_EFFECT_BITE ai_controller = /datum/ai_controller/basic_controller/fox/docile //he's a nice boy diff --git a/modular_skyrat/master_files/code/modules/mob/living/simple_animal/friendly/poppy.dm b/modular_skyrat/master_files/code/modules/mob/living/simple_animal/friendly/poppy.dm index 0e87ab86645..c5443d2f6d3 100644 --- a/modular_skyrat/master_files/code/modules/mob/living/simple_animal/friendly/poppy.dm +++ b/modular_skyrat/master_files/code/modules/mob/living/simple_animal/friendly/poppy.dm @@ -128,7 +128,7 @@ upset = TRUE icon_state = "poppypossum_aaa" - emote("sweatdrop") + //emote("sweatdrop") - BUBBER TODO - Make this not lint do_jitter_animation(60) manual_emote("'s fur stands up, [src.p_their()] body trembling...") diff --git a/modular_skyrat/master_files/code/modules/mob/living/simple_animal/friendly/syndicatefox.dm b/modular_skyrat/master_files/code/modules/mob/living/simple_animal/friendly/syndicatefox.dm index e804bb3af5f..d4b89993a9c 100644 --- a/modular_skyrat/master_files/code/modules/mob/living/simple_animal/friendly/syndicatefox.dm +++ b/modular_skyrat/master_files/code/modules/mob/living/simple_animal/friendly/syndicatefox.dm @@ -16,7 +16,7 @@ butcher_results = list(/obj/item/food/meat/slab = 3) attack_verb_continuous = "bites" attack_verb_simple = "bite" - attack_sound = 'sound/weapons/bite.ogg' + attack_sound = 'sound/items/weapons/bite.ogg' attack_vis_effect = ATTACK_EFFECT_BITE melee_damage_lower = 20 //same damage as a carp would make - reference to Paradise Station's Syndifox melee_damage_upper = 20 diff --git a/modular_skyrat/master_files/code/modules/mob/living/simple_animal/hostile/grabbagmob.dm b/modular_skyrat/master_files/code/modules/mob/living/simple_animal/hostile/grabbagmob.dm index 530a91cc6af..afa9c22f231 100644 --- a/modular_skyrat/master_files/code/modules/mob/living/simple_animal/hostile/grabbagmob.dm +++ b/modular_skyrat/master_files/code/modules/mob/living/simple_animal/hostile/grabbagmob.dm @@ -70,7 +70,7 @@ melee_damage_upper = 10 attack_verb_continuous = "punches" attack_verb_simple = "punch" - attack_sound = 'sound/weapons/punch1.ogg' + attack_sound = 'sound/items/weapons/punch1.ogg' combat_mode = TRUE loot = list(/obj/effect/gibspawner/human) atmos_requirements = null @@ -93,7 +93,7 @@ melee_damage_upper = 15 attack_verb_continuous = "slashes" attack_verb_simple = "slash" - attack_sound = 'sound/weapons/bladeslice.ogg' + attack_sound = 'sound/items/weapons/bladeslice.ogg' /mob/living/simple_animal/hostile/cult/mannequin name = "Runed Doll" @@ -107,7 +107,7 @@ melee_damage_upper = 15 attack_verb_continuous = "slashes" attack_verb_simple = "slash" - attack_sound = 'sound/weapons/bladeslice.ogg' + attack_sound = 'sound/items/weapons/bladeslice.ogg' loot = list(/obj/effect/decal/cleanable/robot_debris) /mob/living/simple_animal/hostile/cult/horror @@ -122,7 +122,7 @@ melee_damage_upper = 15 attack_verb_continuous = "slashes" attack_verb_simple = "slash" - attack_sound = 'sound/weapons/bladeslice.ogg' + attack_sound = 'sound/items/weapons/bladeslice.ogg' /mob/living/simple_animal/hostile/cult/warrior name = "Cultist Warrior" @@ -136,7 +136,7 @@ melee_damage_upper = 15 attack_verb_continuous = "slashes" attack_verb_simple = "slash" - attack_sound = 'sound/weapons/bladeslice.ogg' + attack_sound = 'sound/items/weapons/bladeslice.ogg' /mob/living/simple_animal/hostile/cult/spear name = "Cultist Spearmen" @@ -150,7 +150,7 @@ melee_damage_upper = 15 attack_verb_continuous = "slashes" attack_verb_simple = "slash" - attack_sound = 'sound/weapons/bladeslice.ogg' + attack_sound = 'sound/items/weapons/bladeslice.ogg' /mob/living/simple_animal/hostile/cult/assassin name = "Cultist Assassin" @@ -164,7 +164,7 @@ melee_damage_upper = 15 attack_verb_continuous = "slashes" attack_verb_simple = "slash" - attack_sound = 'sound/weapons/bladeslice.ogg' + attack_sound = 'sound/items/weapons/bladeslice.ogg' /mob/living/simple_animal/hostile/cult/magic name = "Cult Blood Mage" @@ -174,7 +174,7 @@ icon_living = "cultmage" move_to_delay = 10 projectiletype = /obj/projectile/magic/spell/magic_missile/lesser - projectilesound = 'sound/magic/ethereal_enter.ogg' + projectilesound = 'sound/effects/magic/ethereal_enter.ogg' ranged = TRUE ranged_message = "fires a spell" ranged_cooldown_time = 8 @@ -187,7 +187,7 @@ attack_verb_continuous = "punches" combat_mode = TRUE speak_emote = list("chants") - attack_sound = 'sound/magic/magic_missile.ogg' + attack_sound = 'sound/effects/magic/magic_missile.ogg' aggro_vision_range = 9 turns_per_move = 5 mob_biotypes = MOB_ORGANIC|MOB_HUMANOID @@ -213,7 +213,7 @@ health = 150 move_to_delay = 10 projectiletype = /obj/projectile/magic/arcane_barrage - projectilesound = 'sound/weapons/barragespellhit.ogg' + projectilesound = 'sound/items/weapons/barragespellhit.ogg' // Looters /mob/living/simple_animal/hostile/looter @@ -231,7 +231,7 @@ melee_damage_upper = 18 attack_verb_continuous = "pipes" attack_verb_simple = "bludgeon" - attack_sound = 'sound/weapons/smash.ogg' + attack_sound = 'sound/items/weapons/smash.ogg' atmos_requirements = null unsuitable_atmos_damage = 15 check_friendly_fire = 1 @@ -268,7 +268,7 @@ melee_damage_upper = 18 attack_verb_continuous = "smashes" attack_verb_simple = "smash" - attack_sound = 'sound/weapons/bladeslice.ogg' + attack_sound = 'sound/items/weapons/bladeslice.ogg' /mob/living/simple_animal/hostile/looter/ranged name = "Looter Gunman" @@ -285,7 +285,7 @@ loot = list(/obj/effect/spawner/random/maintenance/five) dodging = FALSE faction = list(FACTION_HOSTILE) - projectilesound = 'sound/weapons/gun/shotgun/shot.ogg' + projectilesound = 'sound/items/weapons/gun/shotgun/shot.ogg' /mob/living/simple_animal/hostile/looter/ranged/space name = "Looter Shipbreaker" @@ -293,7 +293,7 @@ icon_state = "scavsmg" icon_living = "scavsmg" casingtype = /obj/item/ammo_casing/c9mm - projectilesound = 'sound/weapons/gun/pistol/shot.ogg' + projectilesound = 'sound/items/weapons/gun/pistol/shot.ogg' loot = list(/obj/effect/spawner/random/maintenance/five) atmos_requirements = null minbodytemp = 0 @@ -308,7 +308,7 @@ desc = "A shipbreaker scavenger, carrying a laser gun." icon_state = "scavlaser" icon_living = "scavlaser" - projectilesound = 'sound/weapons/laser3.ogg' + projectilesound = 'sound/items/weapons/laser3.ogg' loot = list(/obj/effect/spawner/random/maintenance/five) projectiletype = /obj/projectile/beam/laser @@ -328,9 +328,9 @@ melee_damage_upper = 10 attack_verb_continuous = "claws" attack_verb_simple = "claw" - attack_sound = 'sound/weapons/bladeslice.ogg' + attack_sound = 'sound/items/weapons/bladeslice.ogg' attack_vis_effect = ATTACK_EFFECT_CLAW - projectilesound = 'sound/weapons/gun/pistol/shot.ogg' + projectilesound = 'sound/items/weapons/gun/pistol/shot.ogg' projectiletype = /obj/projectile/hivebotbullet faction = list(FACTION_HOSTILE) check_friendly_fire = 1 @@ -357,7 +357,7 @@ melee_damage_upper = 20 attack_verb_continuous = "saws" attack_verb_simple = "saw" - attack_sound = 'sound/weapons/chainsawhit.ogg' + attack_sound = 'sound/items/weapons/chainsawhit.ogg' /mob/living/simple_animal/hostile/evilborg/peace name = "Malfunctioning Peacekeeper Cyborg" @@ -371,7 +371,7 @@ melee_damage_upper = 18 attack_verb_continuous = "smacks" attack_verb_simple = "smack" - attack_sound = 'sound/weapons/cqchit1.ogg' + attack_sound = 'sound/items/weapons/cqchit1.ogg' /mob/living/simple_animal/hostile/evilborg/engi name = "Malfunctioning Engineering Cyborg" @@ -386,7 +386,7 @@ melee_damage_upper = 15 attack_verb_continuous = "welds" attack_verb_simple = "weld" - attack_sound = 'sound/items/welder.ogg' + attack_sound = 'sound/items/tools/welder.ogg' /mob/living/simple_animal/hostile/evilborg/sec name = "Malfunctioning Security Cyborg" @@ -395,7 +395,7 @@ icon_state = "evilbotsec" icon_living = "evilbotsec" casingtype = /obj/item/ammo_casing/c45 - projectilesound = 'sound/weapons/gun/smg/shot.ogg' + projectilesound = 'sound/items/weapons/gun/smg/shot.ogg' health = 75 maxHealth = 75 ranged = 1 @@ -403,7 +403,7 @@ melee_damage_upper = 8 attack_verb_continuous = "gunbutts" attack_verb_simple = "gunbutt" - attack_sound = 'sound/weapons/smash.ogg' + attack_sound = 'sound/items/weapons/smash.ogg' /mob/living/simple_animal/hostile/evilborg/roomba name = "Malfunctioning Roomba Cyborg" @@ -417,7 +417,7 @@ melee_damage_upper = 12 attack_verb_continuous = "pokes" attack_verb_simple = "stab" - attack_sound = 'sound/weapons/genhit2.ogg' + attack_sound = 'sound/items/weapons/genhit2.ogg' /mob/living/simple_animal/hostile/evilborg/dog name = "Malfunctioning Canine Cyborg" @@ -431,7 +431,7 @@ melee_damage_upper = 12 attack_verb_continuous = "cleaves" attack_verb_simple = "smash" - attack_sound = 'sound/weapons/bladeslice.ogg' + attack_sound = 'sound/items/weapons/bladeslice.ogg' /mob/living/simple_animal/hostile/evilborg/dogstrong name = "Corrupt Hound" @@ -445,7 +445,7 @@ melee_damage_upper = 18 attack_verb_continuous = "bites" attack_verb_simple = "bite" - attack_sound = 'sound/weapons/bite.ogg' + attack_sound = 'sound/items/weapons/bite.ogg' /mob/living/simple_animal/hostile/evilborg/bigguy name = "Malfunctioning Military robot" @@ -454,7 +454,7 @@ icon_state = "sentrybot" icon_living = "sentrybot" casingtype = /obj/item/ammo_casing/c45 - projectilesound = 'sound/weapons/gun/smg/shot.ogg' + projectilesound = 'sound/items/weapons/gun/smg/shot.ogg' health = 250 maxHealth = 250 ranged = 1 @@ -462,7 +462,7 @@ melee_damage_upper = 12 attack_verb_continuous = "gunbutts" attack_verb_simple = "gunbutt" - attack_sound = 'sound/weapons/smash.ogg' + attack_sound = 'sound/items/weapons/smash.ogg' /mob/living/simple_animal/hostile/evilborg/protect name = "Malfunctioning Standard Robot" @@ -476,7 +476,7 @@ melee_damage_upper = 15 attack_verb_continuous = "claws" attack_verb_simple = "punch" - attack_sound = 'sound/weapons/genhit2.ogg' + attack_sound = 'sound/items/weapons/genhit2.ogg' // Beasts @@ -507,7 +507,7 @@ melee_damage_upper = 20 attack_verb_continuous = "claws" attack_verb_simple = "pinch" - attack_sound = 'sound/weapons/genhit2.ogg' + attack_sound = 'sound/items/weapons/genhit2.ogg' speak_emote = list("gnashes") atmos_requirements = null minbodytemp = 0 @@ -542,7 +542,7 @@ melee_damage_upper = 18 attack_verb_continuous = "bites" attack_verb_simple = "bite" - attack_sound = 'sound/weapons/bite.ogg' + attack_sound = 'sound/items/weapons/bite.ogg' speak_emote = list("screeches") atmos_requirements = null minbodytemp = 0 @@ -580,7 +580,7 @@ melee_damage_upper = 18 attack_verb_continuous = "bites" attack_verb_simple = "slash" - attack_sound = 'sound/weapons/bite.ogg' + attack_sound = 'sound/items/weapons/bite.ogg' speak_emote = list("gurlges") atmos_requirements = null minbodytemp = 0 @@ -619,7 +619,7 @@ move_to_delay = 4 attack_verb_continuous = "stings" attack_verb_simple = "sting" - attack_sound = 'sound/weapons/genhit2.ogg' + attack_sound = 'sound/items/weapons/genhit2.ogg' speak_emote = list("buzzes") atmos_requirements = null minbodytemp = 0 @@ -658,7 +658,7 @@ melee_damage_upper = 20 attack_verb_continuous = "slashes" attack_verb_simple = "slash" - attack_sound = 'sound/weapons/bladeslice.ogg' + attack_sound = 'sound/items/weapons/bladeslice.ogg' speak_emote = list("growls") atmos_requirements = null minbodytemp = 0 @@ -690,7 +690,7 @@ melee_damage_upper = 15 attack_verb_continuous = "stings" attack_verb_simple = "sting" - attack_sound = 'sound/weapons/genhit2.ogg' + attack_sound = 'sound/items/weapons/genhit2.ogg' speak_emote = list("chitters") atmos_requirements = null minbodytemp = 0 @@ -724,7 +724,7 @@ melee_damage_upper = 15 attack_verb_continuous = "bosses" attack_verb_simple = "boss" - attack_sound = 'sound/weapons/cqchit2.ogg' + attack_sound = 'sound/items/weapons/cqchit2.ogg' speak_emote = list("squeaks") emote_see = list("squeaks.", "practices CQC.", "cocks the bolt of a tiny CR20.", "plots to steal DAT DISK!", "fiddles with a tiny radio.") speak_chance = 1 @@ -761,7 +761,7 @@ melee_damage_upper = 10 attack_verb_continuous = "punches" attack_verb_simple = "punch" - attack_sound = 'sound/weapons/cqchit1.ogg' + attack_sound = 'sound/items/weapons/cqchit1.ogg' speak_emote = list("clacks") atmos_requirements = null minbodytemp = 0 @@ -796,7 +796,7 @@ melee_damage_upper =10 attack_verb_continuous = "claws" attack_verb_simple = "slice" - attack_sound = 'sound/weapons/bladeslice.ogg' + attack_sound = 'sound/items/weapons/bladeslice.ogg' speak_emote = list("chitters") atmos_requirements = null minbodytemp = 0 @@ -863,7 +863,7 @@ melee_damage_upper = 10 attack_verb_continuous = "claws" attack_verb_simple = "claw" - attack_sound = 'sound/weapons/pierce_slow.ogg' + attack_sound = 'sound/items/weapons/pierce_slow.ogg' combat_mode = TRUE loot = list(/obj/effect/spawner/random/maintenance/three = 1) atmos_requirements = null @@ -886,7 +886,7 @@ loot = list(/obj/effect/spawner/random/medical/medkit = 1) attack_verb_continuous = "slashes" attack_verb_simple = "slash" - attack_sound = 'sound/weapons/bladeslice.ogg' + attack_sound = 'sound/items/weapons/bladeslice.ogg' attack_vis_effect = ATTACK_EFFECT_SLASH status_flags = 0 @@ -902,7 +902,7 @@ retreat_distance = 5 minimum_distance = 5 casingtype = /obj/item/ammo_casing/c9mm - projectilesound = 'sound/weapons/gun/pistol/shot.ogg' + projectilesound = 'sound/items/weapons/gun/pistol/shot.ogg' loot = list(/obj/effect/spawner/random/engineering/material_rare = 2) dodging = FALSE rapid_melee = 1 @@ -914,7 +914,7 @@ icon_living = "voxlaser" icon_dead = "voxsuitdead" projectiletype = /obj/projectile/beam/laser - projectilesound = 'sound/weapons/laser3.ogg' + projectilesound = 'sound/items/weapons/laser3.ogg' /mob/living/simple_animal/hostile/vox/ranged/space name = "Vox Space Raider" @@ -926,7 +926,7 @@ retreat_distance = 5 minimum_distance = 5 casingtype = /obj/item/ammo_casing/c9mm - projectilesound = 'sound/weapons/gun/pistol/shot.ogg' + projectilesound = 'sound/items/weapons/gun/pistol/shot.ogg' loot = list(/obj/effect/spawner/random/maintenance/five = 1) dodging = FALSE rapid_melee = 1 @@ -939,7 +939,7 @@ icon_dead = "voxspacedead" loot = list(/obj/effect/spawner/random/engineering/material_rare = 4) projectiletype = /obj/projectile/beam/laser - projectilesound = 'sound/weapons/laser3.ogg' + projectilesound = 'sound/items/weapons/laser3.ogg' /mob/living/basic/gorilla/pitbull diff --git a/modular_skyrat/master_files/code/modules/power/circulator.dm b/modular_skyrat/master_files/code/modules/power/circulator.dm index 9b0e14a4dd3..1150ab60c3c 100644 --- a/modular_skyrat/master_files/code/modules/power/circulator.dm +++ b/modular_skyrat/master_files/code/modules/power/circulator.dm @@ -269,7 +269,7 @@ return flipped = !flipped balloon_alert(usr, span_notice("You flip [src].")) - playsound(src, 'sound/items/change_drill.ogg', 50) + playsound(src, 'sound/items/tools/change_drill.ogg', 50) update_icon_nopipes() /obj/machinery/atmospherics/components/binary/circulator/atom_break(damage_flag) diff --git a/modular_skyrat/modules/Midroundtraitor/code/event.dm b/modular_skyrat/modules/Midroundtraitor/code/event.dm index ebaa5abaf44..fbbd39bfc43 100644 --- a/modular_skyrat/modules/Midroundtraitor/code/event.dm +++ b/modular_skyrat/modules/Midroundtraitor/code/event.dm @@ -42,7 +42,7 @@ operative.dna.species.pre_equip_species_outfit(null, operative) operative.regenerate_icons() SSquirks.AssignQuirks(operative, applicant.client, TRUE, TRUE, null, FALSE, operative) - player_mind.set_assigned_role(SSjob.GetJobType(/datum/job/lone_operative)) + player_mind.set_assigned_role(SSjob.get_job_type(/datum/job/lone_operative)) player_mind.special_role = "Lone Infiltrator" player_mind.active = TRUE player_mind.transfer_to(operative) diff --git a/modular_skyrat/modules/aesthetics/airlock/code/airlock.dm b/modular_skyrat/modules/aesthetics/airlock/code/airlock.dm index c5471732c47..8215d636fa1 100644 --- a/modular_skyrat/modules/aesthetics/airlock/code/airlock.dm +++ b/modular_skyrat/modules/aesthetics/airlock/code/airlock.dm @@ -389,8 +389,8 @@ name = "tram door" icon = 'modular_skyrat/modules/aesthetics/airlock/icons/airlocks/tram/tram.dmi' overlays_file = 'modular_skyrat/modules/aesthetics/airlock/icons/airlocks/tram/tram_overlays.dmi' - doorOpen = 'sound/machines/tramopen.ogg' - doorClose = 'sound/machines/tramclose.ogg' + doorOpen = 'sound/machines/tram/tramopen.ogg' + doorClose = 'sound/machines/tram/tramclose.ogg' /obj/machinery/door/airlock/tram/set_light(l_range, l_power, l_color = NONSENSICAL_VALUE, l_angle, l_dir, l_height, l_on) return diff --git a/modular_skyrat/modules/aesthetics/guns/code/guns.dm b/modular_skyrat/modules/aesthetics/guns/code/guns.dm index 5cab7555930..b93a52c6b32 100644 --- a/modular_skyrat/modules/aesthetics/guns/code/guns.dm +++ b/modular_skyrat/modules/aesthetics/guns/code/guns.dm @@ -205,11 +205,11 @@ w_class = WEIGHT_CLASS_BULKY inhand_icon_state = "sniper" worn_icon_state = null - fire_sound = 'sound/weapons/gun/sniper/shot.ogg' + fire_sound = 'sound/items/weapons/gun/sniper/shot.ogg' fire_sound_volume = 90 - load_sound = 'sound/weapons/gun/sniper/mag_insert.ogg' - rack_sound = 'sound/weapons/gun/sniper/rack.ogg' - suppressed_sound = 'sound/weapons/gun/general/heavy_shot_suppressed.ogg' + load_sound = 'sound/items/weapons/gun/sniper/mag_insert.ogg' + rack_sound = 'sound/items/weapons/gun/sniper/rack.ogg' + suppressed_sound = 'sound/items/weapons/gun/general/heavy_shot_suppressed.ogg' recoil = 2 weapon_weight = WEAPON_HEAVY accepted_magazine_type = /obj/item/ammo_box/magazine/sniper_rounds @@ -279,8 +279,8 @@ suppressed_sound = 'modular_skyrat/modules/aesthetics/guns/sound/sniperrifle_s.ogg' fire_sound_volume = 90 vary_fire_sound = FALSE - load_sound = 'sound/weapons/gun/sniper/mag_insert.ogg' - rack_sound = 'sound/weapons/gun/sniper/rack.ogg' + load_sound = 'sound/items/weapons/gun/sniper/mag_insert.ogg' + rack_sound = 'sound/items/weapons/gun/sniper/rack.ogg' w_class = WEIGHT_CLASS_NORMAL can_suppress = TRUE can_unsuppress = TRUE diff --git a/modular_skyrat/modules/airlock_override/code/airlock_override.dm b/modular_skyrat/modules/airlock_override/code/airlock_override.dm index 0d05ae18082..1b86592db60 100644 --- a/modular_skyrat/modules/airlock_override/code/airlock_override.dm +++ b/modular_skyrat/modules/airlock_override/code/airlock_override.dm @@ -145,7 +145,7 @@ GLOBAL_VAR_INIT(force_eng_override, FALSE) /proc/toggle_eng_override() if(!GLOB.force_eng_override) GLOB.force_eng_override = TRUE - minor_announce("Engineering staff will have expanded access to areas of the station during the emergency.", "Engineering Emergency", sound_override = 'sound/misc/notice1.ogg') + minor_announce("Engineering staff will have expanded access to areas of the station during the emergency.", "Engineering Emergency", sound_override = 'sound/announcer/notice/notice1.ogg') SEND_GLOBAL_SIGNAL(COMSIG_GLOB_FORCE_ENG_OVERRIDE, TRUE) SSblackbox.record_feedback("nested tally", "keycard_auths", 1, list("engineer override access", "enabled")) else diff --git a/modular_skyrat/modules/alerts/code/default_announcer.dm b/modular_skyrat/modules/alerts/code/default_announcer.dm index 86add70db58..01b7e50ac02 100644 --- a/modular_skyrat/modules/alerts/code/default_announcer.dm +++ b/modular_skyrat/modules/alerts/code/default_announcer.dm @@ -1,9 +1,9 @@ /datum/centcom_announcer/default - welcome_sounds = list('sound/ai/default/welcome.ogg') + welcome_sounds = list('sound/announcer/default/welcome.ogg') alert_sounds = list('modular_skyrat/modules/alerts/sound/alerts/alert2.ogg') command_report_sounds = list('modular_skyrat/modules/alerts/sound/alerts/commandreport.ogg') event_sounds = list( - ANNOUNCER_AIMALF = 'sound/ai/default/aimalf.ogg', + ANNOUNCER_AIMALF = 'sound/announcer/default/aimalf.ogg', ANNOUNCER_ALIENS = 'modular_skyrat/modules/alerts/sound/alerts/lifesigns.ogg', ANNOUNCER_ANIMES = 'modular_skyrat/modules/alerts/sound/alerts/animes.ogg', ANNOUNCER_INTERCEPT = 'modular_skyrat/modules/alerts/sound/alerts/alert2.ogg', diff --git a/modular_skyrat/modules/ammo_workbench/code/ammo_workbench.dm b/modular_skyrat/modules/ammo_workbench/code/ammo_workbench.dm index 64e199150f2..92ba9ac9465 100644 --- a/modular_skyrat/modules/ammo_workbench/code/ammo_workbench.dm +++ b/modular_skyrat/modules/ammo_workbench/code/ammo_workbench.dm @@ -373,7 +373,7 @@ loaded_magazine.update_appearance() flick("ammobench_process", src) use_energy(3000 JOULES) - playsound(loc, 'sound/machines/piston_raise.ogg', 60, 1) + playsound(loc, 'sound/machines/piston/piston_raise.ogg', 60, 1) else qdel(new_casing) ammo_fill_finish(FALSE) @@ -394,7 +394,7 @@ if(successfully) playsound(loc, 'sound/machines/ping.ogg', 40, TRUE) else - playsound(loc, 'sound/machines/buzz-sigh.ogg', 40, TRUE) + playsound(loc, 'sound/machines/buzz/buzz-sigh.ogg', 40, TRUE) update_appearance() busy = FALSE if(timer_id) @@ -545,7 +545,7 @@ flick("h_lathe_load", src) update_appearance() update_ammotypes() - playsound(loc, 'sound/weapons/autoguninsert.ogg', 35, 1) + playsound(loc, 'sound/items/weapons/autoguninsert.ogg', 35, 1) return TRUE if(istype(O, /obj/item/disk/ammo_workbench)) if(!user.transferItemToLoc(O, src)) @@ -554,7 +554,7 @@ to_chat(user, span_notice("You insert [O] to into [src]'s floppydisk port.")) flick("h_lathe_load", src) update_appearance() - playsound(loc, 'sound/machines/terminal_insert_disc.ogg', 35, 1) + playsound(loc, 'sound/machines/terminal/terminal_insert_disc.ogg', 35, 1) return TRUE return FALSE diff --git a/modular_skyrat/modules/apc_arcing/code/apc.dm b/modular_skyrat/modules/apc_arcing/code/apc.dm index 6b6fd71404b..348b0873b9f 100644 --- a/modular_skyrat/modules/apc_arcing/code/apc.dm +++ b/modular_skyrat/modules/apc_arcing/code/apc.dm @@ -32,7 +32,7 @@ if(length(shock_mobs)) var/mob/living/living_target = pick(shock_mobs) living_target.electrocute_act(rand(5, 25), "electrical arc") - playsound(get_turf(living_target), 'sound/magic/lightningshock.ogg', 75, TRUE) + playsound(get_turf(living_target), 'sound/effects/magic/lightningshock.ogg', 75, TRUE) Beam(living_target, icon_state = "lightning[rand(1, 12)]", icon = 'icons/effects/beam.dmi', time = 5) /obj/machinery/power/apc/item_interaction(mob/living/user, obj/item/tool, list/modifiers) @@ -49,7 +49,7 @@ bronze.use(1) balloon_alert(user, "installed arc shielding") arc_shielded = TRUE - playsound(src, 'sound/items/rped.ogg', 20) + playsound(src, 'sound/items/tools/rped.ogg', 20) return ITEM_INTERACT_SUCCESS /obj/machinery/power/apc/wrench_act(mob/living/user, obj/item/tool) . = ..() diff --git a/modular_skyrat/modules/armaments/code/armament_component.dm b/modular_skyrat/modules/armaments/code/armament_component.dm index 2c1ff2b915c..a089db93b91 100644 --- a/modular_skyrat/modules/armaments/code/armament_component.dm +++ b/modular_skyrat/modules/armaments/code/armament_component.dm @@ -177,7 +177,7 @@ user.put_in_hands(inserted_card) inserted_card = null to_chat(user, span_notice("Card ejected!")) - playsound(src, 'sound/machines/terminal_insert_disc.ogg', 70) + playsound(src, 'sound/machines/terminal/terminal_insert_disc.ogg', 70) /datum/component/armament/proc/select_armament(mob/user, datum/armament_entry/armament_entry) if(!inserted_card) diff --git a/modular_skyrat/modules/ashwalkers/code/buildings/ash_tendril.dm b/modular_skyrat/modules/ashwalkers/code/buildings/ash_tendril.dm index 01056fa6c20..0174c8fa0da 100644 --- a/modular_skyrat/modules/ashwalkers/code/buildings/ash_tendril.dm +++ b/modular_skyrat/modules/ashwalkers/code/buildings/ash_tendril.dm @@ -15,7 +15,7 @@ if(!regen_core.preserve()) balloon_alert(user, "organ decayed!") return - playsound(src, 'sound/magic/demon_consume.ogg', 50, TRUE) + playsound(src, 'sound/effects/magic/demon_consume.ogg', 50, TRUE) balloon_alert_to_viewers("[src] revitalizes [regen_core]!") return @@ -53,7 +53,7 @@ if(allow_transform < REQUIRED_OBSERVERS) balloon_alert_to_viewers("[src] rejects the request, not enough viewers!") - playsound(src, 'sound/magic/demon_consume.ogg', 50, TRUE) + playsound(src, 'sound/effects/magic/demon_consume.ogg', 50, TRUE) human_user.adjustBruteLoss(10) return @@ -63,7 +63,7 @@ if(choice != "Yes") balloon_alert_to_viewers("[src] feels rejected and punishes [human_user]!") - playsound(src, 'sound/magic/demon_consume.ogg', 50, TRUE) + playsound(src, 'sound/effects/magic/demon_consume.ogg', 50, TRUE) human_user.adjustBruteLoss(50) return @@ -79,7 +79,7 @@ ADD_TRAIT(human_user, TRAIT_RESISTCOLD, ROUNDSTART_TRAIT) ADD_TRAIT(human_user, TRAIT_PRIMITIVE, ROUNDSTART_TRAIT) - playsound(src, 'sound/magic/demon_dies.ogg', 50, TRUE) + playsound(src, 'sound/effects/magic/demon_dies.ogg', 50, TRUE) meat_counter++ return ..() @@ -107,7 +107,7 @@ else meat_counter++ - playsound(get_turf(src),'sound/magic/demon_consume.ogg', 100, TRUE) + playsound(get_turf(src),'sound/effects/magic/demon_consume.ogg', 100, TRUE) var/delivery_key = viewable_living.fingerprintslast //key of whoever brought the body var/mob/living/delivery_mob = get_mob_by_key(delivery_key) //mob of said key diff --git a/modular_skyrat/modules/ashwalkers/code/buildings/tendril_cursing.dm b/modular_skyrat/modules/ashwalkers/code/buildings/tendril_cursing.dm index a8df699a735..6feaf522f54 100644 --- a/modular_skyrat/modules/ashwalkers/code/buildings/tendril_cursing.dm +++ b/modular_skyrat/modules/ashwalkers/code/buildings/tendril_cursing.dm @@ -4,7 +4,7 @@ /obj/structure/spawner/lavaland/attackby(obj/item/attacking_item, mob/user, params) if(istype(attacking_item, /obj/item/cursed_dagger)) - playsound(get_turf(src), 'sound/magic/demon_attack1.ogg', 50, TRUE) + playsound(get_turf(src), 'sound/effects/magic/demon_attack1.ogg', 50, TRUE) cursed = !cursed if(cursed) src.add_atom_colour("#41007e", TEMPORARY_COLOUR_PRIORITY) diff --git a/modular_skyrat/modules/ashwalkers/code/effects/ash_rituals.dm b/modular_skyrat/modules/ashwalkers/code/effects/ash_rituals.dm index 5fc751d41d4..4fe43d1f82a 100644 --- a/modular_skyrat/modules/ashwalkers/code/effects/ash_rituals.dm +++ b/modular_skyrat/modules/ashwalkers/code/effects/ash_rituals.dm @@ -125,7 +125,7 @@ continue to_chat(select_mob, span_userdanger("The planet stirs... another monster has arrived!")) - playsound(get_turf(select_mob), 'sound/magic/demon_attack1.ogg', 50, TRUE) + playsound(get_turf(select_mob), 'sound/effects/magic/demon_attack1.ogg', 50, TRUE) flash_color(select_mob, flash_color = "#FF0000", flash_time = 3 SECONDS) var/megafauna_choice = pick( diff --git a/modular_skyrat/modules/ashwalkers/code/items/ash_tool.dm b/modular_skyrat/modules/ashwalkers/code/items/ash_tool.dm index e2e0a53a347..1510903bd7d 100644 --- a/modular_skyrat/modules/ashwalkers/code/items/ash_tool.dm +++ b/modular_skyrat/modules/ashwalkers/code/items/ash_tool.dm @@ -104,5 +104,5 @@ to_chat(living_user, span_warning("[src] leaps from you satisfied and begins to grossly assemble itself!")) var/type = pick(/obj/structure/spawner/lavaland, /obj/structure/spawner/lavaland/goliath, /obj/structure/spawner/lavaland/legion) new type(user.loc) - playsound(get_turf(src), 'sound/magic/demon_attack1.ogg', 50, TRUE) + playsound(get_turf(src), 'sound/effects/magic/demon_attack1.ogg', 50, TRUE) qdel(src) diff --git a/modular_skyrat/modules/ashwalkers/code/items/ashwalker_shaman.dm b/modular_skyrat/modules/ashwalkers/code/items/ashwalker_shaman.dm index bcac6a17418..84d9abb2f59 100644 --- a/modular_skyrat/modules/ashwalkers/code/items/ashwalker_shaman.dm +++ b/modular_skyrat/modules/ashwalkers/code/items/ashwalker_shaman.dm @@ -41,7 +41,7 @@ if(istype(I, /obj/item/ash_staff) && user.mind.has_antag_datum(/datum/antagonist/ashwalker)) var/obj/item/ash_staff/target_staff = I target_staff.staff_time = world.time + 5 MINUTES - playsound(src, 'sound/magic/demon_consume.ogg', 50, TRUE) + playsound(src, 'sound/effects/magic/demon_consume.ogg', 50, TRUE) to_chat(user, span_notice("The tendril permits you to have more time to corrupt the world with ashes.")) return return ..() diff --git a/modular_skyrat/modules/assault_operatives/code/base_alarm.dm b/modular_skyrat/modules/assault_operatives/code/base_alarm.dm index e27756ca7f3..dae5109a7ce 100644 --- a/modular_skyrat/modules/assault_operatives/code/base_alarm.dm +++ b/modular_skyrat/modules/assault_operatives/code/base_alarm.dm @@ -42,7 +42,7 @@ /obj/machinery/base_alarm/attack_hand(mob/user) add_fingerprint(user) to_chat(user, span_notice("You trigger [src]!")) - playsound(src, 'sound/machines/pda_button1.ogg', 100) + playsound(src, 'sound/machines/pda_button/pda_button1.ogg', 100) trigger_alarm() /obj/machinery/base_alarm/attack_ai(mob/user) diff --git a/modular_skyrat/modules/assault_operatives/code/dynamic_rulsesets_roundstart.dm b/modular_skyrat/modules/assault_operatives/code/dynamic_rulsesets_roundstart.dm index 8c24baad5c7..d492d249fa0 100644 --- a/modular_skyrat/modules/assault_operatives/code/dynamic_rulsesets_roundstart.dm +++ b/modular_skyrat/modules/assault_operatives/code/dynamic_rulsesets_roundstart.dm @@ -36,7 +36,7 @@ break var/mob/candidate = pick_n_take(candidates) assigned += candidate.mind - candidate.mind.set_assigned_role(SSjob.GetJobType(/datum/job/assault_operative)) + candidate.mind.set_assigned_role(SSjob.get_job_type(/datum/job/assault_operative)) candidate.mind.special_role = ROLE_ASSAULT_OPERATIVE GLOB.pre_setup_antags += candidate.mind return TRUE diff --git a/modular_skyrat/modules/assault_operatives/code/interrogator.dm b/modular_skyrat/modules/assault_operatives/code/interrogator.dm index 6c61caaf498..a685f09cc89 100644 --- a/modular_skyrat/modules/assault_operatives/code/interrogator.dm +++ b/modular_skyrat/modules/assault_operatives/code/interrogator.dm @@ -83,7 +83,7 @@ processing = FALSE locked = FALSE human_occupant = null - playsound(src, 'sound/machines/buzz-two.ogg', 100) + playsound(src, 'sound/machines/buzz/buzz-two.ogg', 100) balloon_alert_to_viewers("process aborted!") if(timer_id) deltimer(timer_id) @@ -120,7 +120,7 @@ return if(!SSgoldeneye.check_goldeneye_target(human_occupant.mind)) // Preventing abuse by method of duplication. balloon_alert_to_viewers("no GoldenEye data!") - playsound(src, 'sound/machines/scanbuzz.ogg', 100) + playsound(src, 'sound/machines/scanner/scanbuzz.ogg', 100) return start_extract() @@ -136,10 +136,10 @@ /obj/machinery/interrogator/proc/stage_one() if(!check_requirements()) say("Critical error! Aborting.") - playsound(src, 'sound/machines/scanbuzz.ogg', 100) + playsound(src, 'sound/machines/scanner/scanbuzz.ogg', 100) return to_chat(human_occupant, span_danger("As [src] whirrs to life you feel some cold metal restraints deploy around you, you can't move!")) - playsound(loc, 'sound/items/rped.ogg', 60) + playsound(loc, 'sound/items/tools/rped.ogg', 60) say("Stage one complete!") minor_announce("SECURITY BREACH DETECTED, NETWORK COMPROMISED! LOCATION UNTRACEABLE.", "GoldenEye Defence Network") timer_id = addtimer(CALLBACK(src, PROC_REF(stage_two)), rand(STAGE_PROCESS_TIME_LOWER, STAGE_PROCESS_TIME_UPPER), TIMER_STOPPABLE|TIMER_UNIQUE) @@ -147,20 +147,20 @@ /obj/machinery/interrogator/proc/stage_two() if(!check_requirements()) say("Critical error! Aborting.") - playsound(src, 'sound/machines/scanbuzz.ogg', 100) + playsound(src, 'sound/machines/scanner/scanbuzz.ogg', 100) return to_chat(human_occupant, span_userdanger("You feel a sharp pain as a drill penetrates your skull, it's unbearable!")) human_occupant.emote("scream") human_occupant.apply_damage(30, BRUTE, BODY_ZONE_HEAD) playsound(src, 'sound/effects/wounds/blood1.ogg', 100) - playsound(src, 'sound/items/drill_use.ogg', 100) + playsound(src, 'sound/items/tools/drill_use.ogg', 100) say("Stage two complete!") timer_id = addtimer(CALLBACK(src, PROC_REF(stage_three)), rand(STAGE_PROCESS_TIME_LOWER, STAGE_PROCESS_TIME_UPPER), TIMER_STOPPABLE|TIMER_UNIQUE) /obj/machinery/interrogator/proc/stage_three() if(!check_requirements()) say("Critical error! Aborting.") - playsound(src, 'sound/machines/scanbuzz.ogg', 100) + playsound(src, 'sound/machines/scanner/scanbuzz.ogg', 100) return to_chat(human_occupant, span_userdanger("You feel something penetrating your brain, it feels as though your childhood memories are fading! Please, make it stop! After a moment of silence, you realize you can't remember what happened to you!")) human_occupant.emote("scream") diff --git a/modular_skyrat/modules/assault_operatives/code/turrets.dm b/modular_skyrat/modules/assault_operatives/code/turrets.dm index 1a4ef8975ca..2fc64725bbc 100644 --- a/modular_skyrat/modules/assault_operatives/code/turrets.dm +++ b/modular_skyrat/modules/assault_operatives/code/turrets.dm @@ -13,7 +13,7 @@ lethal_projectile = /obj/projectile/bullet/a357 lethal_projectile_sound = 'modular_skyrat/modules/aesthetics/guns/sound/sniperrifle.ogg' stun_projectile = /obj/projectile/energy/electrode - stun_projectile_sound = 'sound/weapons/taser.ogg' + stun_projectile_sound = 'sound/items/weapons/taser.ogg' max_integrity = 600 armor_type = /datum/armor/assaultops_shuttle @@ -35,6 +35,6 @@ icon_state = "standard_stun" base_icon_state = "standard" stun_projectile = /obj/projectile/energy/electrode - stun_projectile_sound = 'sound/weapons/taser.ogg' + stun_projectile_sound = 'sound/items/weapons/taser.ogg' lethal_projectile = /obj/projectile/beam/laser/heavylaser - lethal_projectile_sound = 'sound/weapons/lasercannonfire.ogg' + lethal_projectile_sound = 'sound/items/weapons/lasercannonfire.ogg' diff --git a/modular_skyrat/modules/automapper/code/area_spawn_subsystem.dm b/modular_skyrat/modules/automapper/code/area_spawn_subsystem.dm index ccc2cbbb132..89fd12bd407 100644 --- a/modular_skyrat/modules/automapper/code/area_spawn_subsystem.dm +++ b/modular_skyrat/modules/automapper/code/area_spawn_subsystem.dm @@ -272,7 +272,7 @@ SUBSYSTEM_DEF(area_spawn) * Attempts to find a location using an algorithm to spawn the desired atom. */ /datum/area_spawn/proc/try_spawn() - if(SSmapping.config.map_name in blacklisted_stations) + if(SSmapping.current_map.map_name in blacklisted_stations) return // Turfs that are available @@ -288,7 +288,7 @@ SUBSYSTEM_DEF(area_spawn) if(!LAZYLEN(available_turfs)) if(!optional) - log_mapping("[src.type] could not find any suitable turfs on map [SSmapping.config.map_name]!") + log_mapping("[src.type] could not find any suitable turfs on map [SSmapping.current_map.map_name]!") SSarea_spawn.failed_area_spawns += src.type return @@ -326,7 +326,7 @@ SUBSYSTEM_DEF(area_spawn) * Spawn the atoms. */ /datum/area_spawn_over/proc/try_spawn() - if(SSmapping.config.map_name in blacklisted_stations) + if(SSmapping.current_map.map_name in blacklisted_stations) return for(var/area_type in target_areas) diff --git a/modular_skyrat/modules/automapper/code/automapper_subsystem.dm b/modular_skyrat/modules/automapper/code/automapper_subsystem.dm index 562af4c787a..2e95e8bbb04 100644 --- a/modular_skyrat/modules/automapper/code/automapper_subsystem.dm +++ b/modular_skyrat/modules/automapper/code/automapper_subsystem.dm @@ -41,7 +41,7 @@ SUBSYSTEM_DEF(automapper) // !builtin is a magic code for built in maps, ie CentCom levels. // We'll pretend it's loaded with the station z-level, because they by definition they are loaded before the station z-levels. - var/requires_builtin = (required_map == AUTOMAPPER_MAP_BUILTIN) && ((SSmapping.config.map_file in map_names) || SSmapping.config.map_file == map_names) + var/requires_builtin = (required_map == AUTOMAPPER_MAP_BUILTIN) && ((SSmapping.current_map.map_file in map_names) || SSmapping.current_map.map_file == map_names) if(!requires_builtin && !(required_map in map_names)) continue @@ -72,7 +72,7 @@ SUBSYSTEM_DEF(automapper) if(!islist(map_names)) map_names = list(map_names) for(var/datum/map_template/automap_template/iterating_template as anything in preloaded_map_templates) - if(iterating_template.affects_builtin_map && ((SSmapping.config.map_file in map_names) || SSmapping.config.map_file == map_names)) + if(iterating_template.affects_builtin_map && ((SSmapping.current_map.map_file in map_names) || SSmapping.current_map.map_file == map_names)) // CentCom already started loading objects, place them in the netherzone for(var/turf/old_turf as anything in iterating_template.get_affected_turfs(iterating_template.load_turf, FALSE)) init_contents(old_turf) diff --git a/modular_skyrat/modules/awaymissions_skyrat/mothership_astrum/mob.dm b/modular_skyrat/modules/awaymissions_skyrat/mothership_astrum/mob.dm index e2fd442e1de..15cdf821333 100644 --- a/modular_skyrat/modules/awaymissions_skyrat/mothership_astrum/mob.dm +++ b/modular_skyrat/modules/awaymissions_skyrat/mothership_astrum/mob.dm @@ -21,7 +21,7 @@ melee_damage_upper = 10 attack_verb_continuous = "punches" attack_verb_simple = "punch" - attack_sound = 'sound/weapons/punch1.ogg' + attack_sound = 'sound/items/weapons/punch1.ogg' combat_mode = TRUE status_flags = CANPUSH @@ -50,7 +50,7 @@ melee_damage_upper = 20 attack_verb_continuous = "slashes" attack_verb_simple = "slash" - attack_sound = 'sound/weapons/bladeslice.ogg' + attack_sound = 'sound/items/weapons/bladeslice.ogg' attack_vis_effect = ATTACK_EFFECT_SLASH @@ -85,7 +85,7 @@ /mob/living/basic/abductor/ranged/Initialize(mapload) . = ..() - AddComponent(/datum/component/ranged_attacks, projectile_sound = 'sound/weapons/laser.ogg', projectile_type = /obj/projectile/beam/laser) + AddComponent(/datum/component/ranged_attacks, projectile_sound = 'sound/items/weapons/laser.ogg', projectile_type = /obj/projectile/beam/laser) // Tankier variant diff --git a/modular_skyrat/modules/barricades/code/barricade.dm b/modular_skyrat/modules/barricades/code/barricade.dm index a3faa5ebef9..d15bf93fb86 100644 --- a/modular_skyrat/modules/barricades/code/barricade.dm +++ b/modular_skyrat/modules/barricades/code/barricade.dm @@ -123,7 +123,7 @@ if(!do_after(user, 2 SECONDS, src)) return TRUE - playsound(src, 'sound/items/wirecutter.ogg', 25, TRUE) + playsound(src, 'sound/items/tools/wirecutter.ogg', 25, TRUE) user.visible_message(span_notice("[user] removed the barbed wire on [src]."), span_notice("You removed the barbed wire on [src].")) modify_max_integrity(max_integrity - 50) @@ -386,7 +386,7 @@ to_chat(user, span_warning("[src] cannot be folded up while damaged!")) return CLICK_ACTION_BLOCKING user.visible_message(span_notice("[user] folds [src] up!"), span_notice("You neatly fold [src] up!")) - playsound(src, 'sound/items/ratchet.ogg', 25, TRUE) + playsound(src, 'sound/items/tools/ratchet.ogg', 25, TRUE) fold_up() return CLICK_ACTION_SUCCESS return ..() @@ -476,7 +476,7 @@ user.visible_message(span_notice("[user] attaches[choice] to [src]."), span_notice("You attach [choice] to [src].")) - playsound(src, 'sound/items/screwdriver.ogg', 25, TRUE) + playsound(src, 'sound/items/tools/screwdriver.ogg', 25, TRUE) update_icon() /obj/structure/deployable_barricade/metal/examine(mob/user) @@ -511,7 +511,7 @@ user.visible_message(span_notice("[user] starts welding the damage on [src]."), span_notice("You start welding the damage on [src].")) - playsound(src, 'sound/items/welder2.ogg', 25, TRUE) + playsound(src, 'sound/items/tools/welder2.ogg', 25, TRUE) if(!do_after(user, 5 SECONDS, src)) return TRUE @@ -527,14 +527,14 @@ span_notice("You weld the damage on [src].")) repair_damage(150) update_icon() - playsound(src, 'sound/items/welder2.ogg', 25, TRUE) + playsound(src, 'sound/items/tools/welder2.ogg', 25, TRUE) return TRUE /obj/structure/deployable_barricade/metal/screwdriver_act(mob/living/user, obj/item/I) switch(build_state) if(BARRICADE_METAL_ANCHORED) //Protection panel removed step. Screwdriver to put the panel back, wrench to unsecure the anchor bolts - playsound(src, 'sound/items/screwdriver.ogg', 25, TRUE) + playsound(src, 'sound/items/tools/screwdriver.ogg', 25, TRUE) if(!do_after(user, 1 SECONDS, src)) return TRUE user.visible_message (span_notice ("[user] secures the panel on [src]."), @@ -543,7 +543,7 @@ return TRUE if(BARRICADE_METAL_FIRM) //Fully constructed step. Use screwdriver to remove the protection panels to reveal the bolts - playsound(src, 'sound/items/screwdriver.ogg', 25, TRUE) + playsound(src, 'sound/items/tools/screwdriver.ogg', 25, TRUE) if(!do_after(user, 1 SECONDS, src)) return TRUE @@ -557,7 +557,7 @@ /obj/structure/deployable_barricade/metal/wrench_act(mob/living/user, obj/item/I) switch(build_state) if(BARRICADE_METAL_ANCHORED) //Protection panel removed step. Screwdriver to put the panel back, wrench to unsecure the anchor bolts - playsound(src, 'sound/items/ratchet.ogg', 25, TRUE) + playsound(src, 'sound/items/tools/ratchet.ogg', 25, TRUE) if(!do_after(user, 1 SECONDS, src)) return TRUE user.visible_message (span_notice ("[user] loosens the anchor bolts on [src]."), @@ -579,7 +579,7 @@ to_chat(user, span_warning("There is already a barricade here.")) return TRUE - playsound(src, 'sound/items/ratchet.ogg', 25, TRUE) + playsound(src, 'sound/items/tools/ratchet.ogg', 25, TRUE) if(!do_after(user, 1 SECONDS, src)) return TRUE @@ -598,7 +598,7 @@ user.visible_message(span_notice("[user] begins to disassemble [src]."), span_notice("You start to disassemble [src].")) - playsound(src, 'sound/items/crowbar.ogg', 25, 1) + playsound(src, 'sound/items/tools/crowbar.ogg', 25, 1) if(!do_after(user, 5 SECONDS, src)) return TRUE @@ -616,7 +616,7 @@ user.visible_message(span_notice("[user] begins to detach the armor plates from [src]."), span_notice("You begin to detach the armor plates from [src].")) - playsound(src, 'sound/items/crowbar.ogg', 25, 1) + playsound(src, 'sound/items/tools/crowbar.ogg', 25, 1) if(!do_after(user, 5 SECONDS, src)) return TRUE @@ -680,7 +680,7 @@ user.visible_message(span_notice("[user] begins to disassemble [src]."), span_notice("You start to disassemble [src].")) - playsound(src, 'sound/items/crowbar.ogg', 25, 1) + playsound(src, 'sound/items/tools/crowbar.ogg', 25, 1) if(!do_after(user, 5 SECONDS, src)) return TRUE @@ -710,7 +710,7 @@ /obj/structure/deployable_barricade/metal/plasteel/proc/toggle_open(state, mob/living/user) if(state == closed) return - playsound(src, 'sound/items/ratchet.ogg', 25, 1) + playsound(src, 'sound/items/tools/ratchet.ogg', 25, 1) closed = !closed density = !density @@ -765,13 +765,13 @@ /obj/item/quickdeploy/attack_self(mob/user) to_chat(user, span_notice("You start deploying [src] in front of you.")) - playsound(src, 'sound/items/ratchet.ogg', 25, 1) + playsound(src, 'sound/items/tools/ratchet.ogg', 25, 1) if(!do_after(usr, delay, src)) return if(can_place(user)) //can_place() handles sending the error and success messages to the user var/obj/O = new thing_to_deploy(get_turf(user)) O.setDir(user.dir) - playsound(src, 'sound/items/ratchet.ogg', 25, TRUE) + playsound(src, 'sound/items/tools/ratchet.ogg', 25, TRUE) qdel(src) /obj/item/quickdeploy/proc/can_place(mob/user) diff --git a/modular_skyrat/modules/basic_mobs/code/chinchilla.dm b/modular_skyrat/modules/basic_mobs/code/chinchilla.dm index c52fd3cb1dd..a4a59f2b0a9 100644 --- a/modular_skyrat/modules/basic_mobs/code/chinchilla.dm +++ b/modular_skyrat/modules/basic_mobs/code/chinchilla.dm @@ -34,7 +34,7 @@ ///In the case 'melee_damage_upper' is somehow raised above 0 attack_verb_continuous = "bites" attack_verb_simple = "bite" - attack_sound = 'sound/weapons/bite.ogg' + attack_sound = 'sound/items/weapons/bite.ogg' attack_vis_effect = ATTACK_EFFECT_BITE ai_controller = /datum/ai_controller/basic_controller/chinchilla diff --git a/modular_skyrat/modules/bitrunning/code/virtual_domains/ancient_milsim/mobs.dm b/modular_skyrat/modules/bitrunning/code/virtual_domains/ancient_milsim/mobs.dm index 57307e36649..cf66c8ab8ad 100644 --- a/modular_skyrat/modules/bitrunning/code/virtual_domains/ancient_milsim/mobs.dm +++ b/modular_skyrat/modules/bitrunning/code/virtual_domains/ancient_milsim/mobs.dm @@ -5,7 +5,7 @@ melee_damage_upper = 20 attack_verb_continuous = "cuts" attack_verb_simple = "cut" - attack_sound = 'sound/weapons/blade1.ogg' + attack_sound = 'sound/items/weapons/blade1.ogg' attack_vis_effect = ATTACK_EFFECT_SLASH faction = list(ROLE_SYNDICATE) loot = list(/obj/effect/mob_spawn/corpse/human/cin_soldier) diff --git a/modular_skyrat/modules/black_mesa/code/mobs/headcrab.dm b/modular_skyrat/modules/black_mesa/code/mobs/headcrab.dm index e7afbf7aae7..d58911f0dab 100644 --- a/modular_skyrat/modules/black_mesa/code/mobs/headcrab.dm +++ b/modular_skyrat/modules/black_mesa/code/mobs/headcrab.dm @@ -25,7 +25,7 @@ melee_damage_upper = 5 retreat_distance = 5 minimum_distance = 5 - attack_sound = 'sound/weapons/bite.ogg' + attack_sound = 'sound/items/weapons/bite.ogg' gold_core_spawnable = HOSTILE_SPAWN loot = list(/obj/item/stack/sheet/bone) alert_sounds = list( diff --git a/modular_skyrat/modules/black_mesa/code/mobs/houndeye.dm b/modular_skyrat/modules/black_mesa/code/mobs/houndeye.dm index ee0ee204d3e..140828fbb15 100644 --- a/modular_skyrat/modules/black_mesa/code/mobs/houndeye.dm +++ b/modular_skyrat/modules/black_mesa/code/mobs/houndeye.dm @@ -20,7 +20,7 @@ harm_intent_damage = 10 melee_damage_lower = 20 melee_damage_upper = 20 - attack_sound = 'sound/weapons/bite.ogg' + attack_sound = 'sound/items/weapons/bite.ogg' gold_core_spawnable = HOSTILE_SPAWN //Since those can survive on Xen, I'm pretty sure they can thrive on any atmosphere diff --git a/modular_skyrat/modules/black_mesa/code/mobs/human_mobs.dm b/modular_skyrat/modules/black_mesa/code/mobs/human_mobs.dm index d95eeda1b30..444c5d97f5f 100644 --- a/modular_skyrat/modules/black_mesa/code/mobs/human_mobs.dm +++ b/modular_skyrat/modules/black_mesa/code/mobs/human_mobs.dm @@ -25,7 +25,7 @@ melee_damage_upper = 10 attack_verb_continuous = "punches" attack_verb_simple = "punch" - attack_sound = 'sound/weapons/punch1.ogg' + attack_sound = 'sound/items/weapons/punch1.ogg' combat_mode = TRUE loot = list(/obj/effect/gibspawner/human, /obj/item/melee/baton) atmos_requirements = list("min_oxy" = 5, "max_oxy" = 0, "min_tox" = 0, "max_tox" = 1, "min_co2" = 0, "max_co2" = 5, "min_n2" = 0, "max_n2" = 0) @@ -56,7 +56,7 @@ icon_state = "hecu_ranged" icon_living = "hecu_ranged" casingtype = /obj/item/ammo_casing/a50ae - projectilesound = 'sound/weapons/gun/pistol/shot.ogg' + projectilesound = 'sound/items/weapons/gun/pistol/shot.ogg' loot = list(/obj/effect/gibspawner/human, /obj/effect/spawner/random/hecu_deagle) dodging = TRUE rapid_melee = 1 @@ -66,7 +66,7 @@ icon_state = "hecu_ranged_smg" icon_living = "hecu_ranged_smg" casingtype = /obj/item/ammo_casing/c34 - projectilesound = 'sound/weapons/gun/smg/shot.ogg' + projectilesound = 'sound/items/weapons/gun/smg/shot.ogg' loot = list(/obj/effect/gibspawner/human, /obj/effect/spawner/random/hecu_smg) /mob/living/simple_animal/hostile/blackmesa/sec @@ -90,7 +90,7 @@ melee_damage_upper = 7 attack_verb_continuous = "punches" attack_verb_simple = "punch" - attack_sound = 'sound/weapons/punch1.ogg' + attack_sound = 'sound/items/weapons/punch1.ogg' loot = list(/obj/effect/gibspawner/human, /obj/item/clothing/suit/armor/vest/blueshirt) atmos_requirements = list("min_oxy" = 5, "max_oxy" = 0, "min_tox" = 0, "max_tox" = 1, "min_co2" = 0, "max_co2" = 5, "min_n2" = 0, "max_n2" = 0) unsuitable_atmos_damage = 7.5 @@ -161,7 +161,7 @@ icon_state = "security_guard_ranged" icon_living = "security_guard_ranged" casingtype = /obj/item/ammo_casing/c9mm - projectilesound = 'sound/weapons/gun/pistol/shot.ogg' + projectilesound = 'sound/items/weapons/gun/pistol/shot.ogg' loot = list(/obj/effect/gibspawner/human, /obj/item/clothing/suit/armor/vest/blueshirt, /obj/item/gun/ballistic/automatic/pistol/sol) rapid_melee = 1 @@ -221,6 +221,6 @@ icon_living = "blackops_ranged" casingtype = /obj/item/ammo_casing/c40sol projectilesound = 'modular_skyrat/modules/modular_weapons/sounds/rifle_heavy.ogg' - attack_sound = 'sound/weapons/punch1.ogg' + attack_sound = 'sound/items/weapons/punch1.ogg' loot = list(/obj/effect/gibspawner/human, /obj/item/ammo_box/magazine/c40sol_rifle/standard) rapid_melee = 1 diff --git a/modular_skyrat/modules/black_mesa/code/mobs/nihilanth.dm b/modular_skyrat/modules/black_mesa/code/mobs/nihilanth.dm index 19621cbe81e..1b7c94ab66f 100644 --- a/modular_skyrat/modules/black_mesa/code/mobs/nihilanth.dm +++ b/modular_skyrat/modules/black_mesa/code/mobs/nihilanth.dm @@ -12,7 +12,7 @@ maxHealth = 3000 health = 3000 atmos_requirements = null - projectilesound = 'sound/weapons/lasercannonfire.ogg' + projectilesound = 'sound/items/weapons/lasercannonfire.ogg' projectiletype = /obj/projectile/nihilanth ranged = TRUE rapid = 3 @@ -22,7 +22,7 @@ melee_damage_upper = 40 attack_verb_continuous = "lathes" attack_verb_simple = "lathe" - attack_sound = 'sound/weapons/punch1.ogg' + attack_sound = 'sound/items/weapons/punch1.ogg' status_flags = NONE del_on_death = TRUE wander = TRUE @@ -40,8 +40,8 @@ light_range = 2 armor_flag = ENERGY light_color = LIGHT_COLOR_BRIGHT_YELLOW - hitsound = 'sound/weapons/sear.ogg' - hitsound_wall = 'sound/weapons/effects/searwall.ogg' + hitsound = 'sound/items/weapons/sear.ogg' + hitsound_wall = 'sound/items/weapons/effects/searwall.ogg' nondirectional_sprite = TRUE /mob/living/simple_animal/hostile/blackmesa/xen/nihilanth/Aggro() diff --git a/modular_skyrat/modules/black_mesa/code/mobs/vortigaunt.dm b/modular_skyrat/modules/black_mesa/code/mobs/vortigaunt.dm index ff9542b126b..ed1fadc6563 100644 --- a/modular_skyrat/modules/black_mesa/code/mobs/vortigaunt.dm +++ b/modular_skyrat/modules/black_mesa/code/mobs/vortigaunt.dm @@ -29,7 +29,7 @@ melee_damage_upper = 10 retreat_distance = 5 minimum_distance = 5 - attack_sound = 'sound/weapons/bite.ogg' + attack_sound = 'sound/items/weapons/bite.ogg' gold_core_spawnable = FRIENDLY_SPAWN loot = list(/obj/item/stack/sheet/bone) alert_sounds = list( diff --git a/modular_skyrat/modules/black_mesa/code/shield_pylon.dm b/modular_skyrat/modules/black_mesa/code/shield_pylon.dm index b05cf664d51..20bc89e5f84 100644 --- a/modular_skyrat/modules/black_mesa/code/shield_pylon.dm +++ b/modular_skyrat/modules/black_mesa/code/shield_pylon.dm @@ -91,6 +91,6 @@ shielded_mobs[iterating_mob] = null shielded_mobs -= iterating_mob shielded_mobs = null - playsound(src, 'sound/magic/lightningbolt.ogg', 100, TRUE) + playsound(src, 'sound/effects/magic/lightningbolt.ogg', 100, TRUE) new /obj/item/grenade/xen_crystal(get_turf(src)) return ..() diff --git a/modular_skyrat/modules/black_mesa/code/shockplant.dm b/modular_skyrat/modules/black_mesa/code/shockplant.dm index 78b357677cb..980bbd38358 100644 --- a/modular_skyrat/modules/black_mesa/code/shockplant.dm +++ b/modular_skyrat/modules/black_mesa/code/shockplant.dm @@ -37,5 +37,5 @@ if(faction_check_atom(entering_mob)) return tesla_zap(src, shock_range, shock_power, shocked_targets = list(entering_mob)) - playsound(src, 'sound/magic/lightningbolt.ogg', 100, TRUE) + playsound(src, 'sound/effects/magic/lightningbolt.ogg', 100, TRUE) COOLDOWN_START(src, shock_cooldown_timer, shock_cooldown) diff --git a/modular_skyrat/modules/black_mesa/code/turfs.dm b/modular_skyrat/modules/black_mesa/code/turfs.dm index e026f2d9331..634e6e12afc 100644 --- a/modular_skyrat/modules/black_mesa/code/turfs.dm +++ b/modular_skyrat/modules/black_mesa/code/turfs.dm @@ -85,7 +85,7 @@ if(isliving(arrived) && !istype(arrived, /mob/living/simple_animal/hostile/blackmesa/xen/bullsquid)) // Bull squid territory! var/mob/living/unlucky_mob = arrived unlucky_mob.adjustFireLoss(acid_damage) - playsound(unlucky_mob, 'sound/weapons/sear.ogg', 100, TRUE) + playsound(unlucky_mob, 'sound/items/weapons/sear.ogg', 100, TRUE) /turf/open/water/electric name = "electric water" diff --git a/modular_skyrat/modules/black_mesa/code/turrets.dm b/modular_skyrat/modules/black_mesa/code/turrets.dm index 724f782e854..74f762a63b6 100644 --- a/modular_skyrat/modules/black_mesa/code/turrets.dm +++ b/modular_skyrat/modules/black_mesa/code/turrets.dm @@ -7,7 +7,7 @@ max_integrity = 120 base_icon_state = "syndie" lethal_projectile = /obj/projectile/beam/emitter - lethal_projectile_sound = 'sound/weapons/laser.ogg' + lethal_projectile_sound = 'sound/items/weapons/laser.ogg' /obj/machinery/porta_turret/black_mesa/assess_perp(mob/living/carbon/human/perp) return 10 @@ -19,7 +19,7 @@ name = "Heavy Defence Turret" max_integrity = 200 lethal_projectile = /obj/projectile/beam/laser/heavylaser - lethal_projectile_sound = 'sound/weapons/lasercannonfire.ogg' + lethal_projectile_sound = 'sound/items/weapons/lasercannonfire.ogg' /obj/item/storage/toolbox/emergency/turret/mesa name = "USMC stationary defense deployment system" @@ -32,7 +32,7 @@ if(I.tool_behaviour == TOOL_WRENCH && user.combat_mode) user.visible_message(span_danger("[user] bashes [src] with [I]!"), \ span_danger("You bash [src] with [I]!"), null, COMBAT_MESSAGE_RANGE) - playsound(src, "sound/items/drill_use.ogg", 80, TRUE, -1) + playsound(src, "sound/items/tools/drill_use.ogg", 80, TRUE, -1) var/obj/machinery/porta_turret/syndicate/pod/toolbox/mesa/turret = new(get_turf(loc)) turret.faction = list(FACTION_HECU) qdel(src) diff --git a/modular_skyrat/modules/black_mesa/code/uber_teleporter.dm b/modular_skyrat/modules/black_mesa/code/uber_teleporter.dm index 15b72c493b1..549863e8d30 100644 --- a/modular_skyrat/modules/black_mesa/code/uber_teleporter.dm +++ b/modular_skyrat/modules/black_mesa/code/uber_teleporter.dm @@ -6,7 +6,7 @@ /obj/item/uber_teleporter/attack_self(mob/living/user, modifiers) . = ..() - playsound(get_turf(user), 'sound/weapons/zapbang.ogg', 50, TRUE) + playsound(get_turf(user), 'sound/items/weapons/zapbang.ogg', 50, TRUE) var/area/area_to_teleport_to = tgui_input_list(usr, "Area to teleport to", "Teleport", GLOB.teleportlocs) if(!area_to_teleport_to) return @@ -45,4 +45,4 @@ if(!success) do_teleport(user, possible_turfs, channel = TELEPORT_CHANNEL_FREE) - playsound(get_turf(user), 'sound/weapons/zapbang.ogg', 50, TRUE) + playsound(get_turf(user), 'sound/items/weapons/zapbang.ogg', 50, TRUE) diff --git a/modular_skyrat/modules/bluespace_miner/code/bluespace_miner.dm b/modular_skyrat/modules/bluespace_miner/code/bluespace_miner.dm index cd59940084c..e0acc7ff091 100644 --- a/modular_skyrat/modules/bluespace_miner/code/bluespace_miner.dm +++ b/modular_skyrat/modules/bluespace_miner/code/bluespace_miner.dm @@ -105,7 +105,7 @@ update_appearance() // Check if it is nonzero if(mining_stat) - playsound(src, 'sound/machines/buzz-sigh.ogg', 50, FALSE, SILENCED_SOUND_EXTRARANGE, ignore_walls = FALSE) + playsound(src, 'sound/machines/buzz/buzz-sigh.ogg', 50, FALSE, SILENCED_SOUND_EXTRARANGE, ignore_walls = FALSE) return FALSE // mining_stat = 0, we are ready to go return TRUE diff --git a/modular_skyrat/modules/bodyparts/code/_mutant_bodyparts.dm b/modular_skyrat/modules/bodyparts/code/_mutant_bodyparts.dm index d7bb01a3ff4..3777da76a64 100644 --- a/modular_skyrat/modules/bodyparts/code/_mutant_bodyparts.dm +++ b/modular_skyrat/modules/bodyparts/code/_mutant_bodyparts.dm @@ -39,8 +39,8 @@ limb_id = SPECIES_MAMMAL unarmed_attack_verbs = list("slash") unarmed_attack_effect = ATTACK_EFFECT_CLAW - unarmed_attack_sound = 'sound/weapons/slash.ogg' - unarmed_miss_sound = 'sound/weapons/slashmiss.ogg' + unarmed_attack_sound = 'sound/items/weapons/slash.ogg' + unarmed_miss_sound = 'sound/items/weapons/slashmiss.ogg' /obj/item/bodypart/arm/right/mutant @@ -48,8 +48,8 @@ limb_id = SPECIES_MAMMAL unarmed_attack_verbs = list("slash") unarmed_attack_effect = ATTACK_EFFECT_CLAW - unarmed_attack_sound = 'sound/weapons/slash.ogg' - unarmed_miss_sound = 'sound/weapons/slashmiss.ogg' + unarmed_attack_sound = 'sound/items/weapons/slash.ogg' + unarmed_miss_sound = 'sound/items/weapons/slashmiss.ogg' /obj/item/bodypart/leg/left/mutant diff --git a/modular_skyrat/modules/bodyparts/code/ghoul_bodyparts.dm b/modular_skyrat/modules/bodyparts/code/ghoul_bodyparts.dm index 0a9cc29aa76..8947fdbc86c 100644 --- a/modular_skyrat/modules/bodyparts/code/ghoul_bodyparts.dm +++ b/modular_skyrat/modules/bodyparts/code/ghoul_bodyparts.dm @@ -61,8 +61,8 @@ unarmed_damage_high = 5 //highest possible punch damage unarmed_attack_verbs = list("punch") unarmed_attack_effect = ATTACK_EFFECT_PUNCH - unarmed_attack_sound = 'sound/weapons/punch1.ogg' - unarmed_miss_sound = 'sound/weapons/punchmiss.ogg' + unarmed_attack_sound = 'sound/items/weapons/punch1.ogg' + unarmed_miss_sound = 'sound/items/weapons/punchmiss.ogg' brute_modifier = GHOUL_BRUTE_MODIFIER burn_modifier = GHOUL_BURN_MODIFIER @@ -74,8 +74,8 @@ unarmed_damage_high = 5 //highest possible punch damage unarmed_attack_verbs = list("punch") unarmed_attack_effect = ATTACK_EFFECT_PUNCH - unarmed_attack_sound = 'sound/weapons/punch1.ogg' - unarmed_miss_sound = 'sound/weapons/punchmiss.ogg' + unarmed_attack_sound = 'sound/items/weapons/punch1.ogg' + unarmed_miss_sound = 'sound/items/weapons/punchmiss.ogg' brute_modifier = GHOUL_BRUTE_MODIFIER burn_modifier = GHOUL_BURN_MODIFIER diff --git a/modular_skyrat/modules/bongs/code/bong.dm b/modular_skyrat/modules/bongs/code/bong.dm index 85c21c85312..3b28f7367fa 100644 --- a/modular_skyrat/modules/bongs/code/bong.dm +++ b/modular_skyrat/modules/bongs/code/bong.dm @@ -91,7 +91,7 @@ if(!packed_item || !lit) return hit_mob.visible_message(span_notice("[user] starts [hit_mob == user ? "taking a hit from [src]." : "forcing [hit_mob] to take a hit from [src]!"]"), hit_mob == user ? span_notice("You start taking a hit from [src].") : span_userdanger("[user] starts forcing you to take a hit from [src]!")) - playsound(src, 'sound/chemistry/heatdam.ogg', 50, TRUE) + playsound(src, 'sound/effects/chemistry/heatdam.ogg', 50, TRUE) if(!do_after(user, 40)) return to_chat(hit_mob, span_notice("You finish taking a hit from the [src].")) diff --git a/modular_skyrat/modules/borgs/code/robot_items.dm b/modular_skyrat/modules/borgs/code/robot_items.dm index 31404448f48..a1e1f952b17 100644 --- a/modular_skyrat/modules/borgs/code/robot_items.dm +++ b/modular_skyrat/modules/borgs/code/robot_items.dm @@ -95,7 +95,7 @@ /// Can it hold mobs? (Dangerous, it is recommended to leave this to FALSE) var/can_hold_mobs = FALSE /// Audio for using the hydraulic clamp. - var/clamp_sound = 'sound/mecha/hydraulic.ogg' + var/clamp_sound = 'sound/vehicles/mecha/hydraulic.ogg' /// Volume of the clamp's loading and unloading noise. var/clamp_sound_volume = 25 /// Cooldown for the clamp. @@ -463,7 +463,7 @@ desc = "A cyborg fitted module resembling the jaws of life." icon = 'modular_skyrat/modules/borgs/icons/robot_items.dmi' icon_state = "jaws_pry_cyborg" - usesound = 'sound/items/jaws_pry.ogg' + usesound = 'sound/items/tools/jaws_pry.ogg' force = 10 toolspeed = 0.5 @@ -472,25 +472,25 @@ . += " It's fitted with a [tool_behaviour == TOOL_CROWBAR ? "prying" : "cutting"] head." /obj/item/crowbar/cyborg/power/attack_self(mob/user) - playsound(get_turf(user), 'sound/items/change_jaws.ogg', 50, TRUE) + playsound(get_turf(user), 'sound/items/tools/change_jaws.ogg', 50, TRUE) if(tool_behaviour == TOOL_CROWBAR) tool_behaviour = TOOL_WIRECUTTER to_chat(user, span_notice("You attach the cutting jaws to [src].")) icon_state = "jaws_cutter_cyborg" - usesound = 'sound/items/jaws_cut.ogg' + usesound = 'sound/items/tools/jaws_cut.ogg' else tool_behaviour = TOOL_CROWBAR to_chat(user, span_notice("You attach the prying jaws to [src].")) icon_state = "jaws_pry_cyborg" - usesound = 'sound/items/jaws_pry.ogg' + usesound = 'sound/items/tools/jaws_pry.ogg' /obj/item/screwdriver/cyborg/power name = "automated drill" desc = "A cyborg fitted module resembling the hand drill" icon = 'modular_skyrat/modules/borgs/icons/robot_items.dmi' icon_state = "drill_screw_cyborg" - hitsound = 'sound/items/drill_hit.ogg' - usesound = 'sound/items/drill_use.ogg' + hitsound = 'sound/items/tools/drill_hit.ogg' + usesound = 'sound/items/tools/drill_use.ogg' toolspeed = 0.5 random_color = FALSE @@ -499,7 +499,7 @@ . += " It's fitted with a [tool_behaviour == TOOL_SCREWDRIVER ? "screw" : "bolt"] head." /obj/item/screwdriver/cyborg/power/attack_self(mob/user) - playsound(get_turf(user), 'sound/items/change_drill.ogg', 50, TRUE) + playsound(get_turf(user), 'sound/items/tools/change_drill.ogg', 50, TRUE) if(tool_behaviour == TOOL_SCREWDRIVER) tool_behaviour = TOOL_WRENCH to_chat(user, span_notice("You attach the bolt bit to [src].")) @@ -778,7 +778,7 @@ desc = "Useful for slurping mess off the floor before affectionally licking the crew members in the face." icon = 'modular_skyrat/modules/borgs/icons/robot_items.dmi' icon_state = "synthtongue" - hitsound = 'sound/effects/attackblob.ogg' + hitsound = 'sound/effects/blob/attackblob.ogg' desc = "For giving affectionate kisses." item_flags = NOBLUDGEON @@ -792,10 +792,10 @@ if(!HAS_TRAIT(target, TRAIT_AFFECTION_AVERSION)) // Checks for Affection Aversion trait if(check_zone(borg.zone_selected) == "head") borg.visible_message(span_warning("\the [borg] affectionally licks \the [mob]'s face!"), span_notice("You affectionally lick \the [mob]'s face!")) - playsound(borg, 'sound/effects/attackblob.ogg', 50, 1) + playsound(borg, 'sound/effects/blob/attackblob.ogg', 50, 1) else borg.visible_message(span_warning("\the [borg] affectionally licks \the [mob]!"), span_notice("You affectionally lick \the [mob]!")) - playsound(borg, 'sound/effects/attackblob.ogg', 50, 1) + playsound(borg, 'sound/effects/blob/attackblob.ogg', 50, 1) return ITEM_INTERACT_SUCCESS else to_chat(user, span_warning("ERROR: [target] is on the Do Not Lick registry!")) @@ -848,7 +848,7 @@ whitelisted_item_description = "envelopes" item_weight_limit = WEIGHT_CLASS_NORMAL clamp_sound_volume = 25 - clamp_sound = 'sound/items/pshoom.ogg' + clamp_sound = 'sound/items/pshoom/pshoom.ogg' /obj/item/borg/forging_setup name = "integrated forging dispenser" diff --git a/modular_skyrat/modules/borgs/code/robot_upgrade.dm b/modular_skyrat/modules/borgs/code/robot_upgrade.dm index b1e354c655d..e0e1fe7d85e 100644 --- a/modular_skyrat/modules/borgs/code/robot_upgrade.dm +++ b/modular_skyrat/modules/borgs/code/robot_upgrade.dm @@ -253,7 +253,7 @@ borg.visible_message(span_warning("\the [borg] affectionally licks \the [mob]'s face!"), span_notice("You affectionally lick \the [mob]'s face!")) else borg.visible_message(span_warning("\the [borg] affectionally licks \the [mob]!"), span_notice("You affectionally lick \the [mob]!")) - playsound(borg, 'sound/effects/attackblob.ogg', 50, 1) + playsound(borg, 'sound/effects/blob/attackblob.ogg', 50, 1) return ITEM_INTERACT_SUCCESS /obj/item/quadborg_nose/interact_with_atom(atom/interacting_with, mob/living/user, list/modifiers) @@ -295,7 +295,7 @@ smoke.start() sleep(0.2 SECONDS) for(var/i in 1 to 4) - playsound(borg, pick('sound/items/drill_use.ogg', 'sound/items/jaws_cut.ogg', 'sound/items/jaws_pry.ogg', 'sound/items/welder.ogg', 'sound/items/ratchet.ogg'), 80, TRUE, -1) + playsound(borg, pick('sound/items/tools/drill_use.ogg', 'sound/items/tools/jaws_cut.ogg', 'sound/items/tools/jaws_pry.ogg', 'sound/items/tools/welder.ogg', 'sound/items/tools/ratchet.ogg'), 80, TRUE, -1) sleep(1.2 SECONDS) if(!prev_lockcharge) borg.SetLockdown(FALSE) diff --git a/modular_skyrat/modules/cargo/code/export_gate.dm b/modular_skyrat/modules/cargo/code/export_gate.dm index 5a5f8d721d9..ca8acdc932f 100644 --- a/modular_skyrat/modules/cargo/code/export_gate.dm +++ b/modular_skyrat/modules/cargo/code/export_gate.dm @@ -167,7 +167,7 @@ scanline_timer = addtimer(CALLBACK(src, PROC_REF(set_scanline), "passive"), duration, TIMER_STOPPABLE) if(COOLDOWN_FINISHED(src, scanner_beep) && type != "passive") COOLDOWN_START(src, scanner_beep, 0.5 SECONDS) - playsound(src, type == "alarm" ? 'sound/machines/buzz-sigh.ogg' : 'sound/machines/chime.ogg', 45, TRUE) + playsound(src, type == "alarm" ? 'sound/machines/buzz/buzz-sigh.ogg' : 'sound/machines/chime.ogg', 45, TRUE) /obj/machinery/export_gate/proc/auto_scan(atom/movable/package) if(is_operational && istype(package, /obj/item/bounty_cube) && (!panel_open) && anchored) diff --git a/modular_skyrat/modules/cargo/code/items/gbp_punchcard.dm b/modular_skyrat/modules/cargo/code/items/gbp_punchcard.dm index 4548fe02f67..b5176b2ba52 100644 --- a/modular_skyrat/modules/cargo/code/items/gbp_punchcard.dm +++ b/modular_skyrat/modules/cargo/code/items/gbp_punchcard.dm @@ -71,7 +71,7 @@ var/obj/item/gbp_punchcard/punchcard = attacking_item var/amount_to_reward = punchcard.punches * GBP_PUNCH_REWARD if(!punchcard.punches) - playsound(src, 'sound/machines/scanbuzz.ogg', 100) + playsound(src, 'sound/machines/scanner/scanbuzz.ogg', 100) say("You can't redeem an unpunched card!") return @@ -88,7 +88,7 @@ return if(!card_used.registered_account || !istype(card_used.registered_account.account_job, /datum/job/assistant)) - playsound(src, 'sound/machines/scanbuzz.ogg', 100) + playsound(src, 'sound/machines/scanner/scanbuzz.ogg', 100) say("You cannot redeem a punchcard without a valid assistant bank account!") return diff --git a/modular_skyrat/modules/cargo_teleporter/code/cargo_teleporter.dm b/modular_skyrat/modules/cargo_teleporter/code/cargo_teleporter.dm index 6107aa9fdfd..20b6a95b51d 100644 --- a/modular_skyrat/modules/cargo_teleporter/code/cargo_teleporter.dm +++ b/modular_skyrat/modules/cargo_teleporter/code/cargo_teleporter.dm @@ -61,7 +61,7 @@ GLOBAL_LIST_EMPTY(cargo_marks) continue if(movable_content.anchored) continue - do_teleport(movable_content, moving_turf, asoundout = 'sound/magic/Disable_Tech.ogg') + do_teleport(movable_content, moving_turf, asoundout = 'sound/effects/magic/Disable_Tech.ogg') new /obj/effect/decal/cleanable/ash(target_turf) COOLDOWN_START(src, use_cooldown, 8 SECONDS) return ITEM_INTERACT_SUCCESS diff --git a/modular_skyrat/modules/cell_component/code/cell_component.dm b/modular_skyrat/modules/cell_component/code/cell_component.dm index f65939caa5e..dbc4b6800e7 100644 --- a/modular_skyrat/modules/cell_component/code/cell_component.dm +++ b/modular_skyrat/modules/cell_component/code/cell_component.dm @@ -161,7 +161,7 @@ component_cell_out_of_charge/component_cell_removed proc using loc where necessa if(inserted_cell) to_chat(user, span_notice("You remove [inserted_cell] from [equipment]!")) - playsound(equipment, 'sound/weapons/magout.ogg', 40, TRUE) + playsound(equipment, 'sound/items/weapons/magout.ogg', 40, TRUE) inserted_cell.forceMove(get_turf(equipment)) INVOKE_ASYNC(user, TYPE_PROC_REF(/mob/living, put_in_hands), inserted_cell) inserted_cell = null @@ -188,7 +188,7 @@ component_cell_out_of_charge/component_cell_removed proc using loc where necessa return to_chat(user, span_notice("You insert [inserting_item] into [equipment]!")) - playsound(equipment, 'sound/weapons/magin.ogg', 40, TRUE) + playsound(equipment, 'sound/items/weapons/magin.ogg', 40, TRUE) inserted_cell = inserting_item inserting_item.forceMove(parent) handle_cell_overlays(FALSE) diff --git a/modular_skyrat/modules/cellguns/code/cellgun_cells.dm b/modular_skyrat/modules/cellguns/code/cellgun_cells.dm index 842ed421405..3928be04513 100644 --- a/modular_skyrat/modules/cellguns/code/cellgun_cells.dm +++ b/modular_skyrat/modules/cellguns/code/cellgun_cells.dm @@ -55,7 +55,7 @@ is_toggled = !is_toggled //Changes the toggle to the reverse of what it is. src.ammo_type = is_toggled ? primary_mode : secondary_mode - playsound(loc,is_toggled ? 'sound/machines/defib_SaftyOn.ogg' : 'sound/machines/defib_saftyOff.ogg', 50) + playsound(loc,is_toggled ? 'sound/machines/defib/defib_SaftyOn.ogg' : 'sound/machines/defib/defib_SaftyOff.ogg', 50) if(medicell_examine) balloon_alert(user, "safety [is_toggled ? "enabled" : "disabled"]") diff --git a/modular_skyrat/modules/clock_cult/code/actions/recall_slab.dm b/modular_skyrat/modules/clock_cult/code/actions/recall_slab.dm index 4ab392ee633..318a9d97162 100644 --- a/modular_skyrat/modules/clock_cult/code/actions/recall_slab.dm +++ b/modular_skyrat/modules/clock_cult/code/actions/recall_slab.dm @@ -102,4 +102,4 @@ item_to_retrieve.forceMove(usr.drop_location()) item_to_retrieve.loc.visible_message(span_warning("[item_to_retrieve] suddenly appears!")) - playsound(get_turf(item_to_retrieve), 'sound/magic/summonitems_generic.ogg', 50, TRUE) + playsound(get_turf(item_to_retrieve), 'sound/effects/magic/summonitems_generic.ogg', 50, TRUE) diff --git a/modular_skyrat/modules/clock_cult/code/items/weaponry.dm b/modular_skyrat/modules/clock_cult/code/items/weaponry.dm index c4d2b25007f..0cb10120210 100644 --- a/modular_skyrat/modules/clock_cult/code/items/weaponry.dm +++ b/modular_skyrat/modules/clock_cult/code/items/weaponry.dm @@ -14,7 +14,7 @@ throwforce = 20 throw_speed = 4 armour_penetration = 10 - hitsound = 'sound/weapons/bladeslice.ogg' + hitsound = 'sound/items/weapons/bladeslice.ogg' attack_verb_continuous = list("attacks", "pokes", "jabs", "tears", "gores") attack_verb_simple = list("attack", "poke", "jab", "tear", "gore") sharpness = SHARP_EDGED @@ -76,7 +76,7 @@ attack_verb_continuous = list("bashes", "hammers", "attacks", "smashes") clockwork_desc = "Enemies hit by this will be flung back while you are on bronze tiles." sharpness = 0 - hitsound = 'sound/weapons/smash.ogg' + hitsound = 'sound/items/weapons/smash.ogg' /obj/item/clockwork/weapon/brass_battlehammer/Initialize(mapload) @@ -122,7 +122,7 @@ new /obj/effect/temp_visual/emp/pulse(target.loc) addtimer(CALLBACK(src, PROC_REF(send_message), user), 30 SECONDS) to_chat(user, span_brass("You strike [target] with an electromagnetic pulse!")) - playsound(user, 'sound/magic/lightningshock.ogg', 40) + playsound(user, 'sound/effects/magic/lightningshock.ogg', 40) /obj/item/clockwork/weapon/brass_sword/attack_atom(obj/attacked_obj, mob/living/user, params) @@ -142,7 +142,7 @@ new /obj/effect/temp_visual/emp/pulse(target.loc) addtimer(CALLBACK(src, PROC_REF(send_message), user), 20 SECONDS) to_chat(user, span_brass("You strike [target] with an electromagnetic pulse!")) - playsound(user, 'sound/magic/lightningshock.ogg', 40) + playsound(user, 'sound/effects/magic/lightningshock.ogg', 40) /obj/item/clockwork/weapon/brass_sword/proc/send_message(mob/living/target) @@ -250,7 +250,7 @@ inhand_icon_state = "clockwork_rifle" worn_icon_state = "clockwork_rifle" accepted_magazine_type = /obj/item/ammo_box/magazine/internal/boltaction/lionhunter/clockwork - fire_sound = 'sound/weapons/gun/sniper/shot.ogg' + fire_sound = 'sound/items/weapons/gun/sniper/shot.ogg' show_bolt_icon = FALSE diff --git a/modular_skyrat/modules/clock_cult/code/mobs/clockwork_marauder.dm b/modular_skyrat/modules/clock_cult/code/mobs/clockwork_marauder.dm index ba6ad76189b..d427c433522 100644 --- a/modular_skyrat/modules/clock_cult/code/mobs/clockwork_marauder.dm +++ b/modular_skyrat/modules/clock_cult/code/mobs/clockwork_marauder.dm @@ -20,7 +20,7 @@ GLOBAL_LIST_EMPTY(clockwork_marauders) melee_damage_upper = 24 attack_verb_continuous = "slices" attack_verb_simple = "slice" - attack_sound = 'sound/weapons/bladeslice.ogg' + attack_sound = 'sound/items/weapons/bladeslice.ogg' combat_mode = TRUE pass_flags = PASSTABLE mob_size = MOB_SIZE_LARGE @@ -71,7 +71,7 @@ GLOBAL_LIST_EMPTY(clockwork_marauders) if(shield_health) damage_shield() - playsound(src, 'sound/hallucinations/veryfar_noise.ogg', 40, 1) + playsound(src, 'sound/effects/hallucinations/veryfar_noise.ogg', 40, 1) if(attacking_item == TOOL_WELDER) welder_act(user, attacking_item) @@ -106,7 +106,7 @@ GLOBAL_LIST_EMPTY(clockwork_marauders) to_chat(user, span_notice("You repair some of [src]'s damage.")) if(shield_health < MARAUDER_SHIELD_MAX) shield_health++ - playsound(src, 'sound/magic/charge.ogg', 60, TRUE) + playsound(src, 'sound/effects/magic/charge.ogg', 60, TRUE) return TRUE diff --git a/modular_skyrat/modules/clock_cult/code/scriptures/servitude/hateful_manacles.dm b/modular_skyrat/modules/clock_cult/code/scriptures/servitude/hateful_manacles.dm index e79a270bdfc..b9933a3cde2 100644 --- a/modular_skyrat/modules/clock_cult/code/scriptures/servitude/hateful_manacles.dm +++ b/modular_skyrat/modules/clock_cult/code/scriptures/servitude/hateful_manacles.dm @@ -21,7 +21,7 @@ target_carbon.balloon_alert(invoker, "already restrained!") return FALSE - playsound(target_carbon, 'sound/weapons/handcuffs.ogg', 30, TRUE, -2) + playsound(target_carbon, 'sound/items/weapons/handcuffs.ogg', 30, TRUE, -2) target_carbon.visible_message(span_danger("[invoker] forms a well of energy around [target_carbon], brass appearing at their wrists!"),\ span_userdanger("[invoker] is trying to restrain you!")) diff --git a/modular_skyrat/modules/clock_cult/code/scriptures/servitude/kindle.dm b/modular_skyrat/modules/clock_cult/code/scriptures/servitude/kindle.dm index 96552b952b3..b5267d39bf9 100644 --- a/modular_skyrat/modules/clock_cult/code/scriptures/servitude/kindle.dm +++ b/modular_skyrat/modules/clock_cult/code/scriptures/servitude/kindle.dm @@ -39,7 +39,7 @@ hit_mob.visible_message(span_warning("[hit_mob] stares blankly, as a field of energy flows around them."), \ span_userdanger("You feel a slight shock as a wave of energy flows past you.")) - playsound(invoker, 'sound/magic/mm_hit.ogg', 50, TRUE) + playsound(invoker, 'sound/effects/magic/mm_hit.ogg', 50, TRUE) return TRUE //To make battles more fun, both sides can't bullshit stun hand the other @@ -58,7 +58,7 @@ to_chat(invoker, span_warning("Some force greater than you intervenes! [hit_mob] is protected by Nar'sie!")) to_chat(hit_mob, span_warning("You are protected by your faith to Nar'sie!")) - playsound(invoker, 'sound/magic/mm_hit.ogg', 50, TRUE) + playsound(invoker, 'sound/effects/magic/mm_hit.ogg', 50, TRUE) return TRUE //Successful Invokation @@ -87,7 +87,7 @@ hit_mob.client.color = "#BE8700" animate(hit_mob.client, color = client_color, time = 2.5 SECONDS) - playsound(invoker, 'sound/magic/staff_animation.ogg', 50, TRUE) + playsound(invoker, 'sound/effects/magic/staff_animation.ogg', 50, TRUE) return TRUE #undef EFFECT_TIME diff --git a/modular_skyrat/modules/clock_cult/code/structures/_structure.dm b/modular_skyrat/modules/clock_cult/code/structures/_structure.dm index d963bf70c8c..e1b7ae797d6 100644 --- a/modular_skyrat/modules/clock_cult/code/structures/_structure.dm +++ b/modular_skyrat/modules/clock_cult/code/structures/_structure.dm @@ -8,7 +8,7 @@ density = TRUE resistance_flags = FIRE_PROOF | ACID_PROOF break_message = span_warning("Sparks fly as the brass structure shatters across the ground.") //The message shown when a structure breaks - break_sound = 'sound/magic/clockwork/anima_fragment_death.ogg' //The sound played when a structure breaks + break_sound = 'sound/effects/magic/clockwork/anima_fragment_death.ogg' //The sound played when a structure breaks debris = list( /obj/structure/fluff/clockwork/alloy_shards/large = 1, /obj/structure/fluff/clockwork/alloy_shards/medium = 2, diff --git a/modular_skyrat/modules/clock_cult/code/structures/sigil/vitality_sigil.dm b/modular_skyrat/modules/clock_cult/code/structures/sigil/vitality_sigil.dm index f325e745517..57027f1b6d3 100644 --- a/modular_skyrat/modules/clock_cult/code/structures/sigil/vitality_sigil.dm +++ b/modular_skyrat/modules/clock_cult/code/structures/sigil/vitality_sigil.dm @@ -48,7 +48,7 @@ if((affected_mob.stat == DEAD) || (affected_mob.getBruteLoss() >= affected_mob.maxHealth)) affected_mob.do_jitter_animation() affected_mob.death() - playsound(loc, 'sound/magic/exit_blood.ogg', 60) + playsound(loc, 'sound/effects/magic/exit_blood.ogg', 60) to_chat(affected_mob, span_clockred("The last of your life is drained away...")) check_special_role(affected_mob) GLOB.clock_vitality += (affected_mob.client ? 30 : 10) // 100 (for clients) total in the ideal situation, since it'll take 7 pulses to go from full to crit diff --git a/modular_skyrat/modules/cme/code/cme.dm b/modular_skyrat/modules/cme/code/cme.dm index c6e3cca9b07..0bb28865394 100644 --- a/modular_skyrat/modules/cme/code/cme.dm +++ b/modular_skyrat/modules/cme/code/cme.dm @@ -243,7 +243,7 @@ /obj/effect/cme/Initialize(mapload) . = ..() - playsound(src,'sound/weapons/resonator_fire.ogg',75,TRUE) + playsound(src,'sound/items/weapons/resonator_fire.ogg',75,TRUE) var/turf/open/T = get_turf(src) if(istype(T)) T.atmos_spawn_air("o2=15;plasma=15;TEMP=5778") @@ -258,7 +258,7 @@ var/pulse_range_light = rand(cme_light_range_lower, cme_light_range_upper) var/pulse_range_heavy = rand(cme_heavy_range_lower, cme_heavy_range_upper) empulse(src, pulse_range_heavy, pulse_range_light) - playsound(src,'sound/weapons/resonator_blast.ogg',100,TRUE) + playsound(src,'sound/items/weapons/resonator_blast.ogg',100,TRUE) explosion(src, 0, 0, 2, flame_range = 3) playsound(src,'modular_skyrat/modules/cme/sound/cme.ogg', 100) qdel(src) @@ -273,7 +273,7 @@ var/pulse_range_heavy = rand(cme_heavy_range_lower, cme_heavy_range_upper) empulse(src, pulse_range_heavy, pulse_range_light) explosion(src, 0, 3, 10, flame_range = 10) - playsound(src,'sound/weapons/resonator_blast.ogg',100,TRUE) + playsound(src,'sound/items/weapons/resonator_blast.ogg',100,TRUE) playsound(src,'modular_skyrat/modules/cme/sound/cme.ogg', 100) qdel(src) @@ -281,7 +281,7 @@ burst() /obj/effect/cme/proc/anomalyNeutralize() - playsound(src,'sound/weapons/resonator_blast.ogg',100,TRUE) + playsound(src,'sound/items/weapons/resonator_blast.ogg',100,TRUE) new /obj/effect/particle_effect/fluid/smoke/bad(loc) color = COLOR_WHITE light_color = COLOR_WHITE @@ -290,7 +290,7 @@ new loot(loc) /obj/effect/cme/extreme/anomalyNeutralize() - playsound(src,'sound/weapons/resonator_blast.ogg',100,TRUE) + playsound(src,'sound/items/weapons/resonator_blast.ogg',100,TRUE) new /obj/effect/particle_effect/fluid/smoke/bad(loc) var/turf/open/T = get_turf(src) if(istype(T)) @@ -302,7 +302,7 @@ new loot(loc) /obj/effect/cme/armageddon/anomalyNeutralize() - playsound(src,'sound/weapons/resonator_blast.ogg',100,TRUE) + playsound(src,'sound/items/weapons/resonator_blast.ogg',100,TRUE) new /obj/effect/particle_effect/fluid/smoke/bad(loc) var/turf/open/T = get_turf(src) if(istype(T)) diff --git a/modular_skyrat/modules/colony_fabricator/code/colony_fabricator.dm b/modular_skyrat/modules/colony_fabricator/code/colony_fabricator.dm index 1eb2a4627e1..ef31342433e 100644 --- a/modular_skyrat/modules/colony_fabricator/code/colony_fabricator.dm +++ b/modular_skyrat/modules/colony_fabricator/code/colony_fabricator.dm @@ -74,7 +74,7 @@ if(design_delta > 0) say("Received [design_delta] new design[design_delta == 1 ? "" : "s"].") - playsound(src, 'sound/machines/twobeep_high.ogg', 50, TRUE) + playsound(src, 'sound/machines/beep/twobeep_high.ogg', 50, TRUE) update_static_data_for_all_viewers() diff --git a/modular_skyrat/modules/colony_fabricator/code/machines/ore_silo.dm b/modular_skyrat/modules/colony_fabricator/code/machines/ore_silo.dm index 1e10a1b2fc3..6f71fb37498 100644 --- a/modular_skyrat/modules/colony_fabricator/code/machines/ore_silo.dm +++ b/modular_skyrat/modules/colony_fabricator/code/machines/ore_silo.dm @@ -9,7 +9,7 @@ /obj/machinery/ore_silo/colony_lathe/silo_log(obj/machinery/machinery_in_question, action, amount, noun, list/mats) . = ..() - playsound(src, 'sound/machines/beep.ogg', 30, TRUE) + playsound(src, 'sound/machines/beep/beep.ogg', 30, TRUE) AddElement(/datum/element/repackable, packed_type, 10 SECONDS) /obj/machinery/ore_silo/colony_lathe/default_deconstruction_crowbar() diff --git a/modular_skyrat/modules/colony_fabricator/code/repacking_element.dm b/modular_skyrat/modules/colony_fabricator/code/repacking_element.dm index dec98f4877e..824c4a9e4f9 100644 --- a/modular_skyrat/modules/colony_fabricator/code/repacking_element.dm +++ b/modular_skyrat/modules/colony_fabricator/code/repacking_element.dm @@ -49,7 +49,7 @@ if(!do_after(user, 3 SECONDS, target = source)) return - playsound(source, 'sound/items/ratchet.ogg', 50, TRUE) + playsound(source, 'sound/items/tools/ratchet.ogg', 50, TRUE) new item_to_pack_into(source.drop_location()) diff --git a/modular_skyrat/modules/colony_fabricator/code/tools/tools.dm b/modular_skyrat/modules/colony_fabricator/code/tools/tools.dm index 5dba39ef7c7..c678689954b 100644 --- a/modular_skyrat/modules/colony_fabricator/code/tools/tools.dm +++ b/modular_skyrat/modules/colony_fabricator/code/tools/tools.dm @@ -23,8 +23,8 @@ throw_range = 3 attack_verb_continuous = list("drills", "screws", "jabs", "whacks") attack_verb_simple = list("drill", "screw", "jab", "whack") - hitsound = 'sound/items/drill_hit.ogg' - usesound = 'sound/items/drill_use.ogg' + hitsound = 'sound/items/tools/drill_hit.ogg' + usesound = 'sound/items/tools/drill_use.ogg' w_class = WEIGHT_CLASS_SMALL toolspeed = 1 random_color = FALSE @@ -83,7 +83,7 @@ if("Screwdriver") tool_behaviour = TOOL_SCREWDRIVER sharpness = SHARP_POINTY - playsound(src, 'sound/items/change_drill.ogg', 50, vary = TRUE) + playsound(src, 'sound/items/tools/change_drill.ogg', 50, vary = TRUE) update_appearance(UPDATE_ICON) /obj/item/screwdriver/omni_drill/proc/check_menu(mob/user) diff --git a/modular_skyrat/modules/company_imports/code/armament_datums/put_a_donk_on_it.dm b/modular_skyrat/modules/company_imports/code/armament_datums/put_a_donk_on_it.dm index c03f3b36921..daee1a80edd 100644 --- a/modular_skyrat/modules/company_imports/code/armament_datums/put_a_donk_on_it.dm +++ b/modular_skyrat/modules/company_imports/code/armament_datums/put_a_donk_on_it.dm @@ -84,11 +84,11 @@ cost = PAYCHECK_COMMAND /datum/armament_entry/company_import/donk/foamforce/foam_shotgun - item_type = /obj/item/gun/ballistic/shotgun/toy/unrestricted + item_type = /obj/item/gun/ballistic/shotgun/toy/riot cost = PAYCHECK_COMMAND /datum/armament_entry/company_import/donk/foamforce/foam_smg - item_type = /obj/item/gun/ballistic/automatic/toy/unrestricted + item_type = /obj/item/gun/ballistic/automatic/toy/riot cost = PAYCHECK_COMMAND * 3 /datum/armament_entry/company_import/donk/foamforce/foam_c20 diff --git a/modular_skyrat/modules/cortical_borer/code/cortical_borer_items.dm b/modular_skyrat/modules/cortical_borer/code/cortical_borer_items.dm index 5f0ecc27ef5..4cc6bcf8387 100644 --- a/modular_skyrat/modules/cortical_borer/code/cortical_borer_items.dm +++ b/modular_skyrat/modules/cortical_borer/code/cortical_borer_items.dm @@ -36,7 +36,7 @@ user.visible_message("[user] opens [src].", "You open [src].", "You hear a metallic thunk.") else user.visible_message("[user] closes [src].", "You close [src].", "You hear a metallic thunk.") - playsound(src, 'sound/machines/boltsup.ogg', 30, TRUE) + playsound(src, 'sound/machines/airlock/boltsup.ogg', 30, TRUE) update_appearance() /obj/item/cortical_cage/attackby(obj/item/attacking_item, mob/user, params) @@ -69,7 +69,7 @@ if(internal_radio) var/area/src_area = get_area(src) internal_radio.talk_into(src, "A cortical borer has been trapped in [src_area].", RADIO_CHANNEL_COMMON) - playsound(src, 'sound/machines/boltsup.ogg', 30, TRUE) + playsound(src, 'sound/machines/airlock/boltsup.ogg', 30, TRUE) update_appearance() /obj/item/cortical_cage/relaymove(mob/living/user, direction) diff --git a/modular_skyrat/modules/cryosleep/code/admin.dm b/modular_skyrat/modules/cryosleep/code/admin.dm index 4b6ce389eee..8af1d639506 100644 --- a/modular_skyrat/modules/cryosleep/code/admin.dm +++ b/modular_skyrat/modules/cryosleep/code/admin.dm @@ -1,7 +1,7 @@ /// Send player in not-quiet cryopod. If with_paper = TRUE, place a paper with notification under player. /mob/proc/send_to_cryo(with_paper = FALSE) //effect - playsound(loc, 'sound/magic/Repulse.ogg', 100, 1) + playsound(loc, 'sound/effects/magic/Repulse.ogg', 100, 1) var/datum/effect_system/spark_spread/quantum/sparks = new sparks.set_up(10, 1, loc) sparks.attach(loc) diff --git a/modular_skyrat/modules/cryosleep/code/job.dm b/modular_skyrat/modules/cryosleep/code/job.dm index fcd218d4739..f7d9af2c6d0 100644 --- a/modular_skyrat/modules/cryosleep/code/job.dm +++ b/modular_skyrat/modules/cryosleep/code/job.dm @@ -1,8 +1,8 @@ /datum/controller/subsystem/job/proc/FreeRole(rank) if(!rank) return - JobDebug("Freeing role: [rank]") - var/datum/job/job = GetJob(rank) + job_debug("Freeing role: [rank]") + var/datum/job/job = get_job(rank) if(!job) return FALSE job.current_positions = max(0, job.current_positions - 1) @@ -11,8 +11,8 @@ /datum/controller/subsystem/job/proc/OccupyRole(rank) if(!rank) return FALSE - JobDebug("Occupying role: [rank]") - var/datum/job/job = GetJob(rank) + job_debug("Occupying role: [rank]") + var/datum/job/job = get_job(rank) if(!job || job.current_positions >= job.total_positions) return FALSE job.current_positions = job.current_positions + 1 diff --git a/modular_skyrat/modules/customization/game/objects/items/devices/ttsdevice.dm b/modular_skyrat/modules/customization/game/objects/items/devices/ttsdevice.dm index 4d495464889..031fb691706 100644 --- a/modular_skyrat/modules/customization/game/objects/items/devices/ttsdevice.dm +++ b/modular_skyrat/modules/customization/game/objects/items/devices/ttsdevice.dm @@ -31,10 +31,10 @@ var/noisechoice = tgui_input_list(user, "What noise would you like to make?", "Robot Noises", list("Beep","Buzz","Ping")) if(noisechoice == "Beep") user.audible_message("makes their TTS beep!", audible_message_flags = EMOTE_MESSAGE) - playsound(user, 'sound/machines/twobeep.ogg', 50, 1, -1) + playsound(user, 'sound/machines/beep/twobeep.ogg', 50, 1, -1) if(noisechoice == "Buzz") user.audible_message("makes their TTS buzz!", audible_message_flags = EMOTE_MESSAGE) - playsound(user, 'sound/machines/buzz-sigh.ogg', 50, 1, -1) + playsound(user, 'sound/machines/buzz/buzz-sigh.ogg', 50, 1, -1) if(noisechoice == "Ping") user.audible_message("makes their TTS ping!", audible_message_flags = EMOTE_MESSAGE) playsound(user, 'sound/machines/ping.ogg', 50, 1, -1) diff --git a/modular_skyrat/modules/customization/game/objects/items/plushes.dm b/modular_skyrat/modules/customization/game/objects/items/plushes.dm index 9bc6ba494e0..e1362b71768 100644 --- a/modular_skyrat/modules/customization/game/objects/items/plushes.dm +++ b/modular_skyrat/modules/customization/game/objects/items/plushes.dm @@ -48,7 +48,7 @@ icon_state = "plushie_securityk9" attack_verb_continuous = list("beeps", "boops", "pings") attack_verb_simple = list("beep", "boop", "ping") - squeak_override = list('sound/machines/beep.ogg' = 1) + squeak_override = list('sound/machines/beep/beep.ogg' = 1) /obj/item/toy/plush/skyrat/medihound name = "medi-hound plushie" @@ -56,7 +56,7 @@ icon_state = "plushie_medihound" attack_verb_continuous = list("beeps", "boops", "pings") attack_verb_simple = list("beep", "boop", "ping") - squeak_override = list('sound/machines/beep.ogg' = 1) + squeak_override = list('sound/machines/beep/beep.ogg' = 1) /obj/item/toy/plush/skyrat/engihound name = "engi-hound plushie" @@ -64,7 +64,7 @@ icon_state = "plushie_engihound" attack_verb_continuous = list("beeps", "boops", "pings") attack_verb_simple = list("beep", "boop", "ping") - squeak_override = list('sound/machines/beep.ogg' = 1) + squeak_override = list('sound/machines/beep/beep.ogg' = 1) /obj/item/toy/plush/skyrat/scrubpuppy name = "scrub-puppy plushie" @@ -72,7 +72,7 @@ icon_state = "plushie_scrubpuppy" attack_verb_continuous = list("beeps", "boops", "pings") attack_verb_simple = list("beep", "boop", "ping") - squeak_override = list('sound/machines/beep.ogg' = 1) + squeak_override = list('sound/machines/beep/beep.ogg' = 1) /obj/item/toy/plush/skyrat/meddrake name = "medi-drake plushie" @@ -80,7 +80,7 @@ icon_state = "plushie_meddrake" attack_verb_continuous = list("beeps", "boops", "pings") attack_verb_simple = list("beep", "boop", "ping") - squeak_override = list('sound/machines/beep.ogg' = 1) + squeak_override = list('sound/machines/beep/beep.ogg' = 1) /obj/item/toy/plush/skyrat/secdrake name = "sec-drake plushie" @@ -88,7 +88,7 @@ icon_state = "plushie_secdrake" attack_verb_continuous = list("beeps", "boops", "pings") attack_verb_simple = list("beep", "boop", "ping") - squeak_override = list('sound/machines/beep.ogg' = 1) + squeak_override = list('sound/machines/beep/beep.ogg' = 1) /obj/item/toy/plush/skyrat/fox name = "fox plushie" @@ -163,7 +163,7 @@ icon_state = "plushie_riffy" attack_verb_continuous = list("slaps", "challenges") attack_verb_simple = list("slap", "challenge") - squeak_override = list('sound/weapons/slap.ogg' = 1) + squeak_override = list('sound/items/weapons/slap.ogg' = 1) /obj/item/toy/plush/skyrat/ian name = "plush corgi" @@ -272,7 +272,7 @@ icon_state = "plushie_tyri" attack_verb_continuous = list("fixes", "unbolts", "welds") attack_verb_simple = list("fix", "unbolt", "weld") - squeak_override = list('sound/items/screwdriver.ogg' = 1, 'sound/items/drill_use.ogg' = 1, 'sound/items/welder.ogg' = 1) + squeak_override = list('sound/items/tools/screwdriver.ogg' = 1, 'sound/items/tools/drill_use.ogg' = 1, 'sound/items/tools/welder.ogg' = 1) /obj/item/toy/plush/skyrat/glitch_synth name = "glitching synthetic plushie" @@ -280,7 +280,7 @@ icon_state = "plushie_rex" attack_verb_continuous = list("beeps", "hugs", "health analyzes") attack_verb_simple = list("beep", "hug", "health analyze") - squeak_override = list('sound/machines/twobeep_high.ogg' = 1) + squeak_override = list('sound/machines/beep/twobeep_high.ogg' = 1) /obj/item/toy/plush/skyrat/boom_bird name = "boom bird plushie" @@ -345,7 +345,7 @@ icon_state = "plushie_zapp" attack_verb_continuous = list("boops", "nuzzles") attack_verb_simple = list("boop", "nuzzle") - squeak_override = list('sound/effects/can_open1.ogg' = 1, 'sound/effects/can_open2.ogg' = 1, 'sound/effects/can_open3.ogg' = 1) + squeak_override = list('sound/effects/can/can_open1.ogg' = 1, 'sound/effects/can/can_open2.ogg' = 1, 'sound/effects/can/can_open3.ogg' = 1) ///the list that is chosen from depending on gaming skill var/static/list/skill_response = list( "Weak! What are you, a mobile gamer?", @@ -383,9 +383,9 @@ skill_level = (max(6, skill_level)) say(skill_response[skill_level]) if(skill_level == 7) - playsound(src_turf, 'sound/effects/can_pop.ogg', 80, TRUE) + playsound(src_turf, 'sound/effects/can/can_pop.ogg', 80, TRUE) new /obj/effect/abstract/liquid_turf/pwr_gamr(src_turf) - playsound(src_turf, 'sound/effects/bubbles.ogg', 50, TRUE) + playsound(src_turf, 'sound/effects/bubbles/bubbles.ogg', 50, TRUE) qdel(src) /obj/effect/abstract/liquid_turf/pwr_gamr @@ -409,7 +409,7 @@ desc = "It reminds you of a very, very, very huggable bee." icon_state = "plushie_rubi" gender = FEMALE - squeak_override = list('sound/weapons/thudswoosh.ogg' = 1) + squeak_override = list('sound/items/weapons/thudswoosh.ogg' = 1) attack_verb_continuous = list("hugs") attack_verb_simple = list("hug") @@ -463,7 +463,7 @@ gender = FEMALE attack_verb_continuous = list("pats", "hugs", "scolds", "pets") attack_verb_simple = list("pat", "hug", "scold", "pet") - squeak_override = list('sound/creatures/mousesqueek.ogg' = 1, 'modular_skyrat/modules/emotes/sound/voice/mothsqueak.ogg' = 1,) + squeak_override = list('sound/mobs/non-humanoids/mouse/mousesqueek.ogg' = 1, 'modular_skyrat/modules/emotes/sound/voice/mothsqueak.ogg' = 1,) responses = list("Rabbits are prey animals and are therefore constantly aware of their surroundings.", "Things to jump up on (they like to be in high places)", "become a rabbit today!", "Be cunning and full of tricks...", "Subscription confirmed! Thank you for choosing RABBITFACTS +TM+!", "Holland Lops are a breed of rabbit originating in the Netherlands.", "Rabbits may need medication to keep themselves healthy, and that's ok! Make sure to take yours too!", "rabbits really liked this product", "A healthy rabbit diet includes fresh vegetables.", "Rabbits do not hibernate. Their schedules are much too busy.", "the rate of bunnies is measured by RPB (rabbits per bunny)", ) /obj/item/toy/plush/skyrat/chunko/andrew @@ -473,7 +473,7 @@ gender = MALE attack_verb_continuous = list("pats", "hugs", "scolds", "pets") attack_verb_simple = list("pat", "hug", "scold", "pet") - squeak_override = list('sound/creatures/mousesqueek.ogg' = 1, 'modular_skyrat/modules/emotes/sound/voice/mothsqueak.ogg' = 1,) + squeak_override = list('sound/mobs/non-humanoids/mouse/mousesqueek.ogg' = 1, 'modular_skyrat/modules/emotes/sound/voice/mothsqueak.ogg' = 1,) // All lowercase messages are intentional responses = list("bunny who you best pray you never encounter, lest you suffer a fate worse than death.", "this is a bunny!", "I wonder what would happen if you took bunnies, and combined them with rabbits, and merged their properties and characteristics. It's something to think about.", "If you're cold, they're cold. Give them the deed to your house.", "bunny that goes yeah! woo! yeah! woo! yeah! woo! yeah! woo! yeah! woo! yeah!", "the bunnies are beyond my comprehension", "it's a bunny thing, you wouldn't get it", "this bunny has an unfathomable power level", "%pull the string and I'll bink at you...I'm your bunny.", "Bunny (1954)", "the bunny that pulls the strings....", ) @@ -562,7 +562,7 @@ icon_state = "plush_scishark" attack_verb_continuous = list("bites", "eats", "fin slaps") attack_verb_simple = list("bite", "eat", "fin slap") - squeak_override = list('sound/weapons/bite.ogg'=1) + squeak_override = list('sound/items/weapons/bite.ogg'=1) //Other donation reward for Razurath /obj/item/toy/plush/skyrat/plushie_razurath/second @@ -652,4 +652,4 @@ icon_state = "plush_janiborg" attack_verb_continuous = list("beeps", "washes", "mops", "squirts", "soaps") attack_verb_simple = list("beep", "wash", "mop", "squirt", "soap") - squeak_override = list('sound/machines/twobeep.ogg' = 1) + squeak_override = list('sound/machines/beep/twobeep.ogg' = 1) diff --git a/modular_skyrat/modules/customization/modules/clothing/~donator/donator_clothing.dm b/modular_skyrat/modules/customization/modules/clothing/~donator/donator_clothing.dm index b9957542ddf..6c33006f2d9 100644 --- a/modular_skyrat/modules/customization/modules/clothing/~donator/donator_clothing.dm +++ b/modular_skyrat/modules/customization/modules/clothing/~donator/donator_clothing.dm @@ -151,7 +151,7 @@ if("No") return if("Maybe") - playsound(src, 'sound/machines/buzz-sigh.ogg', 50, FALSE) + playsound(src, 'sound/machines/buzz/buzz-sigh.ogg', 50, FALSE) audible_message(span_warning("The [src] buzzes!")) return diff --git a/modular_skyrat/modules/customization/modules/clothing/~donator/donator_items.dm b/modular_skyrat/modules/customization/modules/clothing/~donator/donator_items.dm index 1fda8c83c65..fb826f79b88 100644 --- a/modular_skyrat/modules/customization/modules/clothing/~donator/donator_items.dm +++ b/modular_skyrat/modules/customization/modules/clothing/~donator/donator_items.dm @@ -27,7 +27,7 @@ icon_state = "switchblade" base_icon_state = "switchblade" desc = "A sharp, concealable, spring-loaded comb." - hitsound = 'sound/weapons/genhit.ogg' + hitsound = 'sound/items/weapons/genhit.ogg' resistance_flags = FIRE_PROOF var/extended = FALSE @@ -40,7 +40,7 @@ extended = !extended icon_state = "switchblade[extended ? "_on" : ""]" - playsound(user || src, 'sound/weapons/batonextend.ogg', 30, TRUE) + playsound(user || src, 'sound/items/weapons/batonextend.ogg', 30, TRUE) /// This makes it so you have to extend it. diff --git a/modular_skyrat/modules/customization/modules/mob/dead/new_player/preferences_setup.dm b/modular_skyrat/modules/customization/modules/mob/dead/new_player/preferences_setup.dm index 2bbb5c2c3db..7fbe574d85b 100644 --- a/modular_skyrat/modules/customization/modules/mob/dead/new_player/preferences_setup.dm +++ b/modular_skyrat/modules/customization/modules/mob/dead/new_player/preferences_setup.dm @@ -78,7 +78,7 @@ var/highest_pref = 0 for(var/job in job_preferences) if(job_preferences[job] > highest_pref) - previewJob = SSjob.GetJob(job) + previewJob = SSjob.get_job(job) highest_pref = job_preferences[job] if(previewJob) diff --git a/modular_skyrat/modules/customization/modules/mob/living/carbon/human/MOD_sprite_accessories/mod_actions.dm b/modular_skyrat/modules/customization/modules/mob/living/carbon/human/MOD_sprite_accessories/mod_actions.dm index 33125dca3e7..1c2da88347e 100644 --- a/modular_skyrat/modules/customization/modules/mob/living/carbon/human/MOD_sprite_accessories/mod_actions.dm +++ b/modular_skyrat/modules/customization/modules/mob/living/carbon/human/MOD_sprite_accessories/mod_actions.dm @@ -15,7 +15,7 @@ mod.choose_sprite_accessories(usr) /obj/item/mod/control/proc/quick_sprite_accessories(mob/living/carbon/human/user) - playsound(user, 'sound/mecha/mechmove03.ogg', 25, TRUE, SILENCED_SOUND_EXTRARANGE) + playsound(user, 'sound/vehicles/mecha/mechmove03.ogg', 25, TRUE, SILENCED_SOUND_EXTRARANGE) user.mutant_part_visibility(quick_toggle = TRUE) /obj/item/mod/control/proc/choose_sprite_accessories(mob/living/carbon/human/user) diff --git a/modular_skyrat/modules/customization/modules/reagents/chemistry/reagents/drinks.dm b/modular_skyrat/modules/customization/modules/reagents/chemistry/reagents/drinks.dm index 14d158734fb..261bfe8d363 100644 --- a/modular_skyrat/modules/customization/modules/reagents/chemistry/reagents/drinks.dm +++ b/modular_skyrat/modules/customization/modules/reagents/chemistry/reagents/drinks.dm @@ -44,7 +44,7 @@ user.visible_message(span_warning("[user] crushes the can of [src] on [user.p_their()] forehead!"), span_notice("You crush the can of [src] on your forehead.")) else user.visible_message(span_warning("[user] crushes the can of [src] on [M]'s forehead!"), span_notice("You crush the can of [src] on [M]'s forehead.")) - playsound(M,'sound/weapons/pierce.ogg', rand(10,50), TRUE) + playsound(M,'sound/items/weapons/pierce.ogg', rand(10,50), TRUE) var/obj/item/trash/can/skyrat/crushed_can = new /obj/item/trash/can/skyrat(M.loc) crushed_can.icon_state = icon_state qdel(src) diff --git a/modular_skyrat/modules/death_consequences_perk/death_consequences_trauma.dm b/modular_skyrat/modules/death_consequences_perk/death_consequences_trauma.dm index 5cd0745a537..4e91076ac7f 100644 --- a/modular_skyrat/modules/death_consequences_perk/death_consequences_trauma.dm +++ b/modular_skyrat/modules/death_consequences_perk/death_consequences_trauma.dm @@ -179,7 +179,7 @@ last_time_degraded_on_death = world.time /datum/brain_trauma/severe/death_consequences/process(seconds_per_tick) - if (owner.status_flags & GODMODE) + if (HAS_TRAIT(owner, TRAIT_GODMODE)) return var/is_dead = (owner.stat == DEAD) diff --git a/modular_skyrat/modules/decay_subsystem/code/decaySS.dm b/modular_skyrat/modules/decay_subsystem/code/decaySS.dm index 38b13e8bc55..dca88ded38e 100644 --- a/modular_skyrat/modules/decay_subsystem/code/decaySS.dm +++ b/modular_skyrat/modules/decay_subsystem/code/decaySS.dm @@ -41,7 +41,7 @@ SUBSYSTEM_DEF(decay) log_world("SSDecay was disabled in config.") return SS_INIT_NO_NEED - if(SSmapping.config.map_name in station_filter) + if(SSmapping.current_map.map_name in station_filter) message_admins("SSDecay was disabled due to map filter.") log_world("SSDecay was disabled due to map filter.") return SS_INIT_NO_NEED diff --git a/modular_skyrat/modules/decay_subsystem/code/nests.dm b/modular_skyrat/modules/decay_subsystem/code/nests.dm index dc883affe2a..bbaf4286e17 100644 --- a/modular_skyrat/modules/decay_subsystem/code/nests.dm +++ b/modular_skyrat/modules/decay_subsystem/code/nests.dm @@ -55,7 +55,7 @@ number = 1 for(var/i in 1 to number) new path (loc) - playsound(src, 'sound/effects/blobattack.ogg', 100) + playsound(src, 'sound/effects/blob/blobattack.ogg', 100) return ..() /obj/structure/mob_spawner/Destroy() @@ -154,7 +154,7 @@ to_chat(user, span_danger("You begin to crack open [src]...")) if(do_after(user, 3 SECONDS, src)) to_chat(user, span_userdanger("You crack [src] open, something monsterous crawls out!")) - playsound(src, 'sound/effects/blobattack.ogg', 100) + playsound(src, 'sound/effects/blob/blobattack.ogg', 100) new /mob/living/basic/spider/giant/ (user.loc) qdel(src) @@ -181,7 +181,7 @@ /obj/structure/mob_spawner/beehive/attacked_by(obj/item/I, mob/living/user) . = ..() if(!swarmed) - playsound(src, 'sound/creatures/bee.ogg', 100) + playsound(src, 'sound/mobs/non-humanoids/bee/bee.ogg', 100) visible_message(span_userdanger("[src] buzzes violently as bees pour out!")) for(var/i=1, i 30 MINUTES && trigger_reason != DIVINE_INTERVENTION) - playsound(src, 'sound/misc/compiler-failure.ogg', 100, FALSE, MACHINE_SOUND_RANGE, ignore_walls = TRUE, use_reverb = TRUE, falloff_distance = MACHINE_SOUND_FALLOFF_DISTANCE) + playsound(src, 'sound/machines/compiler/compiler-failure.ogg', 100, FALSE, MACHINE_SOUND_RANGE, ignore_walls = TRUE, use_reverb = TRUE, falloff_distance = MACHINE_SOUND_FALLOFF_DISTANCE) audible_message(span_danger("[src] makes a series of sad beeps. The internal charge only lasts about 30 minutes... what a feat of engineering!")) investigate_log("Delam SCRAM signal was received but failed precondition check. (Round time or trigger reason)", INVESTIGATE_ATMOS) return FALSE @@ -178,7 +178,7 @@ // fight power with power addtimer(CALLBACK(src, PROC_REF(put_on_a_show)), EVAC_WARNING_TIMER) - playsound(src, 'sound/misc/bloblarm.ogg', 100, FALSE, MACHINE_RUMBLE_SOUND_RANGE, ignore_walls = TRUE, use_reverb = TRUE, falloff_distance = MACHINE_SOUND_FALLOFF_DISTANCE) + playsound(src, 'sound/announcer/alarm/bloblarm.ogg', 100, FALSE, MACHINE_RUMBLE_SOUND_RANGE, ignore_walls = TRUE, use_reverb = TRUE, falloff_distance = MACHINE_SOUND_FALLOFF_DISTANCE) power_fail((EVAC_WARNING_TIMER / 10) + POWER_CUT_MAX_DURATION_SECONDS, (EVAC_WARNING_TIMER / 10) + POWER_CUT_MAX_DURATION_SECONDS) /// Stop the delamination. Let the fireworks begin @@ -190,7 +190,7 @@ // Fire bell close, that nice 'are we gonna die?' rumble out far on = TRUE SSpersistence.reset_delam_counter() - alert_sound_to_playing('sound/misc/earth_rumble_distant3.ogg', override_volume = TRUE) + alert_sound_to_playing('sound/ambience/earth_rumble/earth_rumble_distant3.ogg', override_volume = TRUE) update_appearance() // Good job at kneecapping the crystal, engineers @@ -228,7 +228,7 @@ /obj/machinery/atmospherics/components/unary/delam_scram/proc/goodbye_friends() // good job buddy, sacrificing yourself for the greater good - playsound(src, 'sound/misc/compiler-failure.ogg', 100, FALSE, MACHINE_SOUND_RANGE, ignore_walls = TRUE, use_reverb = TRUE, falloff_distance = MACHINE_SOUND_FALLOFF_DISTANCE) + playsound(src, 'sound/machines/compiler/compiler-failure.ogg', 100, FALSE, MACHINE_SOUND_RANGE, ignore_walls = TRUE, use_reverb = TRUE, falloff_distance = MACHINE_SOUND_FALLOFF_DISTANCE) visible_message(span_danger("[src] beeps a sorrowful melody and collapses into a pile of twisted metal and foam!"), blind_message = span_danger("[src] beeps a sorrowful melody!")) deconstruct(FALSE) @@ -306,7 +306,7 @@ return if(!validate_suppression_status()) - playsound(src.loc, 'sound/machines/buzz-sigh.ogg', 50, FALSE, BUTTON_SOUND_RANGE, falloff_distance = BUTTON_SOUND_FALLOFF_DISTANCE) + playsound(src.loc, 'sound/machines/buzz/buzz-sigh.ogg', 50, FALSE, BUTTON_SOUND_RANGE, falloff_distance = BUTTON_SOUND_FALLOFF_DISTANCE) audible_message(span_danger("[src] makes a sad buzz and goes dark. Did someone activate it already?")) // Look through the window, buddy burn_out() return @@ -328,7 +328,7 @@ // For roundstart only, after that it's on you! if(world.time - SSticker.round_start_time > 30 MINUTES) - playsound(src.loc, 'sound/misc/compiler-failure.ogg', 50, FALSE, BUTTON_SOUND_RANGE, falloff_distance = BUTTON_SOUND_FALLOFF_DISTANCE) + playsound(src.loc, 'sound/machines/compiler/compiler-failure.ogg', 50, FALSE, BUTTON_SOUND_RANGE, falloff_distance = BUTTON_SOUND_FALLOFF_DISTANCE) audible_message(span_danger("[src] makes a series of sad beeps. The internal charge only lasts about 30 minutes... what a feat of engineering! Looks like it's all on you to save the day.")) burn_out() return diff --git a/modular_skyrat/modules/electric_welder/code/electric_welder.dm b/modular_skyrat/modules/electric_welder/code/electric_welder.dm index fca6dc4fdf0..02171f91e33 100644 --- a/modular_skyrat/modules/electric_welder/code/electric_welder.dm +++ b/modular_skyrat/modules/electric_welder/code/electric_welder.dm @@ -24,7 +24,7 @@ if(!(item_use_power(power_use_amount, user, TRUE) & COMPONENT_POWER_SUCCESS)) return powered = !powered - playsound(src, 'sound/effects/sparks4.ogg', 100, TRUE) + playsound(src, 'sound/effects/sparks/sparks4.ogg', 100, TRUE) if(powered) to_chat(user, span_notice("You turn [src] on.")) switched_on() @@ -38,7 +38,7 @@ light_on = TRUE force = 15 damtype = BURN - hitsound = 'sound/items/welder.ogg' + hitsound = 'sound/items/tools/welder.ogg' set_light_on(powered) update_appearance() START_PROCESSING(SSobj, src) diff --git a/modular_skyrat/modules/emergency_spacesuit/code/emergency_spacesuit.dm b/modular_skyrat/modules/emergency_spacesuit/code/emergency_spacesuit.dm index 7e06d94ed27..7df7149994e 100644 --- a/modular_skyrat/modules/emergency_spacesuit/code/emergency_spacesuit.dm +++ b/modular_skyrat/modules/emergency_spacesuit/code/emergency_spacesuit.dm @@ -38,7 +38,7 @@ balloon_alert_to_viewers("[src] tears!") clothing_flags &= ~STOPSPRESSUREDAMAGE torn = TRUE - playsound(src, 'sound/weapons/slashmiss.ogg', 50, TRUE) + playsound(src, 'sound/items/weapons/slashmiss.ogg', 50, TRUE) playsound(src, 'sound/effects/refill.ogg', 50, TRUE) update_appearance() diff --git a/modular_skyrat/modules/emotes/code/additionalemotes/turf_list.dm b/modular_skyrat/modules/emotes/code/additionalemotes/turf_list.dm index e753c3d3401..55bd779f9e4 100644 --- a/modular_skyrat/modules/emotes/code/additionalemotes/turf_list.dm +++ b/modular_skyrat/modules/emotes/code/additionalemotes/turf_list.dm @@ -23,7 +23,7 @@ name = "sprouted vines" desc = "It's an entanglement of vines." icon_state = pick("kudzu1", "kudzu1", "kudzu3") - playsound(get_turf(src), 'sound/creatures/venus_trap_hurt.ogg', 25, TRUE) + playsound(get_turf(src), 'sound/mobs/non-humanoids/venus_trap/venus_trap_hurt.ogg', 25, TRUE) if("water") @@ -51,14 +51,14 @@ name = "physical hologram" desc = "It's a hologram of a pet bed." icon_state = "holobed" - playsound(get_turf(src), 'sound/misc/compiler-stage2.ogg', 25, TRUE) + playsound(get_turf(src), 'sound/machines/compiler/compiler-stage2.ogg', 25, TRUE) if("holoseat") name = "physical hologram" desc = "It's a hologram of a barstool." icon_state = "holoseat" src.add_overlay(image('modular_skyrat/master_files/icons/effects/turf_effects.dmi', "holoseat_top", EXTRA_ABOVE_MOB_LAYER)) - playsound(get_turf(src), 'sound/misc/compiler-stage2.ogg', 25, TRUE) + playsound(get_turf(src), 'sound/machines/compiler/compiler-stage2.ogg', 25, TRUE) if("slime") name = "pile of oozing slime" @@ -111,7 +111,7 @@ var/mutable_appearance/overlay = mutable_appearance('modular_skyrat/master_files/icons/effects/turf_effects_64.dmi', "tails_top", EXTRA_ABOVE_MOB_LAYER, src) overlay.appearance_flags = TILE_BOUND|PIXEL_SCALE|KEEP_TOGETHER src.add_overlay(overlay) - playsound(get_turf(src), 'sound/weapons/thudswoosh.ogg', 25, TRUE) + playsound(get_turf(src), 'sound/items/weapons/thudswoosh.ogg', 25, TRUE) //prints if("pawprint") diff --git a/modular_skyrat/modules/emotes/code/dna_screams.dm b/modular_skyrat/modules/emotes/code/dna_screams.dm index b35209bab59..ed779a2833f 100644 --- a/modular_skyrat/modules/emotes/code/dna_screams.dm +++ b/modular_skyrat/modules/emotes/code/dna_screams.dm @@ -19,9 +19,9 @@ /datum/species/lizard/get_scream_sound(mob/living/carbon/human/lizard) return pick( 'modular_skyrat/modules/emotes/sound/voice/scream_lizard.ogg', - 'sound/voice/lizard/lizard_scream_1.ogg', - 'sound/voice/lizard/lizard_scream_2.ogg', - 'sound/voice/lizard/lizard_scream_3.ogg', + 'sound/mobs/humanoids/lizard/lizard_scream_1.ogg', + 'sound/mobs/humanoids/lizard/lizard_scream_2.ogg', + 'sound/mobs/humanoids/lizard/lizard_scream_3.ogg', ) /datum/species/skeleton/get_scream_sound(mob/living/carbon/human/skeleton) @@ -46,7 +46,7 @@ return 'modular_skyrat/modules/emotes/sound/emotes/voxscream.ogg' /datum/species/xeno/get_scream_sound(mob/living/carbon/human/xeno) - return 'sound/voice/hiss6.ogg' + return 'sound/mobs/non-humanoids/hiss/hiss6.ogg' /datum/species/zombie/get_scream_sound(mob/living/carbon/human/teshari) return 'modular_skyrat/modules/emotes/sound/emotes/zombie_scream.ogg' diff --git a/modular_skyrat/modules/emotes/code/emotes.dm b/modular_skyrat/modules/emotes/code/emotes.dm index 442e4ba4b8a..520b34dcf38 100644 --- a/modular_skyrat/modules/emotes/code/emotes.dm +++ b/modular_skyrat/modules/emotes/code/emotes.dm @@ -158,7 +158,7 @@ message = "squeaks!" emote_type = EMOTE_AUDIBLE vary = TRUE - sound = 'sound/creatures/mousesqueek.ogg' + sound = 'sound/mobs/non-humanoids/mouse/mousesqueek.ogg' /datum/emote/living/merp key = "merp" @@ -214,7 +214,7 @@ if(ismoth(user)) return 'modular_skyrat/modules/emotes/sound/emotes/mothchitter.ogg' else - return'sound/creatures/chitter.ogg' + return 'sound/mobs/non-humanoids/insect/chitter.ogg' /datum/emote/living/sigh/get_sound(mob/living/user) if(iscarbon(user)) @@ -563,7 +563,7 @@ message = "gnashes." emote_type = EMOTE_AUDIBLE vary = TRUE - sound = 'sound/weapons/bite.ogg' + sound = 'sound/items/weapons/bite.ogg' /datum/emote/living/thump key = "thump" @@ -572,7 +572,7 @@ emote_type = EMOTE_AUDIBLE muzzle_ignore = TRUE vary = TRUE - sound = 'sound/effects/glassbash.ogg' + sound = 'sound/effects/glass/glassbash.ogg' /datum/emote/living/surrender muzzle_ignore = TRUE diff --git a/modular_skyrat/modules/emotes/code/laugh_datums.dm b/modular_skyrat/modules/emotes/code/laugh_datums.dm index 310c6ce63bc..752e16aee1d 100644 --- a/modular_skyrat/modules/emotes/code/laugh_datums.dm +++ b/modular_skyrat/modules/emotes/code/laugh_datums.dm @@ -13,8 +13,8 @@ GLOBAL_LIST_EMPTY(laugh_types) /datum/laugh_type/human name = "Human Laugh" male_laughsounds = list( - 'sound/voice/human/manlaugh1.ogg', - 'sound/voice/human/manlaugh2.ogg', + 'sound/mobs/humanoids/human/laugh/manlaugh1.ogg', + 'sound/mobs/humanoids/human/laugh/manlaugh2.ogg', ) female_laughsounds = list( 'modular_skyrat/modules/emotes/sound/emotes/female/female_giggle_1.ogg', @@ -24,8 +24,8 @@ GLOBAL_LIST_EMPTY(laugh_types) /datum/laugh_type/humanmasc name = "Masculine Human Laugh" male_laughsounds = list( - 'sound/voice/human/manlaugh1.ogg', - 'sound/voice/human/manlaugh2.ogg', + 'sound/mobs/humanoids/human/laugh/manlaugh1.ogg', + 'sound/mobs/humanoids/human/laugh/manlaugh2.ogg', ) female_laughsounds = null @@ -39,7 +39,7 @@ GLOBAL_LIST_EMPTY(laugh_types) /datum/laugh_type/lizard name = "Lizard Laugh" - male_laughsounds = list('sound/voice/lizard/lizard_laugh1.ogg',) + male_laughsounds = list('sound/mobs/humanoids/lizard/lizard_laugh1.ogg',) female_laughsounds = null /datum/laugh_type/felinid @@ -53,8 +53,8 @@ GLOBAL_LIST_EMPTY(laugh_types) /datum/laugh_type/clown name = "Clown Laugh" male_laughsounds = list( - 'sound/creatures/clown/hohoho.ogg', - 'sound/creatures/clown/hehe.ogg', + 'sound/mobs/non-humanoids/clown/hohoho.ogg', + 'sound/mobs/non-humanoids/clown/hehe.ogg', ) female_laughsounds = null diff --git a/modular_skyrat/modules/emotes/code/laugh_emotes.dm b/modular_skyrat/modules/emotes/code/laugh_emotes.dm index 5c202afeaad..4c6e1c63392 100644 --- a/modular_skyrat/modules/emotes/code/laugh_emotes.dm +++ b/modular_skyrat/modules/emotes/code/laugh_emotes.dm @@ -13,8 +13,8 @@ var/mob/living/carbon/human/H = user if(isnull(H.selected_laugh)) //For things that don't have a selected laugh(npcs) if(user.gender == MALE) - return pick('sound/voice/human/manlaugh1.ogg', - 'sound/voice/human/manlaugh2.ogg') + return pick('sound/mobs/humanoids/human/laugh/manlaugh1.ogg', + 'sound/mobs/humanoids/human/laugh/manlaugh2.ogg') else return pick('modular_skyrat/modules/emotes/sound/emotes/female/female_giggle_1.ogg', 'modular_skyrat/modules/emotes/sound/emotes/female/female_giggle_2.ogg') diff --git a/modular_skyrat/modules/emotes/code/scream_datums.dm b/modular_skyrat/modules/emotes/code/scream_datums.dm index 370a48894ba..1e671bc788c 100644 --- a/modular_skyrat/modules/emotes/code/scream_datums.dm +++ b/modular_skyrat/modules/emotes/code/scream_datums.dm @@ -24,19 +24,19 @@ GLOBAL_LIST_EMPTY(scream_types) /datum/scream_type/human_two name = "Human Scream 2" male_screamsounds = list( - 'sound/voice/human/malescream_1.ogg', - 'sound/voice/human/malescream_2.ogg', - 'sound/voice/human/malescream_3.ogg', - 'sound/voice/human/malescream_4.ogg', - 'sound/voice/human/malescream_5.ogg', - 'sound/voice/human/malescream_6.ogg', + 'sound/mobs/humanoids/human/scream/malescream_1.ogg', + 'sound/mobs/humanoids/human/scream/malescream_2.ogg', + 'sound/mobs/humanoids/human/scream/malescream_3.ogg', + 'sound/mobs/humanoids/human/scream/malescream_4.ogg', + 'sound/mobs/humanoids/human/scream/malescream_5.ogg', + 'sound/mobs/humanoids/human/scream/malescream_6.ogg', ) female_screamsounds = list( - 'sound/voice/human/femalescream_1.ogg', - 'sound/voice/human/femalescream_2.ogg', - 'sound/voice/human/femalescream_3.ogg', - 'sound/voice/human/femalescream_4.ogg', - 'sound/voice/human/femalescream_5.ogg', + 'sound/mobs/humanoids/human/scream/femalescream_1.ogg', + 'sound/mobs/humanoids/human/scream/femalescream_2.ogg', + 'sound/mobs/humanoids/human/scream/femalescream_3.ogg', + 'sound/mobs/humanoids/human/scream/femalescream_4.ogg', + 'sound/mobs/humanoids/human/scream/femalescream_5.ogg', ) @@ -45,23 +45,23 @@ GLOBAL_LIST_EMPTY(scream_types) male_screamsounds = list( 'modular_skyrat/modules/emotes/sound/voice/scream_m1.ogg', 'modular_skyrat/modules/emotes/sound/voice/scream_m2.ogg', - 'sound/voice/human/malescream_1.ogg', - 'sound/voice/human/malescream_2.ogg', - 'sound/voice/human/malescream_3.ogg', - 'sound/voice/human/malescream_4.ogg', - 'sound/voice/human/malescream_5.ogg', - 'sound/voice/human/malescream_6.ogg', + 'sound/mobs/humanoids/human/scream/malescream_1.ogg', + 'sound/mobs/humanoids/human/scream/malescream_2.ogg', + 'sound/mobs/humanoids/human/scream/malescream_3.ogg', + 'sound/mobs/humanoids/human/scream/malescream_4.ogg', + 'sound/mobs/humanoids/human/scream/malescream_5.ogg', + 'sound/mobs/humanoids/human/scream/malescream_6.ogg', ) female_screamsounds = null /datum/scream_type/human_femme name = "Feminine Human Scream" male_screamsounds = list( - 'sound/voice/human/femalescream_1.ogg', - 'sound/voice/human/femalescream_2.ogg', - 'sound/voice/human/femalescream_3.ogg', - 'sound/voice/human/femalescream_4.ogg', - 'sound/voice/human/femalescream_5.ogg', + 'sound/mobs/humanoids/human/scream/femalescream_1.ogg', + 'sound/mobs/humanoids/human/scream/femalescream_2.ogg', + 'sound/mobs/humanoids/human/scream/femalescream_3.ogg', + 'sound/mobs/humanoids/human/scream/femalescream_4.ogg', + 'sound/mobs/humanoids/human/scream/femalescream_5.ogg', 'modular_skyrat/modules/emotes/sound/voice/scream_f1.ogg', 'modular_skyrat/modules/emotes/sound/voice/scream_f2.ogg', ) @@ -74,15 +74,15 @@ GLOBAL_LIST_EMPTY(scream_types) /datum/scream_type/wilhelm name = "Classic Scream" - male_screamsounds = list('sound/voice/human/wilhelm_scream.ogg') + male_screamsounds = list('sound/mobs/humanoids/human/scream/wilhelm_scream.ogg') female_screamsounds = null /datum/scream_type/lizard name = "Lizard Scream" male_screamsounds = list( - 'sound/voice/lizard/lizard_scream_1.ogg', - 'sound/voice/lizard/lizard_scream_2.ogg', - 'sound/voice/lizard/lizard_scream_3.ogg', + 'sound/mobs/humanoids/lizard/lizard_scream_1.ogg', + 'sound/mobs/humanoids/lizard/lizard_scream_2.ogg', + 'sound/mobs/humanoids/lizard/lizard_scream_3.ogg', ) female_screamsounds = null @@ -100,7 +100,7 @@ GLOBAL_LIST_EMPTY(scream_types) name = "Moth Scream" male_screamsounds = list( 'modular_skyrat/modules/emotes/sound/voice/scream_moth.ogg', - 'sound/voice/moth/scream_moth.ogg', + 'sound/mobs/humanoids/moth/scream_moth.ogg', ) female_screamsounds = null @@ -117,7 +117,7 @@ GLOBAL_LIST_EMPTY(scream_types) /datum/scream_type/xeno name = "Xeno Scream" male_screamsounds = list( - 'sound/voice/hiss6.ogg', + 'sound/mobs/non-humanoids/hiss/hiss6.ogg', 'modular_skyrat/modules/xenos_skyrat_redo/sound/alien_roar1.ogg', 'modular_skyrat/modules/xenos_skyrat_redo/sound/alien_roar2.ogg', ) @@ -135,18 +135,18 @@ GLOBAL_LIST_EMPTY(scream_types) /datum/scream_type/chicken name = "Chicken Scream" - male_screamsounds = list('sound/creatures/bagawk.ogg') + male_screamsounds = list('sound/mobs/non-humanoids/chicken/bagawk.ogg') female_screamsounds = null /datum/scream_type/ethereal name = "Ethereal Scream" male_screamsounds = list( - 'sound/voice/ethereal/ethereal_scream_1.ogg', - 'sound/voice/ethereal/ethereal_scream_2.ogg', - 'sound/voice/ethereal/ethereal_scream_3.ogg', - 'sound/voice/ethereal/lustrous_scream_1.ogg', - 'sound/voice/ethereal/lustrous_scream_2.ogg', - 'sound/voice/ethereal/lustrous_scream_3.ogg', + 'sound/mobs/humanoids/ethereal/ethereal_scream_1.ogg', + 'sound/mobs/humanoids/ethereal/ethereal_scream_2.ogg', + 'sound/mobs/humanoids/ethereal/ethereal_scream_3.ogg', + 'sound/mobs/humanoids/ethereal/lustrous_scream_1.ogg', + 'sound/mobs/humanoids/ethereal/lustrous_scream_2.ogg', + 'sound/mobs/humanoids/ethereal/lustrous_scream_3.ogg', ) female_screamsounds = null @@ -160,19 +160,19 @@ GLOBAL_LIST_EMPTY(scream_types) name = "Monkey Scream" male_screamsounds = list( 'modular_skyrat/modules/emotes/sound/voice/scream_monkey.ogg', - 'sound/creatures/monkey/monkey_screech_1.ogg', - 'sound/creatures/monkey/monkey_screech_2.ogg', - 'sound/creatures/monkey/monkey_screech_3.ogg', - 'sound/creatures/monkey/monkey_screech_4.ogg', - 'sound/creatures/monkey/monkey_screech_5.ogg', - 'sound/creatures/monkey/monkey_screech_6.ogg', - 'sound/creatures/monkey/monkey_screech_7.ogg', + 'sound/mobs/non-humanoids/monkey/monkey_screech_1.ogg', + 'sound/mobs/non-humanoids/monkey/monkey_screech_2.ogg', + 'sound/mobs/non-humanoids/monkey/monkey_screech_3.ogg', + 'sound/mobs/non-humanoids/monkey/monkey_screech_4.ogg', + 'sound/mobs/non-humanoids/monkey/monkey_screech_5.ogg', + 'sound/mobs/non-humanoids/monkey/monkey_screech_6.ogg', + 'sound/mobs/non-humanoids/monkey/monkey_screech_7.ogg', ) female_screamsounds = null /datum/scream_type/gorilla name = "Gorilla Scream" - male_screamsounds = list('sound/creatures/gorilla.ogg') + male_screamsounds = list('sound/mobs/non-humanoids/gorilla/gorilla.ogg') female_screamsounds = null /datum/scream_type/skeleton @@ -183,7 +183,7 @@ GLOBAL_LIST_EMPTY(scream_types) /datum/scream_type/plasmaman name = "Plasmaman Scream" male_screamsounds = list( - 'sound/voice/plasmaman/plasmeme_scream_1.ogg', - 'sound/voice/plasmaman/plasmeme_scream_2.ogg', - 'sound/voice/plasmaman/plasmeme_scream_3.ogg') + 'sound/mobs/humanoids/plasmaman/plasmeme_scream_1.ogg', + 'sound/mobs/humanoids/plasmaman/plasmeme_scream_2.ogg', + 'sound/mobs/humanoids/plasmaman/plasmeme_scream_3.ogg') female_screamsounds = null diff --git a/modular_skyrat/modules/emotes/code/scream_emote.dm b/modular_skyrat/modules/emotes/code/scream_emote.dm index b5f46e6d91f..9ae0add2410 100644 --- a/modular_skyrat/modules/emotes/code/scream_emote.dm +++ b/modular_skyrat/modules/emotes/code/scream_emote.dm @@ -17,9 +17,9 @@ if(ismonkey(user)) return 'modular_skyrat/modules/emotes/sound/voice/scream_monkey.ogg' if(istype(user, /mob/living/basic/gorilla)) - return 'sound/creatures/gorilla.ogg' + return 'sound/mobs/non-humanoids/gorilla/gorilla.ogg' if(isalien(user)) - return 'sound/voice/hiss6.ogg' + return 'sound/mobs/non-humanoids/hiss/hiss6.ogg' /datum/emote/living/scream/can_run_emote(mob/living/user, status_check, intentional) if(iscyborg(user)) @@ -39,7 +39,7 @@ return if(isnull(user.selected_scream) || (LAZYLEN(user.selected_scream.male_screamsounds) && LAZYLEN(user.selected_scream.female_screamsounds))) //For things that don't have a selected scream(npcs) if(prob(1)) - return 'sound/voice/human/wilhelm_scream.ogg' + return 'sound/mobs/humanoids/human/scream/wilhelm_scream.ogg' return user.dna.species.get_scream_sound(user) if(user.gender == FEMALE && LAZYLEN(user.selected_scream.female_screamsounds)) return pick(user.selected_scream.female_screamsounds) diff --git a/modular_skyrat/modules/emotes/code/synth_emotes.dm b/modular_skyrat/modules/emotes/code/synth_emotes.dm index 63f96c0ca33..f7f07e8ad87 100644 --- a/modular_skyrat/modules/emotes/code/synth_emotes.dm +++ b/modular_skyrat/modules/emotes/code/synth_emotes.dm @@ -35,4 +35,4 @@ key = "laughtrack" message = "plays a laughtrack." emote_type = EMOTE_AUDIBLE - sound = 'sound/items/sitcomlaugh2.ogg' + sound = 'sound/items/sitcom_laugh/SitcomLaugh2.ogg' diff --git a/modular_skyrat/modules/energy_axe/code/energy_fireaxe.dm b/modular_skyrat/modules/energy_axe/code/energy_fireaxe.dm index 19f4de36d63..46761112632 100644 --- a/modular_skyrat/modules/energy_axe/code/energy_fireaxe.dm +++ b/modular_skyrat/modules/energy_axe/code/energy_fireaxe.dm @@ -24,12 +24,12 @@ . = ..() RegisterSignal(src, COMSIG_TWOHANDED_WIELD, PROC_REF(energy_wield), override = TRUE) RegisterSignal(src, COMSIG_TWOHANDED_UNWIELD, PROC_REF(energy_unwield), override = TRUE) - AddComponent(/datum/component/two_handed, force_unwielded = 10, force_wielded = 33, icon_wielded = "[base_icon_state]1", wieldsound = 'sound/weapons/saberon.ogg', unwieldsound = 'sound/weapons/saberoff.ogg') + AddComponent(/datum/component/two_handed, force_unwielded = 10, force_wielded = 33, icon_wielded = "[base_icon_state]1", wieldsound = 'sound/items/weapons/saberon.ogg', unwieldsound = 'sound/items/weapons/saberoff.ogg') /obj/item/fireaxe/energy/proc/energy_wield(obj/item/source, mob/living/carbon/user) SIGNAL_HANDLER - hitsound = 'sound/weapons/blade1.ogg' + hitsound = 'sound/items/weapons/blade1.ogg' START_PROCESSING(SSobj, src) set_light_on(TRUE) diff --git a/modular_skyrat/modules/exp_corps/code/gear.dm b/modular_skyrat/modules/exp_corps/code/gear.dm index 43c747d0946..1c668b4ad2a 100644 --- a/modular_skyrat/modules/exp_corps/code/gear.dm +++ b/modular_skyrat/modules/exp_corps/code/gear.dm @@ -25,7 +25,7 @@ lefthand_file = 'modular_skyrat/modules/exp_corps/icons/bonesaw_l.dmi' righthand_file = 'modular_skyrat/modules/exp_corps/icons/bonesaw_r.dmi' inhand_icon_state = "bonesaw" - hitsound = 'sound/weapons/bladeslice.ogg' + hitsound = 'sound/items/weapons/bladeslice.ogg' toolspeed = 2 throw_range = 3 w_class = WEIGHT_CLASS_SMALL @@ -48,7 +48,7 @@ attack_verb_simple = list("shove", "bash") transparent = TRUE max_integrity = 200 - shield_break_sound = 'sound/effects/glassbr3.ogg' + shield_break_sound = 'sound/effects/glass/glassbr3.ogg' shield_break_leftover = /obj/item/pointman_broken var/repairable_by = /obj/item/stack/sheet/plasteel //what to repair the shield with diff --git a/modular_skyrat/modules/exp_corps/code/tomahawk.dm b/modular_skyrat/modules/exp_corps/code/tomahawk.dm index b03135607d1..1cdf15ca59a 100644 --- a/modular_skyrat/modules/exp_corps/code/tomahawk.dm +++ b/modular_skyrat/modules/exp_corps/code/tomahawk.dm @@ -16,7 +16,7 @@ embed_type = /datum/embed_data/tomahawk attack_verb_continuous = list("chops", "tears", "lacerates", "cuts") attack_verb_simple = list("chop", "tear", "lacerate", "cut") - hitsound = 'sound/weapons/bladeslice.ogg' + hitsound = 'sound/items/weapons/bladeslice.ogg' sharpness = SHARP_EDGED /datum/embed_data/tomahawk diff --git a/modular_skyrat/modules/filtersandsetters/code/filtersandsetters.dm b/modular_skyrat/modules/filtersandsetters/code/filtersandsetters.dm index a4a97b93a98..5e747e645ed 100644 --- a/modular_skyrat/modules/filtersandsetters/code/filtersandsetters.dm +++ b/modular_skyrat/modules/filtersandsetters/code/filtersandsetters.dm @@ -143,7 +143,7 @@ tool_behaviour = (active ? TOOL_BONESET : TOOL_BLOODFILTER) balloon_alert(user, "tools set to [active ? "set bones" : "filter blood"]") - playsound(user ? user : src, 'sound/items/change_drill.ogg', 50, TRUE) + playsound(user ? user : src, 'sound/items/tools/change_drill.ogg', 50, TRUE) return COMPONENT_NO_DEFAULT_MESSAGE /obj/item/blood_filter/advanced/examine() diff --git a/modular_skyrat/modules/gladiator/code/game/objects/items/gladiator_items.dm b/modular_skyrat/modules/gladiator/code/game/objects/items/gladiator_items.dm index a7f49026ffd..c97f76f88b6 100644 --- a/modular_skyrat/modules/gladiator/code/game/objects/items/gladiator_items.dm +++ b/modular_skyrat/modules/gladiator/code/game/objects/items/gladiator_items.dm @@ -183,7 +183,7 @@ /datum/status_effect/dodgeroll_iframes/proc/whiff() SIGNAL_HANDLER owner.balloon_alert_to_viewers("MISS!") - playsound(src, 'sound/weapons/thudswoosh.ogg', 50, TRUE, -1) + playsound(src, 'sound/items/weapons/thudswoosh.ogg', 50, TRUE, -1) return SUCCESSFUL_BLOCK /obj/item/claymore/dragonslayer/very_fucking_loud diff --git a/modular_skyrat/modules/gladiator/code/modules/mob/living/simple_animal/hostile/megafauna/markedone.dm b/modular_skyrat/modules/gladiator/code/modules/mob/living/simple_animal/hostile/megafauna/markedone.dm index 7a09648a7e5..2b0c22348aa 100644 --- a/modular_skyrat/modules/gladiator/code/modules/mob/living/simple_animal/hostile/megafauna/markedone.dm +++ b/modular_skyrat/modules/gladiator/code/modules/mob/living/simple_animal/hostile/megafauna/markedone.dm @@ -23,7 +23,7 @@ attack_verb_simple = "cleave" attack_verb_continuous = "cleaves" attack_sound = 'modular_skyrat/master_files/sound/weapons/bloodyslice.ogg' - death_sound = 'sound/creatures/space_dragon_roar.ogg' + death_sound = 'sound/mobs/non-humanoids/space_dragon/space_dragon_roar.ogg' death_message = "falls on his sword, ash evaporating from every hole in his armor." gps_name = "Forgotten Signal" gender = MALE @@ -115,7 +115,7 @@ if(prob(block_chance) && (phase == 1 || phase == 4) && !stunned) var/our_turf = get_turf(src) new /obj/effect/temp_visual/block(our_turf, COLOR_YELLOW) - playsound(src, 'sound/weapons/parry.ogg', BLOCK_SOUND_VOLUME * 2, vary = TRUE) // louder because lavaland low pressure maybe? + playsound(src, 'sound/items/weapons/parry.ogg', BLOCK_SOUND_VOLUME * 2, vary = TRUE) // louder because lavaland low pressure maybe? return FALSE . = ..() update_phase() @@ -217,6 +217,7 @@ var/mob/living/carbon/human/human_target = target var/datum/species/targetspecies = human_target.dna.species // The gladiator hates non-humans, he especially hates ash walkers. + // BUBBER TODO - Bring the says back when refactoring to basicmobs if(targetspecies.id == SPECIES_HUMAN) var/static/list/human_messages = list( "Is this all that is left?", @@ -226,7 +227,7 @@ "Show me a good time, miner!", "I'll give you the first hit.", ) - say(message = pick(human_messages)) + //say(message = pick(human_messages)) introduced |= WEAKREF(target) else if(targetspecies.id == SPECIES_LIZARD_ASH) var/static/list/ashie_messages = list( @@ -236,7 +237,7 @@ "GET OVER HERE!!", ) - say(message = pick(ashie_messages), language = /datum/language/ashtongue) + //say(message = pick(ashie_messages), language = /datum/language/ashtongue) introduced |= WEAKREF(target) get_angry() GiveTarget(target) @@ -248,13 +249,13 @@ "You will make a fine rug!", "For the necropolis!" ) - say(message = pick(other_humanoid_messages)) + //say(message = pick(other_humanoid_messages)) introduced |= WEAKREF(target) get_angry() GiveTarget(target) else //simplemobs beware - say("It's berserkin' time!") + //say("It's berserkin' time!") introduced |= WEAKREF(target) /// Checks against the Marked One's current health and updates his phase accordingly. Uses variable shitcode to make sure his phase updates only ever happen *once* @@ -421,7 +422,7 @@ /mob/living/simple_animal/hostile/megafauna/gladiator/proc/bone_knife_throw(atom/target) var/obj/item/knife/combat/bone/boned = new /obj/item/knife/combat/bone(get_turf(src)) boned.throwforce = 35 - playsound(src, 'sound/weapons/bolathrow.ogg', 60, 0) + playsound(src, 'sound/items/weapons/bolathrow.ogg', 60, 0) boned.throw_at(target, 7, 3, thrower = src) QDEL_IN(boned, 3 SECONDS) diff --git a/modular_skyrat/modules/goofsec/code/sol_fed.dm b/modular_skyrat/modules/goofsec/code/sol_fed.dm index aba107bf036..0e17fed0c14 100644 --- a/modular_skyrat/modules/goofsec/code/sol_fed.dm +++ b/modular_skyrat/modules/goofsec/code/sol_fed.dm @@ -170,8 +170,8 @@ GLOBAL_LIST_INIT(call911_do_and_do_not, list( var/datum/antagonist/ert/request_911/ert_antag = new cops_to_send cop.mind.add_antag_datum(ert_antag) - cop.mind.set_assigned_role(SSjob.GetJobType(ert_antag.ert_job_path)) - SSjob.SendToLateJoin(cop) + cop.mind.set_assigned_role(SSjob.get_job_type(ert_antag.ert_job_path)) + SSjob.send_to_late_join(cop) cop.grant_language(/datum/language/common, source = LANGUAGE_SPAWNER) if(cops_to_send == /datum/antagonist/ert/request_911/atmos) // charge for atmos techs @@ -201,7 +201,7 @@ GLOBAL_LIST_INIT(call911_do_and_do_not, list( if (GLOB.cops_arrived) to_chat(user, span_warning("911 has already been called this shift!")) - playsound(src, 'sound/machines/terminal_prompt_deny.ogg', 50, FALSE) + playsound(src, 'sound/machines/terminal/terminal_prompt_deny.ogg', 50, FALSE) return FALSE if (!issilicon(user)) @@ -209,11 +209,11 @@ GLOBAL_LIST_INIT(call911_do_and_do_not, list( var/obj/item/card/id/id_card = held_item?.GetID() if (!istype(id_card)) to_chat(user, span_warning("You need to swipe your ID!")) - playsound(src, 'sound/machines/terminal_prompt_deny.ogg', 50, FALSE) + playsound(src, 'sound/machines/terminal/terminal_prompt_deny.ogg', 50, FALSE) return FALSE if (!(ACCESS_CAPTAIN in id_card.access)) to_chat(user, span_warning("You are not authorized to do this!")) - playsound(src, 'sound/machines/terminal_prompt_deny.ogg', 50, FALSE) + playsound(src, 'sound/machines/terminal/terminal_prompt_deny.ogg', 50, FALSE) return FALSE else to_chat(user, "The console refuses to let you dial 911 as an AI or Cyborg!") @@ -243,7 +243,7 @@ GLOBAL_LIST_INIT(call911_do_and_do_not, list( call_911(called_group) to_chat(user, span_notice("Authorization confirmed. 911 call dispatched to the Sol Federation [called_group_pretty].")) - playsound(src, 'sound/machines/terminal_prompt_confirm.ogg', 50, FALSE) + playsound(src, 'sound/machines/terminal/terminal_prompt_confirm.ogg', 50, FALSE) /datum/antagonist/ert/request_911 name = "911 Responder" @@ -608,8 +608,8 @@ GLOBAL_LIST_INIT(call911_do_and_do_not, list( var/datum/antagonist/ert/request_911/ert_antag = new type_to_summon cop.mind.add_antag_datum(ert_antag) - cop.mind.set_assigned_role(SSjob.GetJobType(ert_antag.ert_job_path)) - SSjob.SendToLateJoin(cop) + cop.mind.set_assigned_role(SSjob.get_job_type(ert_antag.ert_job_path)) + SSjob.send_to_late_join(cop) cop.grant_language(/datum/language/common, source = LANGUAGE_SPAWNER) var/obj/item/gangster_cellphone/phone = new() // biggest gang in the city @@ -772,14 +772,14 @@ GLOBAL_LIST_INIT(call911_do_and_do_not, list( else message_admins("[ADMIN_LOOKUPFLW(user)] has beamed out [living_user.pulling] alongside them.") var/turf/pulling_turf = get_turf(living_user.pulling) - playsound(pulling_turf, 'sound/magic/Repulse.ogg', 100, 1) + playsound(pulling_turf, 'sound/effects/magic/Repulse.ogg', 100, 1) var/datum/effect_system/spark_spread/quantum/sparks = new sparks.set_up(10, 1, pulling_turf) sparks.attach(pulling_turf) sparks.start() qdel(living_user.pulling) var/turf/user_turf = get_turf(living_user) - playsound(user_turf, 'sound/magic/Repulse.ogg', 100, 1) + playsound(user_turf, 'sound/effects/magic/Repulse.ogg', 100, 1) var/datum/effect_system/spark_spread/quantum/sparks = new sparks.set_up(10, 1, user_turf) sparks.attach(user_turf) diff --git a/modular_skyrat/modules/gun_safety/code/safety_component.dm b/modular_skyrat/modules/gun_safety/code/safety_component.dm index 623886d74c3..ed5c7b622ee 100644 --- a/modular_skyrat/modules/gun_safety/code/safety_component.dm +++ b/modular_skyrat/modules/gun_safety/code/safety_component.dm @@ -60,7 +60,7 @@ update_action_button_state() - playsound(parent, 'sound/weapons/empty.ogg', 100, TRUE) + playsound(parent, 'sound/items/weapons/empty.ogg', 100, TRUE) user.visible_message( span_notice("[user] toggles [parent]'s safety [safety_currently_on ? "ON" : "OFF"]."), span_notice("You toggle [parent]'s safety [safety_currently_on ? "ON" : "OFF"].") diff --git a/modular_skyrat/modules/horrorform/code/horror_form.dm b/modular_skyrat/modules/horrorform/code/horror_form.dm index a2411c8fd77..d08fdb3be9b 100644 --- a/modular_skyrat/modules/horrorform/code/horror_form.dm +++ b/modular_skyrat/modules/horrorform/code/horror_form.dm @@ -65,7 +65,7 @@ new_mob.name = new_mob.real_name new_mob.stored_changeling = user user.loc = new_mob - user.status_flags |= GODMODE + ADD_TRAIT(user, TRAIT_GODMODE, INNATE_TRAIT) user.mind.transfer_to(new_mob) user.spawn_gibs() //feedback_add_details("changeling_powers","HF") diff --git a/modular_skyrat/modules/horrorform/code/true_changeling.dm b/modular_skyrat/modules/horrorform/code/true_changeling.dm index 9024d826885..e5be55f2ad8 100644 --- a/modular_skyrat/modules/horrorform/code/true_changeling.dm +++ b/modular_skyrat/modules/horrorform/code/true_changeling.dm @@ -31,7 +31,7 @@ wander = FALSE attack_verb_continuous = "rips into" attack_verb_simple = "rip into" - attack_sound = 'sound/effects/blobattack.ogg' + attack_sound = 'sound/effects/blob/blobattack.ogg' butcher_results = list(/obj/item/food/meat/slab/human = 15) //It's a pretty big dude. Actually killing one is a feat. gold_core_spawnable = FALSE //Should stay exclusive to changelings tbh, otherwise makes it much less significant to sight one var/datum/action/innate/turn_to_human @@ -126,7 +126,7 @@ mind.transfer_to(stored_changeling) stored_changeling.Paralyze(10 SECONDS) //Make them helpless for 10 seconds stored_changeling.adjustBruteLoss(30, TRUE, TRUE) - stored_changeling.status_flags &= ~GODMODE + REMOVE_TRAIT(stored_changeling, TRAIT_GODMODE, INNATE_TRAIT) stored_changeling.emote("scream") stored_changeling.gib() stored_changeling = null @@ -201,7 +201,7 @@ horrorform.stored_changeling.loc = get_turf(horrorform) horrorform.mind.transfer_to(horrorform.stored_changeling) horrorform.stored_changeling.Stun(2 SECONDS) - horrorform.stored_changeling.status_flags &= ~GODMODE + REMOVE_TRAIT(horrorform.stored_changeling, TRAIT_GODMODE, INNATE_TRAIT) qdel(horrorform) return TRUE diff --git a/modular_skyrat/modules/hyposprays/code/hyposprays_II.dm b/modular_skyrat/modules/hyposprays/code/hyposprays_II.dm index 7209d8648eb..78a906f098c 100644 --- a/modular_skyrat/modules/hyposprays/code/hyposprays_II.dm +++ b/modular_skyrat/modules/hyposprays/code/hyposprays_II.dm @@ -191,7 +191,7 @@ to_chat(user, span_notice("You remove [vial] from [src].")) vial = null update_icon() - playsound(loc, 'sound/weapons/empty.ogg', 50, 1) + playsound(loc, 'sound/items/weapons/empty.ogg', 50, 1) else to_chat(user, span_notice("This hypo isn't loaded!")) return @@ -210,7 +210,7 @@ vial.forceMove(quickswap_loc) vial = new_vial user.visible_message(span_notice("[user] has loaded a vial into [src]."), span_notice("You have loaded [vial] into [src].")) - playsound(loc, 'sound/weapons/autoguninsert.ogg', 35, 1) + playsound(loc, 'sound/items/weapons/autoguninsert.ogg', 35, 1) update_appearance() /obj/item/hypospray/mkii/item_interaction(mob/living/user, obj/item/tool, list/modifiers) diff --git a/modular_skyrat/modules/icspawning/code/observer.dm b/modular_skyrat/modules/icspawning/code/observer.dm index e0dd2137fc6..d6ae796297f 100644 --- a/modular_skyrat/modules/icspawning/code/observer.dm +++ b/modular_skyrat/modules/icspawning/code/observer.dm @@ -67,7 +67,7 @@ QDEL_IN(user, 1) if (teleport_option == "Bluespace") - playsound(spawned_player, 'sound/magic/Disable_Tech.ogg', 100, 1) + playsound(spawned_player, 'sound/effects/magic/Disable_Tech.ogg', 100, 1) if(user.mind && isliving(spawned_player)) user.mind.transfer_to(spawned_player, 1) // second argument to force key move to new mob @@ -149,4 +149,4 @@ if(isnull(dresscode)) return - return dresscode \ No newline at end of file + return dresscode diff --git a/modular_skyrat/modules/icspawning/code/spell.dm b/modular_skyrat/modules/icspawning/code/spell.dm index fbbb3602b5e..b323535f8aa 100644 --- a/modular_skyrat/modules/icspawning/code/spell.dm +++ b/modular_skyrat/modules/icspawning/code/spell.dm @@ -1,7 +1,7 @@ /datum/action/cooldown/spell/return_back name = "Return" desc = "Activates your return beacon." - sound = 'sound/magic/Repulse.ogg' + sound = 'sound/effects/magic/Repulse.ogg' button_icon_state = "lightning" spell_requirements = NONE invocation = "Return on!" diff --git a/modular_skyrat/modules/implants/code/augments_arms.dm b/modular_skyrat/modules/implants/code/augments_arms.dm index aefb5c076fd..c349cb8deb5 100644 --- a/modular_skyrat/modules/implants/code/augments_arms.dm +++ b/modular_skyrat/modules/implants/code/augments_arms.dm @@ -1,11 +1,11 @@ -#define KNIFE_HITSOUND 'sound/weapons/bladeslice.ogg' -#define KNIFE_USESOUND 'sound/weapons/bladeslice.ogg' +#define KNIFE_HITSOUND 'sound/items/weapons/bladeslice.ogg' +#define KNIFE_USESOUND 'sound/items/weapons/bladeslice.ogg' #define KNIFE_ATTACK_VERB_CONTINUOUS list("slashes", "tears", "slices", "tears", "lacerates", "rips", "dices", "cuts", "rends") #define KNIFE_ATTACK_VERB_SIMPLE list("slash", "tear", "slice", "tear", "lacerate", "rip", "dice", "cut", "rend") #define KNIFE_SHARPNESS SHARP_EDGED #define KNIFE_BARE_WOUND_BONUS 15 -#define CUTTER_HITSOUND 'sound/items/wirecutter.ogg' -#define CUTTER_USESOUND 'sound/items/wirecutter.ogg' +#define CUTTER_HITSOUND 'sound/items/tools/wirecutter.ogg' +#define CUTTER_USESOUND 'sound/items/tools/wirecutter.ogg' #define CUTTER_ATTACK_VERB_CONTINUOUS list("bashes", "batters", "bludgeons", "thrashes", "whacks") #define CUTTER_ATTACK_VERB_SIMPLE list("bash", "batter", "bludgeon", "thrash", "whack") #define CUTTER_FORCE 6 @@ -35,7 +35,7 @@ icon_state = "energy_mantis_blade" force = 30 armour_penetration = 10 //Energy isn't as good at going through armor as it is through flesh alone. - hitsound = 'sound/weapons/blade1.ogg' + hitsound = 'sound/items/weapons/blade1.ogg' /obj/item/organ/internal/cyberimp/arm/armblade name = "arm blade implant" @@ -71,7 +71,7 @@ item_flags = NEEDS_PERMIT //Beepers gets angry if you get caught with this. /obj/item/knife/razor_claws/attack_self(mob/user) - playsound(get_turf(user), 'sound/items/change_drill.ogg', 50, TRUE) + playsound(get_turf(user), 'sound/items/tools/change_drill.ogg', 50, TRUE) if(tool_behaviour != TOOL_WIRECUTTER) tool_behaviour = TOOL_WIRECUTTER to_chat(user, span_notice("You shift [src] into Precision mode, for wirecutting.")) @@ -171,7 +171,7 @@ sharpness = SHARP_EDGED attack_verb_continuous = list("saws", "tears", "lacerates", "cuts", "chops", "dices") attack_verb_simple = list("saw", "tear", "lacerate", "cut", "chop", "dice") - hitsound = 'sound/weapons/chainsawhit.ogg' + hitsound = 'sound/items/weapons/chainsawhit.ogg' tool_behaviour = TOOL_SAW toolspeed = 1 diff --git a/modular_skyrat/modules/inflatables/code/inflatable.dm b/modular_skyrat/modules/inflatables/code/inflatable.dm index 47cfef36777..b4338f10238 100644 --- a/modular_skyrat/modules/inflatables/code/inflatable.dm +++ b/modular_skyrat/modules/inflatables/code/inflatable.dm @@ -19,7 +19,7 @@ /// The type we drop when deflated. var/deflated_type = /obj/item/inflatable /// The hitsound made when we're... hit... - var/hit_sound = 'sound/effects/Glasshit.ogg' + var/hit_sound = 'sound/effects/glass/glasshit.ogg' /// How quickly we deflate when manually deflated. var/manual_deflation_time = 3 SECONDS /// Whether or not the inflatable has been deflated @@ -161,7 +161,7 @@ if(locate(structure_type) in get_turf(user)) to_chat(user, span_warning("There is already a wall here!")) return - playsound(loc, 'sound/items/zip.ogg', 75, 1) + playsound(loc, 'sound/items/zip/zip.ogg', 75, 1) to_chat(user, span_notice("You inflate [src].")) if(do_after(user, 1 SECONDS, src)) new structure_type(get_turf(user)) diff --git a/modular_skyrat/modules/jukebox/code/dance_machine.dm b/modular_skyrat/modules/jukebox/code/dance_machine.dm index 54c8e27ed89..42ddb57030d 100644 --- a/modular_skyrat/modules/jukebox/code/dance_machine.dm +++ b/modular_skyrat/modules/jukebox/code/dance_machine.dm @@ -459,7 +459,7 @@ update_use_power(IDLE_POWER_USE) STOP_PROCESSING(SSobj, src) dance_over() - playsound(src,'sound/machines/terminal_off.ogg',50,TRUE) + playsound(src,'sound/machines/terminal/terminal_off.ogg',50,TRUE) update_appearance(UPDATE_ICON_STATE) stop = world.time + 100 diff --git a/modular_skyrat/modules/jukebox/code/ravemod.dm b/modular_skyrat/modules/jukebox/code/ravemod.dm index ac64dd6dcde..47ce527810b 100644 --- a/modular_skyrat/modules/jukebox/code/ravemod.dm +++ b/modular_skyrat/modules/jukebox/code/ravemod.dm @@ -58,7 +58,7 @@ mod.wearer.stop_sound_channel(CHANNEL_JUKEBOX) if(deleting) return - SEND_SOUND(mod.wearer, sound('sound/machines/terminal_off.ogg', volume = 50, channel = CHANNEL_JUKEBOX)) + SEND_SOUND(mod.wearer, sound('sound/machines/terminal/terminal_off.ogg', volume = 50, channel = CHANNEL_JUKEBOX)) /obj/item/mod/module/visor/rave/generate_worn_overlay(mutable_appearance/standing) . = ..() diff --git a/modular_skyrat/modules/liquids/code/cleaning/drains.dm b/modular_skyrat/modules/liquids/code/cleaning/drains.dm index 4c98b1931d8..b27a1679d61 100644 --- a/modular_skyrat/modules/liquids/code/cleaning/drains.dm +++ b/modular_skyrat/modules/liquids/code/cleaning/drains.dm @@ -26,7 +26,7 @@ if(!I.tool_start_check(user, amount=0)) return TRUE - playsound(src, 'sound/items/welder2.ogg', 50, TRUE) + playsound(src, 'sound/items/tools/welder2.ogg', 50, TRUE) to_chat(user, span_notice("You start [welded ? "unwelding" : "welding"] [src]...")) if(I.use_tool(src, user, 20)) to_chat(user, span_notice("You [welded ? "unweld" : "weld"] [src].")) diff --git a/modular_skyrat/modules/liquids/code/ocean_flora.dm b/modular_skyrat/modules/liquids/code/ocean_flora.dm index 3cd2af2fa0a..c31ec59c6bf 100644 --- a/modular_skyrat/modules/liquids/code/ocean_flora.dm +++ b/modular_skyrat/modules/liquids/code/ocean_flora.dm @@ -61,7 +61,7 @@ if(!I.tool_start_check(user, amount=0)) return TRUE - playsound(src, 'sound/items/welder2.ogg', 50, TRUE) + playsound(src, 'sound/items/tools/welder2.ogg', 50, TRUE) if(first) to_chat(user, span_notice("You start slicing the [src]...")) if(I.use_tool(src, user, 2 SECONDS)) diff --git a/modular_skyrat/modules/mapping/code/areas/ruins.dm b/modular_skyrat/modules/mapping/code/areas/ruins.dm index 120709108b1..c9c35025747 100644 --- a/modular_skyrat/modules/mapping/code/areas/ruins.dm +++ b/modular_skyrat/modules/mapping/code/areas/ruins.dm @@ -3,17 +3,17 @@ /area/ruin/powered/miningfacility name = "Abandoned Nanotrasen Mining Facility" icon_state = "dk_yellow" - ambientsounds = list('sound/ambience/title3.ogg') //Classic vibes + ambientsounds = list('sound/music/lobby_music/title3.ogg') //Classic vibes /area/ruin/powered/crashedshuttle name = "Crashed Shuttle" icon_state = "dk_yellow" - ambientsounds = list('sound/ambience/ambiodd.ogg') + ambientsounds = list('sound/ambience/misc/ambiodd.ogg') /area/ruin/powered/cozycabin name = "Cozy Cabin" icon_state = "dk_yellow" - ambientsounds = list('sound/ambience/ambicha1.ogg', 'sound/ambience/ambicha2.ogg', 'sound/ambience/ambicha3.ogg') + ambientsounds = list('sound/ambience/holy/ambicha1.ogg', 'sound/ambience/holy/ambicha2.ogg', 'sound/ambience/holy/ambicha3.ogg') /area/ruin/powered/biodome name = "Jungle Biodome" diff --git a/modular_skyrat/modules/mapping/code/tools.dm b/modular_skyrat/modules/mapping/code/tools.dm index f8bada7e2c9..03d786ec93a 100644 --- a/modular_skyrat/modules/mapping/code/tools.dm +++ b/modular_skyrat/modules/mapping/code/tools.dm @@ -39,7 +39,7 @@ icon = 'modular_skyrat/modules/mapping/icons/obj/items/advancedtools.dmi' icon_state = "screwdriver_a" inhand_icon_state = "screwdriver_nuke" - usesound = 'sound/items/pshoom.ogg' + usesound = 'sound/items/pshoom/pshoom.ogg' toolspeed = 0.2 random_color = FALSE greyscale_colors = null @@ -52,7 +52,7 @@ name = "advanced crowbar" desc = "A scientist's almost successful reproduction of an abductor's crowbar, it uses the same technology combined with a handle that can't quite hold it." icon = 'modular_skyrat/modules/mapping/icons/obj/items/advancedtools.dmi' - usesound = 'sound/weapons/sonic_jackhammer.ogg' + usesound = 'sound/items/weapons/sonic_jackhammer.ogg' icon_state = "crowbar" toolspeed = 0.2 diff --git a/modular_skyrat/modules/marines/code/smartgun.dm b/modular_skyrat/modules/marines/code/smartgun.dm index 549e966ad86..0003ef3cac8 100644 --- a/modular_skyrat/modules/marines/code/smartgun.dm +++ b/modular_skyrat/modules/marines/code/smartgun.dm @@ -10,8 +10,8 @@ worn_icon_state = "module_smartgun_off" // just in case. You shouldn't be able to do this, though inhand_icon_state = "smartgun" fire_sound = 'modular_skyrat/modules/modular_weapons/sounds/rifle_heavy.ogg' - rack_sound = 'sound/weapons/gun/l6/l6_rack.ogg' - suppressed_sound = 'sound/weapons/gun/general/heavy_shot_suppressed.ogg' + rack_sound = 'sound/items/weapons/gun/l6/l6_rack.ogg' + suppressed_sound = 'sound/items/weapons/gun/general/heavy_shot_suppressed.ogg' fire_sound_volume = 70 weapon_weight = WEAPON_HEAVY slot_flags = ITEM_SLOT_BACK @@ -60,7 +60,7 @@ return cover_open = !cover_open to_chat(user, span_notice("You [cover_open ? "open" : "close"] [src]'s cover.")) - playsound(src, 'sound/weapons/gun/l6/l6_door.ogg', 60, TRUE) + playsound(src, 'sound/items/weapons/gun/l6/l6_door.ogg', 60, TRUE) update_appearance() return SECONDARY_ATTACK_CANCEL_ATTACK_CHAIN diff --git a/modular_skyrat/modules/medical/code/anesthetic_machine.dm b/modular_skyrat/modules/medical/code/anesthetic_machine.dm index f5c9894b709..9409d1555f0 100644 --- a/modular_skyrat/modules/medical/code/anesthetic_machine.dm +++ b/modular_skyrat/modules/medical/code/anesthetic_machine.dm @@ -229,5 +229,5 @@ /obj/item/anesthetic_machine_kit/attack_self(mob/user) new /obj/machinery/anesthetic_machine(user.loc) - playsound(get_turf(user), 'sound/weapons/circsawhit.ogg', 50, TRUE) + playsound(get_turf(user), 'sound/items/weapons/circsawhit.ogg', 50, TRUE) qdel(src) diff --git a/modular_skyrat/modules/medical/code/trauma_surgery.dm b/modular_skyrat/modules/medical/code/trauma_surgery.dm index 00ca562d094..2b3b9c1b8e1 100644 --- a/modular_skyrat/modules/medical/code/trauma_surgery.dm +++ b/modular_skyrat/modules/medical/code/trauma_surgery.dm @@ -59,7 +59,7 @@ display_pain(target, "Your head goes totally numb for a moment, the pain is overwhelming! You begin to see the light... ") target.cure_all_traumas(TRAUMA_RESILIENCE_MAGIC) - playsound(source = get_turf(target), soundin = 'sound/magic/repulse.ogg', vol = 75, vary = TRUE, falloff_distance = 2) + playsound(source = get_turf(target), soundin = 'sound/effects/magic/repulse.ogg', vol = 75, vary = TRUE, falloff_distance = 2) if(target.mind && target.mind.has_antag_datum(/datum/antagonist/brainwashed)) target.mind.remove_antag_datum(/datum/antagonist/brainwashed) if(prob(75)) diff --git a/modular_skyrat/modules/medical/code/wounds/synth/blunt/secures_internals.dm b/modular_skyrat/modules/medical/code/wounds/synth/blunt/secures_internals.dm index 70a68a488ec..45221067489 100644 --- a/modular_skyrat/modules/medical/code/wounds/synth/blunt/secures_internals.dm +++ b/modular_skyrat/modules/medical/code/wounds/synth/blunt/secures_internals.dm @@ -173,7 +173,7 @@ victim_message = self_message to_chat(victim, victim_message) - playsound(get_turf(crowbarring_item), 'sound/machines/airlock_alien_prying.ogg', 30, TRUE) + playsound(get_turf(crowbarring_item), 'sound/machines/airlock/airlock_alien_prying.ogg', 30, TRUE) if (!crowbarring_item.use_tool(target = victim, user = user, delay = (7 SECONDS * delay_mult), volume = 50, extra_checks = CALLBACK(src, PROC_REF(still_exists)))) return TRUE diff --git a/modular_skyrat/modules/medical/code/wounds/synth/robotic_burns.dm b/modular_skyrat/modules/medical/code/wounds/synth/robotic_burns.dm index cc3643009fc..c41ac8d3d97 100644 --- a/modular_skyrat/modules/medical/code/wounds/synth/robotic_burns.dm +++ b/modular_skyrat/modules/medical/code/wounds/synth/robotic_burns.dm @@ -282,7 +282,7 @@ var/gauze_or_not = (!isnull(gauze) ? ", but [gauze] helps to keep it together" : "") var/clothing_text = (!get_location_accessible(victim, limb.body_zone) ? ", [victim.p_their()] clothing absorbing some of the liquid" : "") victim.visible_message(span_warning("[victim]'s [limb.plaintext_zone] strains from the thermal shock[clothing_text][gauze_or_not]!")) - playsound(victim, 'sound/items/welder.ogg', 25) + playsound(victim, 'sound/items/tools/welder.ogg', 25) var/damage = (((abs(temp_delta) * heat_shock_delta_to_damage_ratio) * gauze_mult) * heat_shock_damage_mult) * heat_adjustment_used limb.receive_damage(brute = damage, wound_bonus = CANT_WOUND) diff --git a/modular_skyrat/modules/microfusion/code/microfusion_cell.dm b/modular_skyrat/modules/microfusion/code/microfusion_cell.dm index 8c797155ad4..9549a6b8000 100644 --- a/modular_skyrat/modules/microfusion/code/microfusion_cell.dm +++ b/modular_skyrat/modules/microfusion/code/microfusion_cell.dm @@ -47,7 +47,7 @@ These are basically advanced cells. /// Do we play an alarm when empty? var/empty_alarm = TRUE /// What sound do we play when empty? - var/empty_alarm_sound = 'sound/weapons/gun/general/empty_alarm.ogg' + var/empty_alarm_sound = 'sound/items/weapons/gun/general/empty_alarm.ogg' /// Do we have the self charging upgrade? var/self_charging = FALSE /// We use this to edit the reload time of the gun @@ -125,7 +125,7 @@ These are basically advanced cells. balloon_alert(user, "no attachments!") return remove_attachments() - playsound(src, 'sound/items/screwdriver.ogg', 70, TRUE) + playsound(src, 'sound/items/tools/screwdriver.ogg', 70, TRUE) balloon_alert(user, "attachments removed") /obj/item/stock_parts/power_store/cell/microfusion/process(seconds_per_tick) diff --git a/modular_skyrat/modules/microfusion/code/microfusion_energy_master.dm b/modular_skyrat/modules/microfusion/code/microfusion_energy_master.dm index 1c502060083..1f627080f9c 100644 --- a/modular_skyrat/modules/microfusion/code/microfusion_energy_master.dm +++ b/modular_skyrat/modules/microfusion/code/microfusion_energy_master.dm @@ -265,7 +265,7 @@ if(!phase_emitter) balloon_alert(user, "no phase emitter!") return - playsound(src, 'sound/items/crowbar.ogg', 70, TRUE) + playsound(src, 'sound/items/tools/crowbar.ogg', 70, TRUE) remove_emitter() /obj/item/gun/microfusion/click_alt(mob/user) @@ -663,7 +663,7 @@ /obj/item/gun/microfusion/proc/remove_attachment(obj/item/microfusion_gun_attachment/microfusion_gun_attachment, mob/living/user) balloon_alert(user, "removed attachment") - playsound(src, 'sound/items/screwdriver.ogg', 70) + playsound(src, 'sound/items/tools/screwdriver.ogg', 70) microfusion_gun_attachment.forceMove(get_turf(src)) attachments -= microfusion_gun_attachment microfusion_gun_attachment.remove_attachment(src) diff --git a/modular_skyrat/modules/microfusion/code/microfusion_gun_attachments.dm b/modular_skyrat/modules/microfusion/code/microfusion_gun_attachments.dm index 0f5379c6548..12c1783963d 100644 --- a/modular_skyrat/modules/microfusion/code/microfusion_gun_attachments.dm +++ b/modular_skyrat/modules/microfusion/code/microfusion_gun_attachments.dm @@ -311,7 +311,7 @@ The gun fires fast heavy lasers but takes a long time to fire. heat_addition = 150 power_usage = 100 delay_to_add = 2.5 SECONDS - new_fire_sound = 'sound/weapons/lasercannonfire.ogg' + new_fire_sound = 'sound/items/weapons/lasercannonfire.ogg' projectile_override = /obj/projectile/beam/laser/microfusion/lance /obj/item/microfusion_gun_attachment/barrel/lance/examine(mob/user) diff --git a/modular_skyrat/modules/microfusion/code/projectiles.dm b/modular_skyrat/modules/microfusion/code/projectiles.dm index 828b0a1f081..abf33c01d5d 100644 --- a/modular_skyrat/modules/microfusion/code/projectiles.dm +++ b/modular_skyrat/modules/microfusion/code/projectiles.dm @@ -25,7 +25,7 @@ damage = 41 damage_type = STAMINA armor_flag = ENERGY - hitsound = 'sound/weapons/tap.ogg' + hitsound = 'sound/items/weapons/tap.ogg' eyeblur = 0 impact_effect_type = /obj/effect/temp_visual/impact_effect/blue_laser light_color = LIGHT_COLOR_BLUE diff --git a/modular_skyrat/modules/mining/boulder.dm b/modular_skyrat/modules/mining/boulder.dm index 0aa52f20974..105057e4f20 100644 --- a/modular_skyrat/modules/mining/boulder.dm +++ b/modular_skyrat/modules/mining/boulder.dm @@ -23,7 +23,7 @@ else process_speed = INATE_BOULDER_SPEED_MULTIPLIER - playsound(src, 'sound/effects/rocktap1.ogg', 50) + playsound(src, 'sound/effects/rock/rocktap1.ogg', 50) if(!continued) to_chat(user, span_notice("You scrape away at \the [src]... speed is [process_speed].")) @@ -43,7 +43,7 @@ if(durability <= 0) convert_to_ore() to_chat(user, span_notice("You finish working on \the [src], and it crumbles into ore.")) - playsound(src, 'sound/effects/rock_break.ogg', 50) + playsound(src, 'sound/effects/rock/rock_break.ogg', 50) user.mind?.adjust_experience(/datum/skill/mining, MINING_SKILL_BOULDER_SIZE_XP * 0.5) qdel(src) return diff --git a/modular_skyrat/modules/modular_implants/code/misc_devices.dm b/modular_skyrat/modules/modular_implants/code/misc_devices.dm index 8f097a34d33..aaea270c488 100644 --- a/modular_skyrat/modules/modular_implants/code/misc_devices.dm +++ b/modular_skyrat/modules/modular_implants/code/misc_devices.dm @@ -157,7 +157,7 @@ user.visible_message(span_notice("[user] upgrades [target_glasses] with [src]."), span_notice("You upgrade [target_glasses] to be NIF HUD compatible.")) target_glasses.name = "\improper HUD-upgraded " + target_glasses.name target_glasses.AddElement(/datum/element/nifsoft_hud) - playsound(target_glasses.loc, 'sound/weapons/circsawhit.ogg', 50, vary = TRUE) + playsound(target_glasses.loc, 'sound/items/weapons/circsawhit.ogg', 50, vary = TRUE) if(!multiple_uses) qdel(src) diff --git a/modular_skyrat/modules/modular_implants/code/nifs.dm b/modular_skyrat/modules/modular_implants/code/nifs.dm index 300c41413cf..5fba0c6a353 100644 --- a/modular_skyrat/modules/modular_implants/code/nifs.dm +++ b/modular_skyrat/modules/modular_implants/code/nifs.dm @@ -131,7 +131,7 @@ if(linked_mob && stored_ckey != insertee.ckey && theft_protection) insertee.audible_message(span_warning("[src] lets out a negative buzz before forcefully removing itself from [insertee]'s brain.")) - playsound(insertee, 'sound/machines/buzz-sigh.ogg', 30, TRUE) + playsound(insertee, 'sound/machines/buzz/buzz-sigh.ogg', 30, TRUE) Remove(insertee) forceMove(get_turf(insertee)) diff --git a/modular_skyrat/modules/modular_implants/code/soulcatcher/attachable_soulcatcher.dm b/modular_skyrat/modules/modular_implants/code/soulcatcher/attachable_soulcatcher.dm index 7840d312dfb..88559605f23 100644 --- a/modular_skyrat/modules/modular_implants/code/soulcatcher/attachable_soulcatcher.dm +++ b/modular_skyrat/modules/modular_implants/code/soulcatcher/attachable_soulcatcher.dm @@ -90,7 +90,7 @@ return ITEM_INTERACT_BLOCKING var/datum/component/carrier/soulcatcher/new_soulcatcher = interacting_with.AddComponent(/datum/component/carrier/soulcatcher/attachable) - playsound(interacting_with.loc, 'sound/weapons/circsawhit.ogg', 50, vary = TRUE) + playsound(interacting_with.loc, 'sound/items/weapons/circsawhit.ogg', 50, vary = TRUE) var/datum/carrier_room/target_room = new_soulcatcher.carrier_rooms[1] var/list/current_mobs = linked_soulcatcher.get_current_mobs() diff --git a/modular_skyrat/modules/modular_implants/code/soulcatcher/handheld_soulcatcher.dm b/modular_skyrat/modules/modular_implants/code/soulcatcher/handheld_soulcatcher.dm index 3ef62e68ac2..7c08663ae36 100644 --- a/modular_skyrat/modules/modular_implants/code/soulcatcher/handheld_soulcatcher.dm +++ b/modular_skyrat/modules/modular_implants/code/soulcatcher/handheld_soulcatcher.dm @@ -63,7 +63,7 @@ if(!target_room) return FALSE - SEND_SOUND(target_ghost, 'sound/misc/notice2.ogg') + SEND_SOUND(target_ghost, 'sound/announcer/notice/notice2.ogg') window_flash(target_ghost.client) if(tgui_alert(target_ghost, "[user] wants to transfer you to [target_room] inside of a soulcatcher, do you accept?", name, list("Yes", "No"), 30 SECONDS, autofocus = FALSE) != "Yes") @@ -86,7 +86,7 @@ if(!target_room) return FALSE - SEND_SOUND(target_mob, 'sound/misc/notice2.ogg') + SEND_SOUND(target_mob, 'sound/announcer/notice/notice2.ogg') window_flash(target_mob.client) if((tgui_alert(target_mob, "Do you wish to enter [target_room]? This will remove you from your body until you leave.", name, list("Yes", "No"), 30 SECONDS, FALSE) != "Yes") || (tgui_alert(target_mob, "Are you sure about this?", name, list("Yes", "No"), 30 SECONDS, FALSE) != "Yes")) diff --git a/modular_skyrat/modules/modular_items/code/summon_beacon.dm b/modular_skyrat/modules/modular_items/code/summon_beacon.dm index 9ca0d8a7a01..340053e92f4 100644 --- a/modular_skyrat/modules/modular_items/code/summon_beacon.dm +++ b/modular_skyrat/modules/modular_items/code/summon_beacon.dm @@ -47,7 +47,7 @@ if(user.can_perform_action(src, FORBID_TELEKINESIS_REACH)) return TRUE else - playsound(src, 'sound/machines/buzz-sigh.ogg', 40, TRUE) + playsound(src, 'sound/machines/buzz/buzz-sigh.ogg', 40, TRUE) return FALSE /obj/item/summon_beacon/proc/generate_display_names() diff --git a/modular_skyrat/modules/modular_items/lewd_items/code/lewd_clothing/bdsm_mask.dm b/modular_skyrat/modules/modular_items/lewd_items/code/lewd_clothing/bdsm_mask.dm index 88de03410c5..2fe1b887927 100644 --- a/modular_skyrat/modules/modular_items/lewd_items/code/lewd_clothing/bdsm_mask.dm +++ b/modular_skyrat/modules/modular_items/lewd_items/code/lewd_clothing/bdsm_mask.dm @@ -261,7 +261,7 @@ /obj/item/clothing/mask/gas/bdsm_mask/proc/toggle(mob/living/carbon/user) mask_on = !mask_on to_chat(user, span_notice("You turn the air filter [mask_on ? "on. Use with caution!" : "off. Now it's safe to wear."]")) - conditional_pref_sound(user, mask_on ? 'sound/weapons/magin.ogg' : 'sound/weapons/magout.ogg', 40, TRUE) + conditional_pref_sound(user, mask_on ? 'sound/items/weapons/magin.ogg' : 'sound/items/weapons/magout.ogg', 40, TRUE) update_icon_state() update_mob_action_buttonss() update_icon() diff --git a/modular_skyrat/modules/modular_items/lewd_items/code/lewd_clothing/deprivation_helmet.dm b/modular_skyrat/modules/modular_items/lewd_items/code/lewd_clothing/deprivation_helmet.dm index 01a9c5c153f..d834543149c 100644 --- a/modular_skyrat/modules/modular_items/lewd_items/code/lewd_clothing/deprivation_helmet.dm +++ b/modular_skyrat/modules/modular_items/lewd_items/code/lewd_clothing/deprivation_helmet.dm @@ -76,14 +76,14 @@ if(user_client == "speech") if(muzzle == TRUE) muzzle = FALSE - conditional_pref_sound(usr, 'sound/weapons/magout.ogg', 40, TRUE) + conditional_pref_sound(usr, 'sound/items/weapons/magout.ogg', 40, TRUE) to_chat(usr, span_notice("Speech switch off")) if(usr.get_item_by_slot(ITEM_SLOT_HEAD) == src) REMOVE_TRAIT(usr, TRAIT_MUTE, CLOTHING_TRAIT) //to_chat(U, span_purple("Your mouth is free. you breathe out with relief.")) else muzzle = TRUE - conditional_pref_sound(usr, 'sound/weapons/magin.ogg', 40, TRUE) + conditional_pref_sound(usr, 'sound/items/weapons/magin.ogg', 40, TRUE) to_chat(usr, span_notice("Speech switch on")) if(usr.get_item_by_slot(ITEM_SLOT_HEAD) == src) ADD_TRAIT(usr, TRAIT_MUTE, CLOTHING_TRAIT) @@ -91,14 +91,14 @@ if(user_client == "hearing") if(earmuffs == TRUE) earmuffs = FALSE - conditional_pref_sound(usr, 'sound/weapons/magout.ogg', 40, TRUE) + conditional_pref_sound(usr, 'sound/items/weapons/magout.ogg', 40, TRUE) to_chat(usr, span_notice("Hearing switch off")) if(usr.get_item_by_slot(ITEM_SLOT_HEAD) == src) REMOVE_TRAIT(usr, TRAIT_DEAF, CLOTHING_TRAIT) //to_chat(U, span_purple("Finally you can hear the world around again.")) else earmuffs = TRUE - conditional_pref_sound(usr, 'sound/weapons/magin.ogg', 40, TRUE) + conditional_pref_sound(usr, 'sound/items/weapons/magin.ogg', 40, TRUE) to_chat(usr, span_notice("Hearing switch on")) if(usr.get_item_by_slot(ITEM_SLOT_HEAD) == src) ADD_TRAIT(usr, TRAIT_DEAF, CLOTHING_TRAIT) @@ -107,14 +107,14 @@ var/mob/living/carbon/human/user = usr if(prevent_vision == TRUE) prevent_vision = FALSE - conditional_pref_sound(usr, 'sound/weapons/magout.ogg', 40, TRUE) + conditional_pref_sound(usr, 'sound/items/weapons/magout.ogg', 40, TRUE) to_chat(usr, span_notice("Vision switch off")) if(usr.get_item_by_slot(ITEM_SLOT_HEAD) == src) user.cure_blind("deprivation_helmet_[REF(src)]") //to_chat(U, span_purple("Helmet no longer restricts your vision.")) else prevent_vision = TRUE - conditional_pref_sound(usr, 'sound/weapons/magin.ogg', 40, TRUE) + conditional_pref_sound(usr, 'sound/items/weapons/magin.ogg', 40, TRUE) to_chat(usr, span_notice("Vision switch on")) if(usr.get_item_by_slot(ITEM_SLOT_HEAD) == src) user.become_blind("deprivation_helmet_[REF(src)]") diff --git a/modular_skyrat/modules/modular_items/lewd_items/code/lewd_items/attachable_vibrator.dm b/modular_skyrat/modules/modular_items/lewd_items/code/lewd_items/attachable_vibrator.dm index 40e2606fedc..33c1271e08d 100644 --- a/modular_skyrat/modules/modular_items/lewd_items/code/lewd_items/attachable_vibrator.dm +++ b/modular_skyrat/modules/modular_items/lewd_items/code/lewd_items/attachable_vibrator.dm @@ -101,22 +101,22 @@ if(EGGVIB_OFF) vibration_mode = EGGVIB_LOW toy_on = TRUE - conditional_pref_sound(loc, 'sound/weapons/magin.ogg', 20, TRUE) + conditional_pref_sound(loc, 'sound/items/weapons/magin.ogg', 20, TRUE) soundloop1.start() if(EGGVIB_LOW) vibration_mode = EGGVIB_MEDIUM - conditional_pref_sound(loc, 'sound/weapons/magin.ogg', 20, TRUE) + conditional_pref_sound(loc, 'sound/items/weapons/magin.ogg', 20, TRUE) soundloop1.stop() soundloop2.start() if(EGGVIB_MEDIUM) vibration_mode = EGGVIB_HIGH - conditional_pref_sound(loc, 'sound/weapons/magin.ogg', 20, TRUE) + conditional_pref_sound(loc, 'sound/items/weapons/magin.ogg', 20, TRUE) soundloop2.stop() soundloop3.start() if(EGGVIB_HIGH) vibration_mode = EGGVIB_OFF toy_on = FALSE - conditional_pref_sound(loc, 'sound/weapons/magout.ogg', 20, TRUE) + conditional_pref_sound(loc, 'sound/items/weapons/magout.ogg', 20, TRUE) soundloop3.stop() /obj/item/clothing/sextoy/eggvib/lewd_equipped(mob/living/carbon/human/user, slot, initial) @@ -335,13 +335,13 @@ switch(vibration_mode) if(EGGVIB_LOW) vibration_mode = EGGVIB_MEDIUM - conditional_pref_sound(loc, 'sound/weapons/magin.ogg', 20, TRUE) + conditional_pref_sound(loc, 'sound/items/weapons/magin.ogg', 20, TRUE) if(EGGVIB_MEDIUM) vibration_mode = EGGVIB_HIGH - conditional_pref_sound(loc, 'sound/weapons/magin.ogg', 20, TRUE) + conditional_pref_sound(loc, 'sound/items/weapons/magin.ogg', 20, TRUE) if(EGGVIB_HIGH) vibration_mode = EGGVIB_LOW - conditional_pref_sound(loc, 'sound/weapons/magin.ogg', 20, TRUE) + conditional_pref_sound(loc, 'sound/items/weapons/magin.ogg', 20, TRUE) #undef EGGVIB_OFF #undef EGGVIB_LOW diff --git a/modular_skyrat/modules/modular_items/lewd_items/code/lewd_items/condom.dm b/modular_skyrat/modules/modular_items/lewd_items/code/lewd_items/condom.dm index a5b2c429c2d..80499fad288 100644 --- a/modular_skyrat/modules/modular_items/lewd_items/code/lewd_items/condom.dm +++ b/modular_skyrat/modules/modular_items/lewd_items/code/lewd_items/condom.dm @@ -31,7 +31,7 @@ to_chat(user, span_notice("You start to open the condom pack...")) if(!do_after(user, 1.5 SECONDS, target = user)) return - conditional_pref_sound(src.loc, 'sound/items/poster_ripped.ogg', 50, TRUE) + conditional_pref_sound(src.loc, 'sound/items/poster/poster_ripped.ogg', 50, TRUE) var/obj/item/clothing/sextoy/condom/removed_condom = new /obj/item/clothing/sextoy/condom user.put_in_hands(removed_condom) diff --git a/modular_skyrat/modules/modular_items/lewd_items/code/lewd_items/kinky_shocker.dm b/modular_skyrat/modules/modular_items/lewd_items/code/lewd_items/kinky_shocker.dm index 53022701c90..4a44cc8edc7 100644 --- a/modular_skyrat/modules/modular_items/lewd_items/code/lewd_items/kinky_shocker.dm +++ b/modular_skyrat/modules/modular_items/lewd_items/code/lewd_items/kinky_shocker.dm @@ -91,7 +91,7 @@ if(cell && cell.charge >= cell_hit_cost) shocker_on = !shocker_on to_chat(user, span_notice("You turn the shocker [shocker_on? "on. Buzz!" : "off."]")) - conditional_pref_sound(user, shocker_on ? 'sound/weapons/magin.ogg' : 'sound/weapons/magout.ogg', 40, TRUE) + conditional_pref_sound(user, shocker_on ? 'sound/items/weapons/magin.ogg' : 'sound/items/weapons/magout.ogg', 40, TRUE) else shocker_on = FALSE if(!cell) @@ -224,7 +224,7 @@ return user.visible_message(span_purple("[user] [message]!")) - conditional_pref_sound(loc, 'sound/weapons/taserhit.ogg', 70, 1, -1) + conditional_pref_sound(loc, 'sound/items/weapons/taserhit.ogg', 70, 1, -1) deductcharge(cell_hit_cost) if(prob(80)) target.try_lewd_autoemote(pick("twitch", "twitch_s", "shiver", "scream")) diff --git a/modular_skyrat/modules/modular_items/lewd_items/code/lewd_items/leather_whip.dm b/modular_skyrat/modules/modular_items/lewd_items/code/lewd_items/leather_whip.dm index 9bf04145e0b..c586262d2ee 100644 --- a/modular_skyrat/modules/modular_items/lewd_items/code/lewd_items/leather_whip.dm +++ b/modular_skyrat/modules/modular_items/lewd_items/code/lewd_items/leather_whip.dm @@ -11,7 +11,7 @@ worn_icon = 'modular_skyrat/modules/modular_items/lewd_items/icons/mob/lewd_clothing/lewd_masks.dmi' worn_icon_muzzled = 'modular_skyrat/master_files/icons/mob/clothing/mask_muzzled.dmi' w_class = WEIGHT_CLASS_NORMAL - hitsound = 'sound/weapons/whip.ogg' + hitsound = 'sound/items/weapons/whip.ogg' clothing_flags = INEDIBLE_CLOTHING //When taking that thing in mouth flags_cover = MASKCOVERSMOUTH @@ -196,7 +196,7 @@ target.apply_status_effect(/datum/status_effect/subspace) target.Paralyze(1)//don't touch it. It's domination tool, it should have ability to put someone on kneels. I already inserted check for PREF YOU CAN'T ABUSE THIS ITEM target.adjust_pain(5) - conditional_pref_sound(loc, 'sound/weapons/whip.ogg', 100) + conditional_pref_sound(loc, 'sound/items/weapons/whip.ogg', 100) else message = (user == target) ? pick("knocks [target.p_them()]self down with [src]", "gently uses [src] to knock [target.p_them()]self on the ground") \ @@ -208,7 +208,7 @@ target.apply_status_effect(/datum/status_effect/subspace) target.Paralyze(1) target.adjust_pain(3) - conditional_pref_sound(loc, 'sound/weapons/whip.ogg', 60) + conditional_pref_sound(loc, 'sound/items/weapons/whip.ogg', 60) if(BODY_ZONE_HEAD) message = (user == target) ? pick("wraps [src] around [target.p_their()] neck, choking [target.p_them()]self", @@ -239,7 +239,7 @@ target.apply_status_effect(/datum/status_effect/spanked) if(HAS_TRAIT(target, TRAIT_MASOCHISM) || HAS_TRAIT(target, TRAIT_BIMBO)) target.add_mood_event("pervert spanked", /datum/mood_event/perv_spanked) - conditional_pref_sound(loc, 'sound/weapons/whip.ogg', 60) + conditional_pref_sound(loc, 'sound/items/weapons/whip.ogg', 60) else message = (user == target) ? pick("roughly flogs [target.p_them()]self with [src]", @@ -256,7 +256,7 @@ target.apply_status_effect(/datum/status_effect/spanked) if(HAS_TRAIT(target, TRAIT_MASOCHISM) || HAS_TRAIT(target, TRAIT_BIMBO)) target.add_mood_event("pervert spanked", /datum/mood_event/perv_spanked) - conditional_pref_sound(loc, 'sound/weapons/whip.ogg', 100) + conditional_pref_sound(loc, 'sound/items/weapons/whip.ogg', 100) else if(current_whip_type == "hard") message = (user == target) ? pick("disciplines [target.p_them()]self with [src]", @@ -268,7 +268,7 @@ target.apply_status_effect(/datum/status_effect/subspace) target.do_jitter_animation() target.adjust_pain(7) - conditional_pref_sound(loc, 'sound/weapons/whip.ogg', 100) + conditional_pref_sound(loc, 'sound/items/weapons/whip.ogg', 100) else message = (user == target) ? pick("whips [target.p_them()]self with [src]", @@ -283,7 +283,7 @@ target.do_jitter_animation() target.adjust_pain(4) carbon_target?.adjust_arousal(5) - conditional_pref_sound(loc, 'sound/weapons/whip.ogg', 60) + conditional_pref_sound(loc, 'sound/items/weapons/whip.ogg', 60) user.visible_message(span_purple("[user] [message]!")) diff --git a/modular_skyrat/modules/modular_items/lewd_items/code/lewd_items/magic_wand.dm b/modular_skyrat/modules/modular_items/lewd_items/code/lewd_items/magic_wand.dm index 6d3e3193b1b..52b7891ae03 100644 --- a/modular_skyrat/modules/modular_items/lewd_items/code/lewd_items/magic_wand.dm +++ b/modular_skyrat/modules/modular_items/lewd_items/code/lewd_items/magic_wand.dm @@ -214,7 +214,7 @@ /// Toggle between toy modes in a specific order /obj/item/clothing/sextoy/magic_wand/proc/toggle_mode() if(vibration_mode != "high") - conditional_pref_sound(loc, 'sound/weapons/magin.ogg', 20, TRUE) + conditional_pref_sound(loc, 'sound/items/weapons/magin.ogg', 20, TRUE) switch(vibration_mode) if("off") @@ -232,7 +232,7 @@ vibration_mode = MAGIC_WAND_MODE_HIGH if("high") - conditional_pref_sound(loc, 'sound/weapons/magout.ogg', 20, TRUE) + conditional_pref_sound(loc, 'sound/items/weapons/magout.ogg', 20, TRUE) soundloop3.stop() vibration_mode = MAGIC_WAND_MODE_OFF diff --git a/modular_skyrat/modules/modular_items/lewd_items/code/lewd_items/vibrator.dm b/modular_skyrat/modules/modular_items/lewd_items/code/lewd_items/vibrator.dm index 6d9505f6d1e..974f2130b41 100644 --- a/modular_skyrat/modules/modular_items/lewd_items/code/lewd_items/vibrator.dm +++ b/modular_skyrat/modules/modular_items/lewd_items/code/lewd_items/vibrator.dm @@ -208,22 +208,22 @@ if(VIB_OFF) vibration_mode = VIB_LOW toy_on = TRUE - conditional_pref_sound(loc, 'sound/weapons/magin.ogg', 20, TRUE) + conditional_pref_sound(loc, 'sound/items/weapons/magin.ogg', 20, TRUE) soundloop1.start() if(VIB_LOW) vibration_mode = VIB_MEDIUM - conditional_pref_sound(loc, 'sound/weapons/magin.ogg', 20, TRUE) + conditional_pref_sound(loc, 'sound/items/weapons/magin.ogg', 20, TRUE) soundloop1.stop() soundloop2.start() if(VIB_MEDIUM) vibration_mode = VIB_HIGH - conditional_pref_sound(loc, 'sound/weapons/magin.ogg', 20, TRUE) + conditional_pref_sound(loc, 'sound/items/weapons/magin.ogg', 20, TRUE) soundloop2.stop() soundloop3.start() if(VIB_HIGH) vibration_mode = VIB_OFF toy_on = FALSE - conditional_pref_sound(loc, 'sound/weapons/magout.ogg', 20, TRUE) + conditional_pref_sound(loc, 'sound/items/weapons/magout.ogg', 20, TRUE) soundloop3.stop() #undef DEFAULT_AROUSAL_INCREASE diff --git a/modular_skyrat/modules/modular_items/lewd_items/code/lewd_items/vibroring.dm b/modular_skyrat/modules/modular_items/lewd_items/code/lewd_items/vibroring.dm index e9165a58a31..269d1087842 100644 --- a/modular_skyrat/modules/modular_items/lewd_items/code/lewd_items/vibroring.dm +++ b/modular_skyrat/modules/modular_items/lewd_items/code/lewd_items/vibroring.dm @@ -21,7 +21,7 @@ /obj/item/clothing/sextoy/vibroring/attack_self(mob/user) toy_on = !toy_on to_chat(user, span_notice("You turn the vibroring [toy_on ? "on. Brrrr..." : "off."]")) - conditional_pref_sound(user, toy_on ? 'sound/weapons/magin.ogg' : 'sound/weapons/magout.ogg', 40, TRUE) + conditional_pref_sound(user, toy_on ? 'sound/items/weapons/magin.ogg' : 'sound/items/weapons/magout.ogg', 40, TRUE) update_icon_state() update_icon() switch(toy_on) diff --git a/modular_skyrat/modules/modular_items/lewd_items/code/lewd_structures/bdsm_furniture.dm b/modular_skyrat/modules/modular_items/lewd_items/code/lewd_structures/bdsm_furniture.dm index 80980aa9bb8..626b636b894 100644 --- a/modular_skyrat/modules/modular_items/lewd_items/code/lewd_structures/bdsm_furniture.dm +++ b/modular_skyrat/modules/modular_items/lewd_items/code/lewd_structures/bdsm_furniture.dm @@ -236,7 +236,7 @@ add_fingerprint(user) update_icon_state() update_icon() - conditional_pref_sound(loc, 'sound/weapons/magin.ogg', 20, TRUE) + conditional_pref_sound(loc, 'sound/items/weapons/magin.ogg', 20, TRUE) //Place the mob in the desired position after buckling /obj/structure/chair/x_stand/post_buckle_mob(mob/living/affected_mob) diff --git a/modular_skyrat/modules/modular_items/lewd_items/code/lewd_structures/dancing_pole.dm b/modular_skyrat/modules/modular_items/lewd_items/code/lewd_structures/dancing_pole.dm index 7344adb32b6..0bae50c8d8d 100644 --- a/modular_skyrat/modules/modular_items/lewd_items/code/lewd_structures/dancing_pole.dm +++ b/modular_skyrat/modules/modular_items/lewd_items/code/lewd_structures/dancing_pole.dm @@ -65,7 +65,7 @@ /obj/structure/stripper_pole/click_alt(mob/user) lights_enabled = !lights_enabled balloon_alert(user, "lights [lights_enabled ? "on" : "off"]") - playsound(user, lights_enabled ? 'sound/weapons/magin.ogg' : 'sound/weapons/magout.ogg', 40, TRUE) + playsound(user, lights_enabled ? 'sound/items/weapons/magin.ogg' : 'sound/items/weapons/magout.ogg', 40, TRUE) update_icon_state() update_icon() update_brightness() diff --git a/modular_skyrat/modules/modular_weapons/code/company_and_or_faction_based/nanotrasen_system_inc/pistol.dm b/modular_skyrat/modules/modular_weapons/code/company_and_or_faction_based/nanotrasen_system_inc/pistol.dm index 0250fac0985..b111c832a16 100644 --- a/modular_skyrat/modules/modular_weapons/code/company_and_or_faction_based/nanotrasen_system_inc/pistol.dm +++ b/modular_skyrat/modules/modular_weapons/code/company_and_or_faction_based/nanotrasen_system_inc/pistol.dm @@ -21,10 +21,10 @@ icon_state = "black" w_class = WEIGHT_CLASS_NORMAL spread = 10 - fire_sound = 'sound/weapons/gun/pistol/shot_alt.ogg' - rack_sound = 'sound/weapons/gun/pistol/rack.ogg' - lock_back_sound = 'sound/weapons/gun/pistol/slide_lock.ogg' - bolt_drop_sound = 'sound/weapons/gun/pistol/slide_drop.ogg' + fire_sound = 'sound/items/weapons/gun/pistol/shot_alt.ogg' + rack_sound = 'sound/items/weapons/gun/pistol/rack.ogg' + lock_back_sound = 'sound/items/weapons/gun/pistol/slide_lock.ogg' + bolt_drop_sound = 'sound/items/weapons/gun/pistol/slide_drop.ogg' pin = /obj/item/firing_pin spawn_magazine_type = /obj/item/ammo_box/magazine/m9mm/rubber suppressor_x_offset = -2 @@ -82,10 +82,10 @@ icon_state = "firefly" w_class = WEIGHT_CLASS_NORMAL spread = 10 - fire_sound = 'sound/weapons/gun/pistol/shot_alt.ogg' - rack_sound = 'sound/weapons/gun/pistol/rack.ogg' - lock_back_sound = 'sound/weapons/gun/pistol/slide_lock.ogg' - bolt_drop_sound = 'sound/weapons/gun/pistol/slide_drop.ogg' + fire_sound = 'sound/items/weapons/gun/pistol/shot_alt.ogg' + rack_sound = 'sound/items/weapons/gun/pistol/rack.ogg' + lock_back_sound = 'sound/items/weapons/gun/pistol/slide_lock.ogg' + bolt_drop_sound = 'sound/items/weapons/gun/pistol/slide_drop.ogg' pin = /obj/item/firing_pin spawn_magazine_type = /obj/item/ammo_box/magazine/firefly accepted_magazine_type = /obj/item/ammo_box/magazine/firefly diff --git a/modular_skyrat/modules/modular_weapons/code/company_and_or_faction_based/romulus_technology/rifle.dm b/modular_skyrat/modules/modular_weapons/code/company_and_or_faction_based/romulus_technology/rifle.dm index b61c915bf6b..744bbdfd092 100644 --- a/modular_skyrat/modules/modular_weapons/code/company_and_or_faction_based/romulus_technology/rifle.dm +++ b/modular_skyrat/modules/modular_weapons/code/company_and_or_faction_based/romulus_technology/rifle.dm @@ -83,8 +83,8 @@ fire_sound = 'modular_skyrat/modules/modular_weapons/sounds/rifle_heavy.ogg' suppressed_sound = 'modular_skyrat/modules/modular_weapons/sounds/suppressed_rifle.ogg' fire_sound_volume = 90 - load_sound = 'sound/weapons/gun/sniper/mag_insert.ogg' - rack_sound = 'sound/weapons/gun/sniper/rack.ogg' + load_sound = 'sound/items/weapons/gun/sniper/mag_insert.ogg' + rack_sound = 'sound/items/weapons/gun/sniper/rack.ogg' recoil = 2 accepted_magazine_type = /obj/item/ammo_box/magazine/c40sol_rifle spawn_magazine_type = /obj/item/ammo_box/magazine/c40sol_rifle @@ -149,7 +149,7 @@ accepted_magazine_type = /obj/item/ammo_box/magazine/caflechette spawn_magazine_type = /obj/item/ammo_box/magazine/caflechette - var/folding_sound = 'sound/weapons/batonextend.ogg' + var/folding_sound = 'sound/items/weapons/batonextend.ogg' /// is our stock collapsed? var/folded = FALSE /// how long does it take to extend/collapse the stock diff --git a/modular_skyrat/modules/modular_weapons/code/company_and_or_faction_based/saibasan/laser_guns.dm b/modular_skyrat/modules/modular_weapons/code/company_and_or_faction_based/saibasan/laser_guns.dm index 9c6e16f7015..d97a90bcbf4 100644 --- a/modular_skyrat/modules/modular_weapons/code/company_and_or_faction_based/saibasan/laser_guns.dm +++ b/modular_skyrat/modules/modular_weapons/code/company_and_or_faction_based/saibasan/laser_guns.dm @@ -195,7 +195,7 @@ if(!ignores_cooldown && !COOLDOWN_FINISHED(src, last_speech)) return say(pick_list_replacements(speech_json_file, json_string)) - playsound(src, 'sound/creatures/tourist/tourist_talk.ogg', 15, TRUE, SHORT_RANGE_SOUND_EXTRARANGE, frequency = rand(2, 2.2)) + playsound(src, 'sound/mobs/non-humanoids/tourist/tourist_talk.ogg', 15, TRUE, SHORT_RANGE_SOUND_EXTRARANGE, frequency = rand(2, 2.2)) Shake(2, 2, 1 SECONDS) COOLDOWN_START(src, last_speech, MOD_LASER_SPEECH_COOLDOWN) @@ -233,7 +233,7 @@ /obj/item/gun/energy/modular_laser_rifle/ui_action_click(mob/user, actiontype) if(!istype(actiontype, /datum/action/item_action/toggle_personality)) return ..() - playsound(src, 'sound/machines/beep.ogg', 30, TRUE) + playsound(src, 'sound/machines/beep/beep.ogg', 30, TRUE) personality_mode = !personality_mode speak_up("[personality_mode ? "pickup" : "putdown"]", ignores_personality_toggle = TRUE) return ..() diff --git a/modular_skyrat/modules/modular_weapons/code/company_and_or_faction_based/saibasan/mode_datums.dm b/modular_skyrat/modules/modular_weapons/code/company_and_or_faction_based/saibasan/mode_datums.dm index a1c0489b867..0b567e27bc9 100644 --- a/modular_skyrat/modules/modular_weapons/code/company_and_or_faction_based/saibasan/mode_datums.dm +++ b/modular_skyrat/modules/modular_weapons/code/company_and_or_faction_based/saibasan/mode_datums.dm @@ -145,7 +145,7 @@ applied_gun.disabled_for_other_reasons = TRUE applied_gun.attack_verb_continuous = list("slashes", "cuts") applied_gun.attack_verb_simple = list("slash", "cut") - applied_gun.hitsound = 'sound/weapons/rapierhit.ogg' + applied_gun.hitsound = 'sound/items/weapons/rapierhit.ogg' /datum/laser_weapon_mode/sword/remove_from_weapon(obj/item/gun/energy/modular_laser_rifle/applied_gun) playsound(src, 'sound/items/sheath.ogg', 25, TRUE) diff --git a/modular_skyrat/modules/modular_weapons/code/pepperball_gun.dm b/modular_skyrat/modules/modular_weapons/code/pepperball_gun.dm index db8efb6da16..14c1061742a 100644 --- a/modular_skyrat/modules/modular_weapons/code/pepperball_gun.dm +++ b/modular_skyrat/modules/modular_weapons/code/pepperball_gun.dm @@ -7,9 +7,9 @@ accepted_magazine_type = /obj/item/ammo_box/magazine/pepperball can_suppress = FALSE fire_sound = 'sound/effects/pop_expl.ogg' - rack_sound = 'sound/weapons/gun/pistol/rack.ogg' - lock_back_sound = 'sound/weapons/gun/pistol/slide_lock.ogg' - bolt_drop_sound = 'sound/weapons/gun/pistol/slide_drop.ogg' + rack_sound = 'sound/items/weapons/gun/pistol/rack.ogg' + lock_back_sound = 'sound/items/weapons/gun/pistol/slide_lock.ogg' + bolt_drop_sound = 'sound/items/weapons/gun/pistol/slide_drop.ogg' fire_sound_volume = 50 /obj/item/gun/ballistic/automatic/pistol/pepperball/give_manufacturer_examine() diff --git a/modular_skyrat/modules/mold/code/mold_controller.dm b/modular_skyrat/modules/mold/code/mold_controller.dm index 8a9ed323827..bb4b793c65b 100644 --- a/modular_skyrat/modules/mold/code/mold_controller.dm +++ b/modular_skyrat/modules/mold/code/mold_controller.dm @@ -159,7 +159,7 @@ for(var/obj/O in open_turf) if(istype(O, /obj/machinery/door/airlock) || istype(O, /obj/machinery/door/firedoor) || istype(O, /obj/machinery/door/window) || istype(O, /obj/structure/door_assembly) || istype(O, /obj/machinery/door/window)) spreaded_resin.do_attack_animation(O, ATTACK_EFFECT_PUNCH) - playsound(O, 'sound/effects/attackblob.ogg', 50, TRUE) + playsound(O, 'sound/effects/blob/attackblob.ogg', 50, TRUE) O.take_damage(40, BRUTE, MELEE, 1, get_dir(O, spreaded_resin)) . = RESIN_ATTACKED_DOOR break diff --git a/modular_skyrat/modules/mold/code/mold_mobs.dm b/modular_skyrat/modules/mold/code/mold_mobs.dm index 56e780a7466..769874b3a77 100644 --- a/modular_skyrat/modules/mold/code/mold_mobs.dm +++ b/modular_skyrat/modules/mold/code/mold_mobs.dm @@ -42,7 +42,7 @@ melee_damage_lower = 5 //BUBBERSTATION CHANGE melee_damage_upper = 10 //BUBBERSTATION CHANGE obj_damage = 40 - attack_sound = 'sound/effects/attackblob.ogg' + attack_sound = 'sound/effects/blob/attackblob.ogg' basic_mob_flags = DEL_ON_DEATH gold_core_spawnable = HOSTILE_SPAWN @@ -121,7 +121,7 @@ melee_damage_lower = 7 melee_damage_upper = 13 obj_damage = 30 - attack_sound = 'sound/weapons/bite.ogg' + attack_sound = 'sound/items/weapons/bite.ogg' attack_verb_continuous = "bites" attack_verb_simple = "bite" @@ -188,7 +188,7 @@ obj_damage = 20 attack_verb_continuous = "stings" attack_verb_simple = "sting" - attack_sound = 'sound/effects/attackblob.ogg' + attack_sound = 'sound/effects/blob/attackblob.ogg' basic_mob_flags = DEL_ON_DEATH ai_controller = /datum/ai_controller/basic_controller/electric_mosquito diff --git a/modular_skyrat/modules/mold/code/mold_structures.dm b/modular_skyrat/modules/mold/code/mold_structures.dm index f16bfc948f0..334ec6ce777 100644 --- a/modular_skyrat/modules/mold/code/mold_structures.dm +++ b/modular_skyrat/modules/mold/code/mold_structures.dm @@ -20,9 +20,9 @@ /obj/structure/mold/play_attack_sound(damage_amount, damage_type = BRUTE, damage_flag = 0) switch(damage_type) if(BRUTE) - playsound(loc, 'sound/effects/attackblob.ogg', 100, TRUE) + playsound(loc, 'sound/effects/blob/attackblob.ogg', 100, TRUE) if(BURN) - playsound(loc, 'sound/items/welder.ogg', 100, TRUE) + playsound(loc, 'sound/items/tools/welder.ogg', 100, TRUE) /obj/structure/mold/Initialize(mapload, passed_type) . = ..() diff --git a/modular_skyrat/modules/moretraitoritems/code/autosurgeon_bodypart.dm b/modular_skyrat/modules/moretraitoritems/code/autosurgeon_bodypart.dm index f4e79cf1a87..0f015937385 100644 --- a/modular_skyrat/modules/moretraitoritems/code/autosurgeon_bodypart.dm +++ b/modular_skyrat/modules/moretraitoritems/code/autosurgeon_bodypart.dm @@ -42,7 +42,7 @@ to_chat(H, span_warning("The [src] fails to attach [storedbodypart]!")) return - playsound(get_turf(H), 'sound/weapons/circsawhit.ogg', 50, TRUE) + playsound(get_turf(H), 'sound/items/weapons/circsawhit.ogg', 50, TRUE) storedbodypart = null name = initial(name) if(uses != INFINITE) diff --git a/modular_skyrat/modules/mounted_machine_gun/code/mounted_machine_gun.dm b/modular_skyrat/modules/mounted_machine_gun/code/mounted_machine_gun.dm index c795dadbd97..e6d036d52e9 100644 --- a/modular_skyrat/modules/mounted_machine_gun/code/mounted_machine_gun.dm +++ b/modular_skyrat/modules/mounted_machine_gun/code/mounted_machine_gun.dm @@ -140,7 +140,7 @@ //BUCKLE HOOKS /obj/machinery/mounted_machine_gun/unbuckle_mob(mob/living/buckled_mob, force = FALSE, can_fall = TRUE) - playsound(src,'sound/mecha/mechmove01.ogg', 50, TRUE) + playsound(src,'sound/vehicles/mecha/mechmove01.ogg', 50, TRUE) for(var/obj/item/iterating_item in buckled_mob.held_items) if(istype(iterating_item, /obj/item/gun_control)) qdel(iterating_item) @@ -166,7 +166,7 @@ layer = ABOVE_MOB_LAYER plane = ABOVE_GAME_PLANE setDir(SOUTH) - playsound(src,'sound/mecha/mechmove01.ogg', 50, TRUE) + playsound(src,'sound/vehicles/mecha/mechmove01.ogg', 50, TRUE) set_anchored(TRUE) update_positioning() @@ -362,7 +362,7 @@ balloon_alert_to_viewers("barrel heatlocked!") fire_result = FALSE if(!fire_result) - playsound(src, 'sound/weapons/gun/general/dry_fire.ogg', 50, TRUE) + playsound(src, 'sound/items/weapons/gun/general/dry_fire.ogg', 50, TRUE) if(!bolt && fire_result) cock_bolt() return fire_result diff --git a/modular_skyrat/modules/mutants/code/mutant_component.dm b/modular_skyrat/modules/mutants/code/mutant_component.dm index d1a71caf9cf..60e6e5a5d3e 100644 --- a/modular_skyrat/modules/mutants/code/mutant_component.dm +++ b/modular_skyrat/modules/mutants/code/mutant_component.dm @@ -138,7 +138,7 @@ host.do_jitter_animation(30) host.visible_message(span_danger("[host] suddenly convulses, as [host.p_they()][stand_up ? " stagger to [host.p_their()] feet and" : ""] gain a ravenous hunger in [host.p_their()] eyes!"), span_alien("You HUNGER!")) - playsound(host.loc, 'sound/hallucinations/far_noise.ogg', 50, TRUE) + playsound(host.loc, 'sound/effects/hallucinations/far_noise.ogg', 50, TRUE) if(is_species(host, /datum/species/mutant/infectious/fast)) to_chat(host, span_redtext("You are a FAST zombie. You run fast and hit more quickly, beware however, you are much weaker and susceptible to damage.")) else @@ -164,7 +164,7 @@ host.grab_ghost() to_chat(host, span_notice("You feel an itching, both inside and \ outside as your tissues knit and reknit.")) - playsound(host, 'sound/magic/demon_consume.ogg', 50, TRUE) + playsound(host, 'sound/effects/magic/demon_consume.ogg', 50, TRUE) host.revive(TRUE, TRUE) /datum/component/mutant_infection/proc/create_glow() diff --git a/modular_skyrat/modules/mutants/code/mutant_cure.dm b/modular_skyrat/modules/mutants/code/mutant_cure.dm index 9527af9670d..c873827a3ce 100644 --- a/modular_skyrat/modules/mutants/code/mutant_cure.dm +++ b/modular_skyrat/modules/mutants/code/mutant_cure.dm @@ -21,7 +21,7 @@ return FALSE to_chat(user, span_notice("You insert [O] into [src]!")) loaded_vial = O - playsound(loc, 'sound/weapons/autoguninsert.ogg', 35, 1) + playsound(loc, 'sound/items/weapons/autoguninsert.ogg', 35, 1) update_appearance() /obj/item/rna_extractor/attack_self(mob/living/user) @@ -61,7 +61,7 @@ to_chat(user, span_notice("You remove [loaded_vial] from [src].")) loaded_vial = null update_appearance() - playsound(loc, 'sound/weapons/empty.ogg', 50, 1) + playsound(loc, 'sound/items/weapons/empty.ogg', 50, 1) else to_chat(user, span_notice("[src] isn't loaded!")) return @@ -183,7 +183,7 @@ to_chat(user, span_notice("You insert [weapon] to into [src] reciprocal.")) flick("h_lathe_load", src) update_appearance() - playsound(loc, 'sound/weapons/autoguninsert.ogg', 35, 1) + playsound(loc, 'sound/items/weapons/autoguninsert.ogg', 35, 1) /obj/machinery/rnd/rna_recombinator/ui_interact(mob/user) @@ -264,7 +264,7 @@ vial.contains_rna = FALSE vial.update_appearance() ejectItem() - playsound(loc, 'sound/items/rped.ogg', 60, 1) + playsound(loc, 'sound/items/tools/rped.ogg', 60, 1) flick("h_lathe_wloop", src) use_energy(3000 JOULES) timer_id = addtimer(CALLBACK(src, PROC_REF(recombinate_step)), recombination_step_time, TIMER_STOPPABLE) @@ -283,7 +283,7 @@ return flick("h_lathe_wloop", src) use_energy(3000 JOULES) - playsound(loc, 'sound/items/rped.ogg', 60, 1) + playsound(loc, 'sound/items/tools/rped.ogg', 60, 1) timer_id = addtimer(CALLBACK(src, PROC_REF(recombinate_step)), recombination_step_time, TIMER_STOPPABLE) /obj/machinery/rnd/rna_recombinator/proc/recombinate_finish() diff --git a/modular_skyrat/modules/mutants/code/mutant_species.dm b/modular_skyrat/modules/mutants/code/mutant_species.dm index d560c8bd156..66c71e514ef 100644 --- a/modular_skyrat/modules/mutants/code/mutant_species.dm +++ b/modular_skyrat/modules/mutants/code/mutant_species.dm @@ -27,11 +27,11 @@ bodytemp_cold_damage_limit = MINIMUM_TEMPERATURE_TO_MOVE // take damage below minimum movement temp /// A list of spooky sounds we can play intermittantly. var/static/list/spooks = list( - 'sound/hallucinations/growl1.ogg', - 'sound/hallucinations/growl2.ogg', - 'sound/hallucinations/growl3.ogg', - 'sound/hallucinations/veryfar_noise.ogg', - 'sound/hallucinations/wail.ogg' + 'sound/effects/hallucinations/growl1.ogg', + 'sound/effects/hallucinations/growl2.ogg', + 'sound/effects/hallucinations/growl3.ogg', + 'sound/effects/hallucinations/veryfar_noise.ogg', + 'sound/effects/hallucinations/wail.ogg' ) bodypart_overrides = list( BODY_ZONE_HEAD = /obj/item/bodypart/head/mutant_zombie, @@ -186,7 +186,7 @@ inhand_icon_state = "mutant" lefthand_file = 'modular_skyrat/modules/mutants/icons/mutant_hand_lefthand.dmi' righthand_file = 'modular_skyrat/modules/mutants/icons/mutant_hand_righthand.dmi' - hitsound = 'sound/hallucinations/growl1.ogg' + hitsound = 'sound/effects/hallucinations/growl1.ogg' force = 26 sharpness = SHARP_EDGED wound_bonus = -20 diff --git a/modular_skyrat/modules/novaya_ert/code/advanced_choice_beacon.dm b/modular_skyrat/modules/novaya_ert/code/advanced_choice_beacon.dm index 9b365ba666e..a2f40ca9437 100644 --- a/modular_skyrat/modules/novaya_ert/code/advanced_choice_beacon.dm +++ b/modular_skyrat/modules/novaya_ert/code/advanced_choice_beacon.dm @@ -20,7 +20,7 @@ if(user.can_perform_action(src, FORBID_TELEKINESIS_REACH)) return TRUE else - playsound(src, 'sound/machines/buzz-sigh.ogg', 40, TRUE) + playsound(src, 'sound/machines/buzz/buzz-sigh.ogg', 40, TRUE) return FALSE @@ -113,7 +113,7 @@ if(I.tool_behaviour == TOOL_WRENCH && user.combat_mode) user.visible_message(span_danger("[user] bashes [src] with [I]!"), \ span_danger("You bash [src] with [I]!"), null, COMBAT_MESSAGE_RANGE) - playsound(src, "sound/items/drill_use.ogg", 80, TRUE, -1) + playsound(src, "sound/items/tools/drill_use.ogg", 80, TRUE, -1) var/obj/machinery/porta_turret/syndicate/pod/toolbox/nri/turret = new(get_turf(loc)) turret.faction = list(FACTION_NEUTRAL, FACTION_ERT) qdel(src) diff --git a/modular_skyrat/modules/opposing_force/code/equipment/guns.dm b/modular_skyrat/modules/opposing_force/code/equipment/guns.dm index 66d34e97fae..a3181b2f538 100644 --- a/modular_skyrat/modules/opposing_force/code/equipment/guns.dm +++ b/modular_skyrat/modules/opposing_force/code/equipment/guns.dm @@ -246,7 +246,7 @@ item_type = /obj/item/storage/toolbox/guncase/skyrat/pistol/opfor/foamforce_smg_basic /obj/item/storage/toolbox/guncase/skyrat/pistol/opfor/foamforce_smg_basic/PopulateContents() - new /obj/item/gun/ballistic/automatic/toy/unrestricted(src) + new /obj/item/gun/ballistic/automatic/toy/riot(src) new /obj/item/ammo_box/magazine/toy/smg/riot(src) new /obj/item/ammo_box/magazine/toy/smg/riot(src) diff --git a/modular_skyrat/modules/organs/code/heart.dm b/modular_skyrat/modules/organs/code/heart.dm index ae5ed164dc6..cd46215a5f6 100644 --- a/modular_skyrat/modules/organs/code/heart.dm +++ b/modular_skyrat/modules/organs/code/heart.dm @@ -57,7 +57,7 @@ if(COOLDOWN_FINISHED(src, shell_effect_cd)) source.visible_message(span_warning("[source]'s shell weathers the blow, absorbing most of the shock!")) - playsound(source, 'sound/weapons/parry.ogg', 50, extrarange = SHORT_RANGE_SOUND_EXTRARANGE) + playsound(source, 'sound/items/weapons/parry.ogg', 50, extrarange = SHORT_RANGE_SOUND_EXTRARANGE) COOLDOWN_START(src, shell_effect_cd, 5 SECONDS) // Cooldown resets EVERY time we get hit diff --git a/modular_skyrat/modules/paycheck_rations/code/tickets.dm b/modular_skyrat/modules/paycheck_rations/code/tickets.dm index 75ece4d6573..84d057e8eaa 100644 --- a/modular_skyrat/modules/paycheck_rations/code/tickets.dm +++ b/modular_skyrat/modules/paycheck_rations/code/tickets.dm @@ -20,7 +20,7 @@ /// Attempts to fill out the order list with items of the user's choosing, will stop in its tracks if it fails /obj/item/paper/paperslip/ration_ticket/proc/try_to_make_ration_order_list(obj/machinery/computer/cargo/object_we_attack, mob/living/user) forceMove(object_we_attack) - playsound(object_we_attack, 'sound/machines/terminal_insert_disc.ogg', 50, FALSE) + playsound(object_we_attack, 'sound/machines/terminal/terminal_insert_disc.ogg', 50, FALSE) // List of meat options we get var/list/radial_meat_options = list( @@ -35,7 +35,7 @@ if(!meats_choice) object_we_attack.balloon_alert(user, "no selection made") forceMove(drop_location(object_we_attack)) - playsound(object_we_attack, 'sound/machines/terminal_insert_disc.ogg', 50, FALSE) + playsound(object_we_attack, 'sound/machines/terminal/terminal_insert_disc.ogg', 50, FALSE) return switch(meats_choice) @@ -64,7 +64,7 @@ // Reset the list if we fail items_we_deliver = list() forceMove(drop_location(object_we_attack)) - playsound(object_we_attack, 'sound/machines/terminal_insert_disc.ogg', 50, FALSE) + playsound(object_we_attack, 'sound/machines/terminal/terminal_insert_disc.ogg', 50, FALSE) return switch(produce_choice) @@ -95,7 +95,7 @@ // Reset the list if we fail items_we_deliver = list() forceMove(drop_location(object_we_attack)) - playsound(object_we_attack, 'sound/machines/terminal_insert_disc.ogg', 50, FALSE) + playsound(object_we_attack, 'sound/machines/terminal/terminal_insert_disc.ogg', 50, FALSE) return switch(flour_choice) @@ -172,7 +172,7 @@ /// Attempts to fill out the order list with items of the user's choosing, will stop in its tracks if it fails /obj/item/paper/paperslip/ration_ticket/luxury/try_to_make_ration_order_list(obj/machinery/computer/cargo/object_we_attack, mob/living/user) forceMove(object_we_attack) - playsound(object_we_attack, 'sound/machines/terminal_insert_disc.ogg', 50, FALSE) + playsound(object_we_attack, 'sound/machines/terminal/terminal_insert_disc.ogg', 50, FALSE) // List of meat options we get var/list/radial_alcohol_options = list( diff --git a/modular_skyrat/modules/primitive_structures/code/fencing.dm b/modular_skyrat/modules/primitive_structures/code/fencing.dm index 20816e9ba55..8979d025d4c 100644 --- a/modular_skyrat/modules/primitive_structures/code/fencing.dm +++ b/modular_skyrat/modules/primitive_structures/code/fencing.dm @@ -50,7 +50,7 @@ opened = !opened set_density(!opened) icon_state = "[opened ? "gate_open" : "gate"]" - playsound(src, (opened ? 'sound/machines/wooden_closet_open.ogg' : 'sound/machines/wooden_closet_close.ogg'), 100, TRUE) + playsound(src, (opened ? 'sound/machines/closet/wooden_closet_open.ogg' : 'sound/machines/closet/wooden_closet_close.ogg'), 100, TRUE) update_appearance() /obj/structure/railing/wooden_fencing/gate/update_icon() @@ -64,8 +64,8 @@ name = "large wooden gate" icon = 'modular_skyrat/modules/primitive_structures/icons/wooden_gate.dmi' icon_state = "gate" - openSound = 'sound/machines/wooden_closet_open.ogg' - closeSound = 'sound/machines/wooden_closet_close.ogg' + openSound = 'sound/machines/closet/wooden_closet_open.ogg' + closeSound = 'sound/machines/closet/wooden_closet_close.ogg' /obj/structure/mineral_door/wood/large_gate/Open() playsound(src, openSound, 100, TRUE) diff --git a/modular_skyrat/modules/quirks/good.dm b/modular_skyrat/modules/quirks/good.dm index e75fe5c568d..1b00edc51ce 100644 --- a/modular_skyrat/modules/quirks/good.dm +++ b/modular_skyrat/modules/quirks/good.dm @@ -38,16 +38,16 @@ if(left_arm) left_arm.unarmed_attack_verbs = list("slash") left_arm.unarmed_attack_effect = ATTACK_EFFECT_CLAW - left_arm.unarmed_attack_sound = 'sound/weapons/slash.ogg' - left_arm.unarmed_miss_sound = 'sound/weapons/slashmiss.ogg' + left_arm.unarmed_attack_sound = 'sound/items/weapons/slash.ogg' + left_arm.unarmed_miss_sound = 'sound/items/weapons/slashmiss.ogg' left_arm.unarmed_sharpness = SHARP_EDGED var/obj/item/bodypart/arm/right/right_arm = human_holder.get_bodypart(BODY_ZONE_R_ARM) if(right_arm) right_arm.unarmed_attack_verbs = list("slash") right_arm.unarmed_attack_effect = ATTACK_EFFECT_CLAW - right_arm.unarmed_attack_sound = 'sound/weapons/slash.ogg' - right_arm.unarmed_miss_sound = 'sound/weapons/slashmiss.ogg' + right_arm.unarmed_attack_sound = 'sound/items/weapons/slash.ogg' + right_arm.unarmed_miss_sound = 'sound/items/weapons/slashmiss.ogg' right_arm.unarmed_sharpness = SHARP_EDGED /datum/quirk/sharpclaws/remove(client/client_source) diff --git a/modular_skyrat/modules/reagent_forging/code/anvil.dm b/modular_skyrat/modules/reagent_forging/code/anvil.dm index 768bff07214..6a06ec98352 100644 --- a/modular_skyrat/modules/reagent_forging/code/anvil.dm +++ b/modular_skyrat/modules/reagent_forging/code/anvil.dm @@ -174,6 +174,6 @@ ) poor_target.Paralyze(5 SECONDS) poor_target.emote("scream") - playsound(poor_target, 'sound/magic/clockwork/fellowship_armory.ogg', 50, TRUE) + playsound(poor_target, 'sound/effects/magic/clockwork/fellowship_armory.ogg', 50, TRUE) add_memory_in_range(poor_target, 7, /datum/memory/witness_vendor_crush, protagonist = poor_target, antognist = src) return TRUE diff --git a/modular_skyrat/modules/reagent_forging/code/forge.dm b/modular_skyrat/modules/reagent_forging/code/forge.dm index bad19d2c8e5..aff70f18440 100644 --- a/modular_skyrat/modules/reagent_forging/code/forge.dm +++ b/modular_skyrat/modules/reagent_forging/code/forge.dm @@ -397,7 +397,7 @@ minimum_target_temperature = 25 // This won't matter except in a few cases here, but we still need to cover those few cases forge_level = FORGE_LEVEL_LEGENDARY - playsound(src, 'sound/weapons/parry.ogg', 50, TRUE) // Play a feedback sound to really let players know we just did an upgrade + playsound(src, 'sound/items/weapons/parry.ogg', 50, TRUE) // Play a feedback sound to really let players know we just did an upgrade //this will allow click dragging certain items /obj/structure/reagent_forge/mouse_drop_receive(atom/attacking_item, mob/user, params) @@ -609,7 +609,7 @@ attacking_weapon.color = mix_color_from_reagents(attacking_weapon.reagents.reagent_list) balloon_alert_to_viewers("imbued [attacking_weapon]") user.mind.adjust_experience(/datum/skill/smithing, 60) - playsound(src, 'sound/magic/demon_consume.ogg', 50, TRUE) + playsound(src, 'sound/effects/magic/demon_consume.ogg', 50, TRUE) in_use = FALSE return TRUE @@ -654,7 +654,7 @@ attacking_clothing.color = mix_color_from_reagents(attacking_clothing.reagents.reagent_list) balloon_alert_to_viewers("imbued [attacking_clothing]") user.mind.adjust_experience(/datum/skill/smithing, 60) - playsound(src, 'sound/magic/demon_consume.ogg', 50, TRUE) + playsound(src, 'sound/effects/magic/demon_consume.ogg', 50, TRUE) in_use = FALSE return TRUE diff --git a/modular_skyrat/modules/reagent_forging/code/forge_weapons.dm b/modular_skyrat/modules/reagent_forging/code/forge_weapons.dm index fa60c021e8c..0fc281038bf 100644 --- a/modular_skyrat/modules/reagent_forging/code/forge_weapons.dm +++ b/modular_skyrat/modules/reagent_forging/code/forge_weapons.dm @@ -24,7 +24,7 @@ inhand_icon_state = "sword" worn_icon_state = "sword_back" belt_icon_state = "sword_belt" - hitsound = 'sound/weapons/bladeslice.ogg' + hitsound = 'sound/items/weapons/bladeslice.ogg' throwforce = 10 block_chance = 25 //either we make it melee block only or we don't give it too much. It's bulkly so the buckler is superior slot_flags = ITEM_SLOT_BELT | ITEM_SLOT_BACK @@ -49,7 +49,7 @@ inhand_icon_state = "katana" worn_icon_state = "katana_back" belt_icon_state = "katana_belt" - hitsound = 'sound/weapons/bladeslice.ogg' + hitsound = 'sound/items/weapons/bladeslice.ogg' throwforce = 10 slot_flags = ITEM_SLOT_BELT | ITEM_SLOT_BACK w_class = WEIGHT_CLASS_BULKY @@ -71,7 +71,7 @@ inhand_icon_state = "dagger" worn_icon_state = "dagger_back" belt_icon_state = "dagger_belt" - hitsound = 'sound/weapons/bladeslice.ogg' + hitsound = 'sound/items/weapons/bladeslice.ogg' embed_type = /datum/embed_data/forged_dagger throwforce = 10 slot_flags = ITEM_SLOT_BELT | ITEM_SLOT_BACK @@ -126,7 +126,7 @@ slot_flags = ITEM_SLOT_BACK w_class = WEIGHT_CLASS_BULKY resistance_flags = FIRE_PROOF - hitsound = 'sound/weapons/bladeslice.ogg' + hitsound = 'sound/items/weapons/bladeslice.ogg' attack_verb_continuous = list("attacks", "pokes", "jabs", "tears", "lacerates", "gores") attack_verb_simple = list("attack", "poke", "jab", "tear", "lacerate", "gore") wound_bonus = -15 @@ -334,9 +334,9 @@ if(prob(final_block_chance)) if(attack_type == PROJECTILE_ATTACK) owner.visible_message(span_danger("[owner] deflects [attack_text] with [src]!")) - playsound(src, pick('sound/weapons/effects/ric1.ogg', 'sound/weapons/effects/ric2.ogg', 'sound/weapons/effects/ric3.ogg', 'sound/weapons/effects/ric4.ogg', 'sound/weapons/effects/ric5.ogg'), 100, TRUE) + playsound(src, pick('sound/items/weapons/effects/ric1.ogg', 'sound/items/weapons/effects/ric2.ogg', 'sound/items/weapons/effects/ric3.ogg', 'sound/items/weapons/effects/ric4.ogg', 'sound/items/weapons/effects/ric5.ogg'), 100, TRUE) else - playsound(src, 'sound/weapons/parry.ogg', 75, TRUE) + playsound(src, 'sound/items/weapons/parry.ogg', 75, TRUE) owner.visible_message(span_danger("[owner] parries [attack_text] with [src]!")) var/owner_turf = get_turf(owner) new block_effect(owner_turf, COLOR_YELLOW) diff --git a/modular_skyrat/modules/records_on_examine/code/record_manifest.dm b/modular_skyrat/modules/records_on_examine/code/record_manifest.dm index fa9aa02f99d..a98c0b5cd7b 100644 --- a/modular_skyrat/modules/records_on_examine/code/record_manifest.dm +++ b/modular_skyrat/modules/records_on_examine/code/record_manifest.dm @@ -22,7 +22,7 @@ var/name = crew_record.name var/rank = crew_record.rank // var/truerank = crew_record.truerank - var/datum/job/job = SSjob.GetJob(rank) + var/datum/job/job = SSjob.get_job(rank) if(!job || !(job.job_flags & JOB_CREW_MANIFEST) || !LAZYLEN(job.departments_list) && (!exploitables_empty)) // In case an unlawful custom rank is added. var/list/exp_misc_list = exp_manifest_out[DEPARTMENT_UNASSIGNED] diff --git a/modular_skyrat/modules/resleeving/code/rsd_interface.dm b/modular_skyrat/modules/resleeving/code/rsd_interface.dm index 34afe37a51e..046c5564d61 100644 --- a/modular_skyrat/modules/resleeving/code/rsd_interface.dm +++ b/modular_skyrat/modules/resleeving/code/rsd_interface.dm @@ -18,7 +18,7 @@ user.visible_message(span_notice("[user] upgrades [interacting_with] with [src]."), span_notice("You upgrade [interacting_with] to be RSD compatible.")) interacting_with.AddElement(/datum/element/rsd_interface) - playsound(interacting_with.loc, 'sound/weapons/circsawhit.ogg', 50, vary = TRUE) + playsound(interacting_with.loc, 'sound/items/weapons/circsawhit.ogg', 50, vary = TRUE) qdel(src) return ITEM_INTERACT_SUCCESS diff --git a/modular_skyrat/modules/rod-stopper/code/rodstopper.dm b/modular_skyrat/modules/rod-stopper/code/rodstopper.dm index 3daf59560ae..bee5502999f 100644 --- a/modular_skyrat/modules/rod-stopper/code/rodstopper.dm +++ b/modular_skyrat/modules/rod-stopper/code/rodstopper.dm @@ -26,6 +26,6 @@ warn_area() /obj/machinery/rodstopper/proc/warn_area() - playsound(src, 'sound/misc/bloblarm.ogg', 100) + playsound(src, 'sound/announcer/alarm/bloblarm.ogg', 100) say("Warning! Please clear the area! Failure to do so will result in your immediate annihilation!") addtimer(CALLBACK(src, PROC_REF(warn_area)), 15 SECONDS, TIMER_OVERRIDE|TIMER_UNIQUE) // the sound is 7 seconds, however. diff --git a/modular_skyrat/modules/salon/code/hair_tie.dm b/modular_skyrat/modules/salon/code/hair_tie.dm index a7140bc09b7..c59a3afbeda 100644 --- a/modular_skyrat/modules/salon/code/hair_tie.dm +++ b/modular_skyrat/modules/salon/code/hair_tie.dm @@ -112,14 +112,14 @@ proj.firer = user proj.fired_from = user proj.fire((dir2angle(user.dir) + rand(-projectile_aim_radius, projectile_aim_radius))) - playsound(src, 'sound/weapons/effects/batreflect.ogg', 25, TRUE) + playsound(src, 'sound/items/weapons/effects/batreflect.ogg', 25, TRUE) //get rid of what we just launched to let projectile_drop spawn a new one qdel(src) /obj/projectile/bullet/hair_tie icon = 'modular_skyrat/modules/salon/icons/items.dmi' icon_state = "hairtie" - hitsound = 'sound/weapons/genhit.ogg' + hitsound = 'sound/items/weapons/genhit.ogg' damage = 0 //its just about the knockdown sharpness = NONE shrapnel_type = NONE //no embedding pls diff --git a/modular_skyrat/modules/salon/code/straight_razor.dm b/modular_skyrat/modules/salon/code/straight_razor.dm index e6e85f7e160..cd4501a1188 100644 --- a/modular_skyrat/modules/salon/code/straight_razor.dm +++ b/modular_skyrat/modules/salon/code/straight_razor.dm @@ -9,7 +9,7 @@ w_class = WEIGHT_CLASS_TINY attack_verb_simple = list("cut", "stabbed", "chebbed") sharpness = SHARP_EDGED - hitsound = 'sound/weapons/bladeslice.ogg' + hitsound = 'sound/items/weapons/bladeslice.ogg' wound_bonus = 10 bare_wound_bonus = 15 tool_behaviour = TOOL_KNIFE diff --git a/modular_skyrat/modules/sec_haul/code/misc/bullet_drive.dm b/modular_skyrat/modules/sec_haul/code/misc/bullet_drive.dm index 7cadd1f1d3e..b3ac0cd46dc 100644 --- a/modular_skyrat/modules/sec_haul/code/misc/bullet_drive.dm +++ b/modular_skyrat/modules/sec_haul/code/misc/bullet_drive.dm @@ -29,7 +29,7 @@ if(!bin) if(manual) visible_message(span_warning("[src] buzzes. There are no disposal bins in range!")) - playsound(src, 'sound/machines/buzz-sigh.ogg', 50, TRUE) + playsound(src, 'sound/machines/buzz/buzz-sigh.ogg', 50, TRUE) return var/disposed = 0 for(var/obj/item/ammo_casing/A in dish_drive_contents) @@ -40,8 +40,8 @@ disposed++ if(disposed) visible_message(span_notice("[src] [pick("whooshes", "bwooms", "fwooms", "pshooms")] and demoleculizes [disposed] stored item\s into the nearby void.")) - playsound(src, 'sound/items/pshoom.ogg', 50, TRUE) - playsound(bin, 'sound/items/pshoom.ogg', 50, TRUE) + playsound(src, 'sound/items/pshoom/pshoom.ogg', 50, TRUE) + playsound(bin, 'sound/items/pshoom/pshoom.ogg', 50, TRUE) flick("synthesizer_beam", src) else visible_message(span_notice("There are no disposable items in [src]!")) @@ -61,7 +61,7 @@ LAZYADD(dish_drive_contents, I) visible_message(span_notice("[src] beams up [I]!")) I.moveToNullspace() - playsound(src, 'sound/items/pshoom.ogg', 50, TRUE) + playsound(src, 'sound/items/pshoom/pshoom.ogg', 50, TRUE) flick("synthesizer_beam", src) else step_towards(I, src) diff --git a/modular_skyrat/modules/sec_haul/code/peacekeeper/peacekeeper_hammer.dm b/modular_skyrat/modules/sec_haul/code/peacekeeper/peacekeeper_hammer.dm index 2514bcf72d9..5b097d1b0bb 100644 --- a/modular_skyrat/modules/sec_haul/code/peacekeeper/peacekeeper_hammer.dm +++ b/modular_skyrat/modules/sec_haul/code/peacekeeper/peacekeeper_hammer.dm @@ -102,7 +102,7 @@ if(QDELETED(target)) return FALSE target.take_damage(force*breaching_multipler) - playsound(target, 'sound/weapons/sonic_jackhammer.ogg', 70) + playsound(target, 'sound/items/weapons/sonic_jackhammer.ogg', 70) visible_message("[user] smashes the [target] forcefully with the [src]") user.do_attack_animation(target, used_item = src) breaching_loop(user, target) diff --git a/modular_skyrat/modules/self_actualization_device/code/self_actualization_device.dm b/modular_skyrat/modules/self_actualization_device/code/self_actualization_device.dm index 359c4b89b56..9aebd62898e 100644 --- a/modular_skyrat/modules/self_actualization_device/code/self_actualization_device.dm +++ b/modular_skyrat/modules/self_actualization_device/code/self_actualization_device.dm @@ -175,7 +175,7 @@ say("Procedure validation in progress...") var/mob/living/carbon/human/human_occupant = occupant if(!isnull(human_occupant.ckey) && isnull(human_occupant.client)) // player mob, currently disconnected - playsound(src, 'sound/machines/buzz-sigh.ogg', 50, FALSE) + playsound(src, 'sound/machines/buzz/buzz-sigh.ogg', 50, FALSE) say("ERROR: Validation failed: No elicited response from occupant genes. Subject may be suffering from Sudden Sleep Disorder.") return @@ -195,7 +195,7 @@ update_appearance() else player_consent = NO_CONSENT - playsound(src, 'sound/machines/buzz-sigh.ogg', 50, FALSE) + playsound(src, 'sound/machines/buzz/buzz-sigh.ogg', 50, FALSE) say("ERROR: Validation failed: Occupant genes have willfully rejected the procedure. You may try again if you think this was an error.") update_appearance() diff --git a/modular_skyrat/modules/shotgunrebalance/code/shotgun.dm b/modular_skyrat/modules/shotgunrebalance/code/shotgun.dm index 8f0a5a33370..820b2c6957f 100644 --- a/modular_skyrat/modules/shotgunrebalance/code/shotgun.dm +++ b/modular_skyrat/modules/shotgunrebalance/code/shotgun.dm @@ -185,7 +185,7 @@ projectile_type = /obj/projectile/bullet/pellet/shotgun_buckshot/beehive pellets = 4 variance = 15 - fire_sound = 'sound/weapons/taser.ogg' + fire_sound = 'sound/items/weapons/taser.ogg' harmful = FALSE custom_materials = AMMO_MATS_SHOTGUN_HIVE advanced_print_req = TRUE @@ -222,7 +222,7 @@ pellets = 1 variance = 1 harmful = FALSE - fire_sound = 'sound/weapons/taser.ogg' + fire_sound = 'sound/items/weapons/taser.ogg' custom_materials = AMMO_MATS_SHOTGUN_TIDE advanced_print_req = TRUE diff --git a/modular_skyrat/modules/space_vines/scythes.dm b/modular_skyrat/modules/space_vines/scythes.dm index d947bb833d0..272f3cdede8 100644 --- a/modular_skyrat/modules/space_vines/scythes.dm +++ b/modular_skyrat/modules/space_vines/scythes.dm @@ -17,7 +17,7 @@ slot_flags = ITEM_SLOT_BACK attack_verb_continuous = list("chops", "slices", "cuts", "reaps") attack_verb_simple = list("chop", "slice", "cut", "reap") - hitsound = 'sound/weapons/bladeslice.ogg' + hitsound = 'sound/items/weapons/bladeslice.ogg' item_flags = CRUEL_IMPLEMENT //maybe they want to use it in surgery var/hit_range = 0 diff --git a/modular_skyrat/modules/stasisrework/code/stasissleeper.dm b/modular_skyrat/modules/stasisrework/code/stasissleeper.dm index abb7437d6f6..fc852d7d81d 100644 --- a/modular_skyrat/modules/stasisrework/code/stasissleeper.dm +++ b/modular_skyrat/modules/stasisrework/code/stasissleeper.dm @@ -49,9 +49,9 @@ if(last_stasis_sound != _running) var/sound_freq = rand(5120, 8800) if(!(_running)) - playsound(src, 'sound/machines/synth_yes.ogg', 50, TRUE, frequency = sound_freq) + playsound(src, 'sound/machines/synth/synth_yes.ogg', 50, TRUE, frequency = sound_freq) else - playsound(src, 'sound/machines/synth_no.ogg', 50, TRUE, frequency = sound_freq) + playsound(src, 'sound/machines/synth/synth_no.ogg', 50, TRUE, frequency = sound_freq) last_stasis_sound = _running /obj/machinery/stasissleeper/click_alt(mob/user) diff --git a/modular_skyrat/modules/stone/code/stone.dm b/modular_skyrat/modules/stone/code/stone.dm index 6f4046006c0..e5ed24db881 100644 --- a/modular_skyrat/modules/stone/code/stone.dm +++ b/modular_skyrat/modules/stone/code/stone.dm @@ -62,7 +62,7 @@ GLOBAL_LIST_INIT(stone_recipes, list ( \ /obj/item/stack/stone/attackby(obj/item/attacking_item, mob/user, params) if((attacking_item.tool_behaviour != TOOL_MINING) && !(istype(attacking_item, /obj/item/chisel))) return ..() - playsound(src, 'sound/effects/picaxe1.ogg', 50, TRUE) + playsound(src, 'sound/effects/pickaxe/picaxe1.ogg', 50, TRUE) balloon_alert_to_viewers("cutting...") if(!do_after(user, 5 SECONDS, target = src)) balloon_alert_to_viewers("stopped cutting") diff --git a/modular_skyrat/modules/synths/code/surgery/mechanic_steps.dm b/modular_skyrat/modules/synths/code/surgery/mechanic_steps.dm index cb1e15266ad..6befc85c0ef 100644 --- a/modular_skyrat/modules/synths/code/surgery/mechanic_steps.dm +++ b/modular_skyrat/modules/synths/code/surgery/mechanic_steps.dm @@ -8,7 +8,7 @@ /obj/item = 10, ) // 10% success with any sharp item. time = 2.4 SECONDS - preop_sound = 'sound/items/wirecutter.ogg' + preop_sound = 'sound/items/tools/wirecutter.ogg' /datum/surgery_step/cut_wires/preop(mob/user, mob/living/carbon/target, target_zone, obj/item/tool, datum/surgery/surgery) display_results( @@ -32,7 +32,7 @@ TOOL_HEMOSTAT = 10, ) time = 2.4 SECONDS - preop_sound = 'sound/items/crowbar.ogg' + preop_sound = 'sound/items/tools/crowbar.ogg' /datum/surgery_step/pry_off_plating/success(mob/user, mob/living/carbon/target, target_zone, obj/item/tool, datum/surgery/surgery) do_sparks(rand(5, 9), FALSE, target.loc) @@ -54,7 +54,7 @@ TOOL_WELDER = 100, ) time = 2.4 SECONDS - preop_sound = 'sound/items/welder.ogg' + preop_sound = 'sound/items/tools/welder.ogg' /datum/surgery_step/weld_plating/tool_check(mob/user, obj/item/tool) if(implement_type == TOOL_WELDER && !tool.use_tool(user, user, 0, volume=50, amount=1)) @@ -77,7 +77,7 @@ TOOL_WELDER = 100, ) time = 2.4 SECONDS - preop_sound = 'sound/items/welder.ogg' + preop_sound = 'sound/items/tools/welder.ogg' /datum/surgery_step/weld_plating/tool_check(mob/user, obj/item/tool) if(implement_type == TOOL_WELDER && !tool.use_tool(user, user, 0, volume=50, amount=1)) diff --git a/modular_skyrat/modules/synths/code/surgery/robot_brain_surgery.dm b/modular_skyrat/modules/synths/code/surgery/robot_brain_surgery.dm index ab7827c176a..27442f031f3 100644 --- a/modular_skyrat/modules/synths/code/surgery/robot_brain_surgery.dm +++ b/modular_skyrat/modules/synths/code/surgery/robot_brain_surgery.dm @@ -112,7 +112,7 @@ target.setOrganLoss(ORGAN_SLOT_BRAIN, target.get_organ_loss(ORGAN_SLOT_BRAIN) - 60) //we set damage in this case in order to clear the "failing" flag target.cure_all_traumas(TRAUMA_RESILIENCE_MAGIC) - playsound(source = get_turf(target), soundin = 'sound/magic/repulse.ogg', vol = 75, vary = TRUE, falloff_distance = 2) + playsound(source = get_turf(target), soundin = 'sound/effects/magic/repulse.ogg', vol = 75, vary = TRUE, falloff_distance = 2) if(target.mind && target.mind.has_antag_datum(/datum/antagonist/brainwashed)) target.mind.remove_antag_datum(/datum/antagonist/brainwashed) if(prob(75)) diff --git a/modular_skyrat/modules/synths/code/surgery/robot_heart_surgery.dm b/modular_skyrat/modules/synths/code/surgery/robot_heart_surgery.dm index 380041e01dc..3b23802bc47 100644 --- a/modular_skyrat/modules/synths/code/surgery/robot_heart_surgery.dm +++ b/modular_skyrat/modules/synths/code/surgery/robot_heart_surgery.dm @@ -30,8 +30,8 @@ TOOL_WIRECUTTER = 35, /obj/item/stack/package_wrap = 15, ) - preop_sound = 'sound/items/ratchet_slow.ogg' - success_sound = 'sound/machines/doorclick.ogg' + preop_sound = 'sound/items/tools/ratchet_slow.ogg' + success_sound = 'sound/machines/airlock/doorclick.ogg' /datum/surgery_step/hydraulic/repair/preop(mob/user, mob/living/carbon/target, target_zone, obj/item/tool, datum/surgery/surgery) display_results( diff --git a/modular_skyrat/modules/synths/code/surgery/robot_liver_surgery.dm b/modular_skyrat/modules/synths/code/surgery/robot_liver_surgery.dm index 4d2219c8167..685d36580ad 100644 --- a/modular_skyrat/modules/synths/code/surgery/robot_liver_surgery.dm +++ b/modular_skyrat/modules/synths/code/surgery/robot_liver_surgery.dm @@ -31,8 +31,8 @@ /obj/item/knife = 25, /obj/item/shard = 5, ) - preop_sound = 'sound/items/screwdriver_operating.ogg' - success_sound = 'sound/machines/doorclick.ogg' + preop_sound = 'sound/items/tools/screwdriver_operating.ogg' + success_sound = 'sound/machines/airlock/doorclick.ogg' /datum/surgery_step/reagent_pump/repair/preop(mob/user, mob/living/carbon/target, target_zone, obj/item/tool, datum/surgery/surgery) display_results( diff --git a/modular_skyrat/modules/synths/code/surgery/robot_lung_surgery.dm b/modular_skyrat/modules/synths/code/surgery/robot_lung_surgery.dm index 0f1037bb74c..3213cc954b3 100644 --- a/modular_skyrat/modules/synths/code/surgery/robot_lung_surgery.dm +++ b/modular_skyrat/modules/synths/code/surgery/robot_lung_surgery.dm @@ -30,8 +30,8 @@ TOOL_RETRACTOR = 45, ) time = 2.4 SECONDS - preop_sound = 'sound/items/ratchet_fast.ogg' - success_sound = 'sound/machines/doorclick.ogg' + preop_sound = 'sound/items/tools/ratchet_fast.ogg' + success_sound = 'sound/machines/airlock/doorclick.ogg' /datum/surgery_step/heatsink/repair/preop(mob/user, mob/living/carbon/target, target_zone, obj/item/tool, datum/surgery/surgery) display_results( diff --git a/modular_skyrat/modules/synths/code/surgery/robot_stomach_surgery.dm b/modular_skyrat/modules/synths/code/surgery/robot_stomach_surgery.dm index 890f095c638..92c91ff895d 100644 --- a/modular_skyrat/modules/synths/code/surgery/robot_stomach_surgery.dm +++ b/modular_skyrat/modules/synths/code/surgery/robot_stomach_surgery.dm @@ -31,8 +31,8 @@ /obj/item/knife = 25, /obj/item/shard = 5, ) - preop_sound = 'sound/items/ratchet_slow.ogg' - success_sound = 'sound/machines/doorclick.ogg' + preop_sound = 'sound/items/tools/ratchet_slow.ogg' + success_sound = 'sound/machines/airlock/doorclick.ogg' /datum/surgery_step/bioreactor/repair/preop(mob/user, mob/living/carbon/target, target_zone, obj/item/tool, datum/surgery/surgery) display_results( diff --git a/modular_skyrat/modules/tableflip/code/flipped_table.dm b/modular_skyrat/modules/tableflip/code/flipped_table.dm index e7d480bee47..1b4bee131bc 100644 --- a/modular_skyrat/modules/tableflip/code/flipped_table.dm +++ b/modular_skyrat/modules/tableflip/code/flipped_table.dm @@ -57,7 +57,7 @@ if(custom_materials) new_table.set_custom_materials(custom_materials) user.balloon_alert_to_viewers("table flipped upright") - playsound(src, 'sound/items/trayhit2.ogg', 100) + playsound(src, 'sound/items/trayhit/trayhit2.ogg', 100) qdel(src) /obj/structure/flippedtable/BorgCtrlShiftClick(mob/living/silicon/robot/user) @@ -103,7 +103,7 @@ sound_volume = 40 user.balloon_alert_to_viewers(balloon_message) - playsound(src, 'sound/items/trayhit2.ogg', sound_volume) + playsound(src, 'sound/items/trayhit/trayhit2.ogg', sound_volume) qdel(src) var/turf/throw_target = get_step(flipped_table, flipped_table.dir) diff --git a/modular_skyrat/modules/tagline/code/world.dm b/modular_skyrat/modules/tagline/code/world.dm index 1e3e74c783e..762fff6ff2a 100644 --- a/modular_skyrat/modules/tagline/code/world.dm +++ b/modular_skyrat/modules/tagline/code/world.dm @@ -19,8 +19,8 @@ var/players = GLOB.clients.len - if(SSmapping.config) - features += "[SSmapping.config.map_name]" + if(SSmapping.current_map) + features += "[SSmapping.current_map.map_name]" features += "~[players] player[players == 1 ? "": "s"]" diff --git a/modular_skyrat/modules/tarkon/code/guns/m6pdw.dm b/modular_skyrat/modules/tarkon/code/guns/m6pdw.dm index d9dfccd1df1..9c610d2bccc 100644 --- a/modular_skyrat/modules/tarkon/code/guns/m6pdw.dm +++ b/modular_skyrat/modules/tarkon/code/guns/m6pdw.dm @@ -12,10 +12,10 @@ spawnwithmagazine = FALSE accepted_magazine_type = /obj/item/ammo_box/magazine/c35sol_pistol can_suppress = FALSE - fire_sound = 'sound/weapons/gun/pistol/shot_alt.ogg' - rack_sound = 'sound/weapons/gun/pistol/rack.ogg' - lock_back_sound = 'sound/weapons/gun/pistol/slide_lock.ogg' - bolt_drop_sound = 'sound/weapons/gun/pistol/slide_drop.ogg' + fire_sound = 'sound/items/weapons/gun/pistol/shot_alt.ogg' + rack_sound = 'sound/items/weapons/gun/pistol/rack.ogg' + lock_back_sound = 'sound/items/weapons/gun/pistol/slide_lock.ogg' + bolt_drop_sound = 'sound/items/weapons/gun/pistol/slide_drop.ogg' projectile_damage_multiplier = 1 burst_size = 2 fire_delay = 1.9 diff --git a/modular_skyrat/modules/tarkon/code/guns/resonance_disruptor.dm b/modular_skyrat/modules/tarkon/code/guns/resonance_disruptor.dm index dad9ad4bc1f..cc9dcaa1f5b 100644 --- a/modular_skyrat/modules/tarkon/code/guns/resonance_disruptor.dm +++ b/modular_skyrat/modules/tarkon/code/guns/resonance_disruptor.dm @@ -40,7 +40,7 @@ projectile_type = /obj/projectile/resonant_bolt select_name = "kinetic" e_cost = LASER_SHOTS(1, STANDARD_CELL_CHARGE * 0.5) - fire_sound = 'sound/weapons/kinetic_accel.ogg' + fire_sound = 'sound/items/weapons/kinetic_accel.ogg' /obj/item/ammo_casing/energy/resonance/ready_proj(atom/target, mob/living/user, quiet, zone_override = "") ..() @@ -141,7 +141,7 @@ /datum/status_effect/resonant_link/proc/detonate() SIGNAL_HANDLER var/turf/src_turf = get_turf(src) - playsound(src_turf, 'sound/weapons/resonator_blast.ogg', 50, TRUE) + playsound(src_turf, 'sound/items/weapons/resonator_blast.ogg', 50, TRUE) check_pressure(src_turf) if(creator) log_combat(creator, owner, "used a resonator field on", "resonator") diff --git a/modular_skyrat/modules/tarkon/code/misc-fluff/spawner.dm b/modular_skyrat/modules/tarkon/code/misc-fluff/spawner.dm index 2b0344a544d..6dc31ca522e 100644 --- a/modular_skyrat/modules/tarkon/code/misc-fluff/spawner.dm +++ b/modular_skyrat/modules/tarkon/code/misc-fluff/spawner.dm @@ -220,7 +220,7 @@ MAPPING_DIRECTIONAL_HELPERS(/obj/machinery/computer/cryopod/tarkon, 32) /obj/effect/nest_break/proc/rustle() for(var/mob/M in range(7,src)) shake_camera(M, 15, 1) - playsound(get_turf(src),'sound/effects/explosionfar.ogg', 200, TRUE) + playsound(get_turf(src),'sound/effects/explosion/explosionfar.ogg', 200, TRUE) visible_message(span_boldannounce("The nest's entrance starts to crumble before something charges forth!")) new boss_mob(loc) new loot_drop(loc) diff --git a/modular_skyrat/modules/taur_mechanics/code/constrict.dm b/modular_skyrat/modules/taur_mechanics/code/constrict.dm index 08a0312f590..0172b1bfee0 100644 --- a/modular_skyrat/modules/taur_mechanics/code/constrict.dm +++ b/modular_skyrat/modules/taur_mechanics/code/constrict.dm @@ -566,14 +566,14 @@ switch(damage_type) if(BRUTE) if(damage_amount) - playsound(loc, 'sound/weapons/bladeslice.ogg', 100, TRUE) + playsound(loc, 'sound/items/weapons/bladeslice.ogg', 100, TRUE) else - playsound(src, 'sound/weapons/tap.ogg', 50, TRUE) + playsound(src, 'sound/items/weapons/tap.ogg', 50, TRUE) if(BURN) if(!damage_amount) return - playsound(loc, 'sound/items/welder.ogg', 100, TRUE) + playsound(loc, 'sound/items/tools/welder.ogg', 100, TRUE) /// Signal proc for when owner moves. Qdels src. diff --git a/modular_skyrat/modules/time_clock/code/console.dm b/modular_skyrat/modules/time_clock/code/console.dm index 7e6878cdf43..791ad16cff2 100644 --- a/modular_skyrat/modules/time_clock/code/console.dm +++ b/modular_skyrat/modules/time_clock/code/console.dm @@ -74,7 +74,7 @@ MAPPING_DIRECTIONAL_HELPERS(/obj/machinery/time_clock, 28) eject_inserted_id(user) return FALSE - playsound(src, 'sound/machines/terminal_insert_disc.ogg', 50, FALSE) + playsound(src, 'sound/machines/terminal/terminal_insert_disc.ogg', 50, FALSE) return TRUE /obj/machinery/time_clock/click_alt(mob/user) @@ -94,7 +94,7 @@ MAPPING_DIRECTIONAL_HELPERS(/obj/machinery/time_clock, 28) inserted_id = FALSE update_appearance() update_static_data_for_all_viewers() - playsound(src, 'sound/machines/terminal_eject.ogg', 50, FALSE) + playsound(src, 'sound/machines/terminal/terminal_eject.ogg', 50, FALSE) return TRUE diff --git a/modular_skyrat/modules/title_screen/code/title_screen_subsystem.dm b/modular_skyrat/modules/title_screen/code/title_screen_subsystem.dm index 48b8dc72022..10be79bc342 100644 --- a/modular_skyrat/modules/title_screen/code/title_screen_subsystem.dm +++ b/modular_skyrat/modules/title_screen/code/title_screen_subsystem.dm @@ -99,7 +99,7 @@ SUBSYSTEM_DEF(title) return // If there's no info about the current map, use the defaults. - var/list/map_info = progress_json[SSmapping.config.map_name] + var/list/map_info = progress_json[SSmapping.current_map.map_name] if(!islist(map_info)) return @@ -113,14 +113,14 @@ SUBSYSTEM_DEF(title) progress_json["_version"] = TITLE_PROGRESS_CACHE_VERSION - if(progress_json[SSmapping.config.map_name]) + if(progress_json[SSmapping.current_map.map_name]) // Save total time and updated message timings. Latest time is worth 1/4 the "average" map_info["total"] = 0.75 * average_completion_time + 0.25 * (world.timeofday - progress_reference_time) else // New. Just save the time it took. map_info["total"] = world.timeofday - progress_reference_time map_info["messages"] = startup_message_timings - progress_json[SSmapping.config.map_name] = map_info + progress_json[SSmapping.current_map.map_name] = map_info fdel(json_file) WRITE_FILE(json_file, json_encode(progress_json)) diff --git a/modular_skyrat/modules/tribal_extended/code/weapons/sword.dm b/modular_skyrat/modules/tribal_extended/code/weapons/sword.dm index 1fff0ccbc4f..622c99c1120 100644 --- a/modular_skyrat/modules/tribal_extended/code/weapons/sword.dm +++ b/modular_skyrat/modules/tribal_extended/code/weapons/sword.dm @@ -13,7 +13,7 @@ throwforce = 10 armour_penetration = 10 w_class = WEIGHT_CLASS_NORMAL - hitsound = 'sound/weapons/bladeslice.ogg' + hitsound = 'sound/items/weapons/bladeslice.ogg' attack_verb_continuous = list("attacked", "slashed", "stabbed", "sliced", "torn", "ripped", "diced", "cut") block_chance = 0 armor_type = /datum/armor/claymore_bone diff --git a/modular_skyrat/modules/trim_tokens/code/trim_tokens.dm b/modular_skyrat/modules/trim_tokens/code/trim_tokens.dm index 1a595ac2d46..59f617a2405 100644 --- a/modular_skyrat/modules/trim_tokens/code/trim_tokens.dm +++ b/modular_skyrat/modules/trim_tokens/code/trim_tokens.dm @@ -5,7 +5,7 @@ icon_state = "coin_valid" w_class = WEIGHT_CLASS_SMALL resistance_flags = INDESTRUCTIBLE - usesound = 'sound/weapons/taserhit.ogg' + usesound = 'sound/items/weapons/taserhit.ogg' // Name of the job of that trim. I tried to do it otherwise but it was annoying so this is how it's going to be. var/assignment = "Unassigned" // Trim to add to the ID. diff --git a/modular_skyrat/modules/verbs/code/subtle.dm b/modular_skyrat/modules/verbs/code/subtle.dm index 166a279cd18..bdac9637a8b 100644 --- a/modular_skyrat/modules/verbs/code/subtle.dm +++ b/modular_skyrat/modules/verbs/code/subtle.dm @@ -144,7 +144,7 @@ // BUBBER EDIT BEGIN - Subtler sounds var/datum/preferences/prefs = target_mob.client?.prefs if(prefs && prefs.read_preference(/datum/preference/toggle/subtler_sound)) - target_mob.playsound_local(get_turf(target_mob), 'sound/effects/glockenspiel_ping.ogg', 50) + target_mob.playsound_local(get_turf(target_mob), 'sound/effects/achievement/glockenspiel_ping.ogg', 50) // BUBBER EDIT END else to_chat(user, span_warning("Your emote was unable to be sent to your target: Too far away.")) @@ -155,7 +155,7 @@ // BUBBER EDIT BEGIN - Subtler sounds var/datum/preferences/prefs = hologram.Impersonation.client?.prefs if(prefs && prefs.read_preference(/datum/preference/toggle/subtler_sound)) - hologram.Impersonation.playsound_local(get_turf(hologram.Impersonation), 'sound/effects/glockenspiel_ping.ogg', 50) + hologram.Impersonation.playsound_local(get_turf(hologram.Impersonation), 'sound/effects/achievement/glockenspiel_ping.ogg', 50) // BUBBER EDIT END else var/ghostless = get_hearers_in_view(target, user) - GLOB.dead_mob_list @@ -173,7 +173,7 @@ // BUBBER EDIT BEGIN - Subtler sounds var/datum/preferences/prefs = receiver.client?.prefs if(prefs && prefs.read_preference(/datum/preference/toggle/subtler_sound)) - receiver.playsound_local(get_turf(receiver), 'sound/effects/glockenspiel_ping.ogg', 50) + receiver.playsound_local(get_turf(receiver), 'sound/effects/achievement/glockenspiel_ping.ogg', 50) // BUBBER EDIT END return TRUE diff --git a/modular_skyrat/modules/xenos_skyrat_redo/code/human_defense.dm b/modular_skyrat/modules/xenos_skyrat_redo/code/human_defense.dm index 8fa51a05f7e..b56a42d1b0f 100644 --- a/modular_skyrat/modules/xenos_skyrat_redo/code/human_defense.dm +++ b/modular_skyrat/modules/xenos_skyrat_redo/code/human_defense.dm @@ -12,14 +12,14 @@ if(mob_held_item) if(check_block(user, damage = 0, attack_text = "[user.name]")) - playsound(loc, 'sound/weapons/parry.ogg', 25, TRUE, -1) //Audio feedback to the fact you just got blocked + playsound(loc, 'sound/items/weapons/parry.ogg', 25, TRUE, -1) //Audio feedback to the fact you just got blocked apply_damage(disarm_damage / 2, STAMINA) visible_message(span_danger("[user] attempts to touch [src]!"), \ span_danger("[user] attempts to touch you!"), span_hear("You hear a swoosh!"), null, user) to_chat(user, span_warning("You attempt to touch [src]!")) return FALSE - playsound(loc, 'sound/weapons/thudswoosh.ogg', 25, TRUE, -1) //The sounds of these are changed so the xenos can actually hear they are being non-lethal + playsound(loc, 'sound/items/weapons/thudswoosh.ogg', 25, TRUE, -1) //The sounds of these are changed so the xenos can actually hear they are being non-lethal Knockdown(3 SECONDS) apply_damage(disarm_damage, STAMINA) visible_message(span_danger("[user] knocks [src] down!"), \ @@ -49,7 +49,7 @@ var/armor_block = run_armor_check(affecting, MELEE,"","",10) - playsound(loc, 'sound/weapons/slice.ogg', 25, TRUE, -1) + playsound(loc, 'sound/items/weapons/slice.ogg', 25, TRUE, -1) visible_message(span_danger("[user] slashes at [src]!"), \ span_userdanger("[user] slashes at you!"), span_hear("You hear a sickening sound of a slice!"), null, user) to_chat(user, span_danger("You slash at [src]!")) diff --git a/modular_skyrat/modules/xenos_skyrat_redo/code/xeno_types/praetorian.dm b/modular_skyrat/modules/xenos_skyrat_redo/code/xeno_types/praetorian.dm index a34376970e7..c88c6c97401 100644 --- a/modular_skyrat/modules/xenos_skyrat_redo/code/xeno_types/praetorian.dm +++ b/modular_skyrat/modules/xenos_skyrat_redo/code/xeno_types/praetorian.dm @@ -50,7 +50,7 @@ sparkle_path = /obj/effect/temp_visual/dir_setting/tailsweep/praetorian - impact_sound = 'sound/weapons/slap.ogg' + impact_sound = 'sound/items/weapons/slap.ogg' impact_damage = 20 impact_wound_bonus = 10 diff --git a/modular_skyrat/modules/xenos_skyrat_redo/code/xeno_types/rouny.dm b/modular_skyrat/modules/xenos_skyrat_redo/code/xeno_types/rouny.dm index a8f55b12fd9..1f952d99828 100644 --- a/modular_skyrat/modules/xenos_skyrat_redo/code/xeno_types/rouny.dm +++ b/modular_skyrat/modules/xenos_skyrat_redo/code/xeno_types/rouny.dm @@ -73,7 +73,7 @@ return BULLET_ACT_HIT owner.visible_message(span_danger("[owner] effortlessly dodges the projectile!"), span_userdanger("You dodge the projectile!")) - playsound(get_turf(owner), pick('sound/weapons/bulletflyby.ogg', 'sound/weapons/bulletflyby2.ogg', 'sound/weapons/bulletflyby3.ogg'), 75, TRUE) + playsound(get_turf(owner), pick('sound/items/weapons/bulletflyby.ogg', 'sound/items/weapons/bulletflyby2.ogg', 'sound/items/weapons/bulletflyby3.ogg'), 75, TRUE) owner.add_filter(RUNNER_BLUR_EFFECT, 2, gauss_blur_filter(5)) addtimer(CALLBACK(owner, TYPE_PROC_REF(/datum, remove_filter), RUNNER_BLUR_EFFECT), 0.5 SECONDS) return BULLET_ACT_FORCE_PIERCE diff --git a/modular_zubbers/code/controllers/subsystem/processing/sol_subsystem.dm b/modular_zubbers/code/controllers/subsystem/processing/sol_subsystem.dm index fbd9c7c1bb1..e3f4978d2b4 100644 --- a/modular_zubbers/code/controllers/subsystem/processing/sol_subsystem.dm +++ b/modular_zubbers/code/controllers/subsystem/processing/sol_subsystem.dm @@ -119,9 +119,9 @@ PROCESSING_SUBSYSTEM_DEF(sunlight) if(DANGER_LEVEL_THIRD_WARNING) target.playsound_local(null, 'sound/effects/alert.ogg', 75, TRUE) if(DANGER_LEVEL_SOL_ROSE) - target.playsound_local(null, 'sound/ambience/ambimystery.ogg', 75, TRUE) + target.playsound_local(null, 'sound/ambience/misc/ambimystery.ogg', 75, TRUE) if(DANGER_LEVEL_SOL_ENDED) - target.playsound_local(null, 'sound/misc/ghosty_wind.ogg', 90, TRUE) + target.playsound_local(null, 'sound/music/antag/bloodcult/ghosty_wind.ogg', 90, TRUE) /datum/controller/subsystem/processing/sunlight/proc/is_sufferer(mob/victim) if(!sun_sufferers) diff --git a/modular_zubbers/code/datums/brain_damage/magic.dm b/modular_zubbers/code/datums/brain_damage/magic.dm index 4325f36dd77..0370342fbd4 100644 --- a/modular_zubbers/code/datums/brain_damage/magic.dm +++ b/modular_zubbers/code/datums/brain_damage/magic.dm @@ -166,5 +166,5 @@ to_chat(user, span_warning("Your destination is being watched.")) return to_chat(user, span_notice("You slip unseen through [src].")) - user.playsound_local(null, 'sound/magic/wand_teleport.ogg', 30, FALSE, pressure_affected = FALSE) + user.playsound_local(null, 'sound/effects/magic/wand_teleport.ogg', 30, FALSE, pressure_affected = FALSE) user.forceMove(get_turf(linked_to)) diff --git a/modular_zubbers/code/datums/components/vore/_defines.dm b/modular_zubbers/code/datums/components/vore/_defines.dm index 48c7d797be5..12bac51d73f 100644 --- a/modular_zubbers/code/datums/components/vore/_defines.dm +++ b/modular_zubbers/code/datums/components/vore/_defines.dm @@ -144,22 +144,22 @@ GLOBAL_LIST_INIT(vore_sounds_insert_classic, list( "Squish2" = 'modular_zubbers/sound/vore/squish2.ogg', "Squish3" = 'modular_zubbers/sound/vore/squish3.ogg', "Squish4" = 'modular_zubbers/sound/vore/squish4.ogg', - "Rustle (cloth)" = 'sound/effects/rustle1.ogg', - "Rustle 2 (cloth)" = 'sound/effects/rustle2.ogg', - "Rustle 3 (cloth)" = 'sound/effects/rustle3.ogg', - "Rustle 4 (cloth)" = 'sound/effects/rustle4.ogg', - "Rustle 5 (cloth)" = 'sound/effects/rustle5.ogg', - "Zipper" = 'sound/items/zip.ogg', + "Rustle (cloth)" = 'sound/effects/rustle/rustle1.ogg', + "Rustle 2 (cloth)" = 'sound/effects/rustle/rustle2.ogg', + "Rustle 3 (cloth)" = 'sound/effects/rustle/rustle3.ogg', + "Rustle 4 (cloth)" = 'sound/effects/rustle/rustle4.ogg', + "Rustle 5 (cloth)" = 'sound/effects/rustle/rustle5.ogg', + "Zipper" = 'sound/items/zip/zip.ogg', "None" = null )) GLOBAL_LIST_INIT(vore_sounds_release_classic, list( - "Rustle (cloth)" = 'sound/effects/rustle1.ogg', - "Rustle 2 (cloth)" = 'sound/effects/rustle2.ogg', - "Rustle 3 (cloth)" = 'sound/effects/rustle3.ogg', - "Rustle 4 (cloth)" = 'sound/effects/rustle4.ogg', - "Rustle 5 (cloth)" = 'sound/effects/rustle5.ogg', - "Zipper" = 'sound/items/zip.ogg', + "Rustle (cloth)" = 'sound/effects/rustle/rustle1.ogg', + "Rustle 2 (cloth)" = 'sound/effects/rustle/rustle2.ogg', + "Rustle 3 (cloth)" = 'sound/effects/rustle/rustle3.ogg', + "Rustle 4 (cloth)" = 'sound/effects/rustle/rustle4.ogg', + "Rustle 5 (cloth)" = 'sound/effects/rustle/rustle5.ogg', + "Zipper" = 'sound/items/zip/zip.ogg', "Splatter" = 'sound/effects/splat.ogg', "None" = null )) @@ -177,22 +177,22 @@ GLOBAL_LIST_INIT(vore_sounds_insert_fancy, list( "Squish2" = 'modular_zubbers/sound/vore/sunesound/pred/squish_02.ogg', "Squish3" = 'modular_zubbers/sound/vore/sunesound/pred/squish_03.ogg', "Squish4" = 'modular_zubbers/sound/vore/sunesound/pred/squish_04.ogg', - "Rustle (cloth)" = 'sound/effects/rustle1.ogg', - "Rustle 2 (cloth)" = 'sound/effects/rustle2.ogg', - "Rustle 3 (cloth)" = 'sound/effects/rustle3.ogg', - "Rustle 4 (cloth)" = 'sound/effects/rustle4.ogg', - "Rustle 5 (cloth)" = 'sound/effects/rustle5.ogg', - "Zipper" = 'sound/items/zip.ogg', + "Rustle (cloth)" = 'sound/effects/rustle/rustle1.ogg', + "Rustle 2 (cloth)" = 'sound/effects/rustle/rustle2.ogg', + "Rustle 3 (cloth)" = 'sound/effects/rustle/rustle3.ogg', + "Rustle 4 (cloth)" = 'sound/effects/rustle/rustle4.ogg', + "Rustle 5 (cloth)" = 'sound/effects/rustle/rustle5.ogg', + "Zipper" = 'sound/items/zip/zip.ogg', "None" = null )) GLOBAL_LIST_INIT(vore_sounds_release_fancy, list( - "Rustle (cloth)" = 'sound/effects/rustle1.ogg', - "Rustle 2 (cloth)" = 'sound/effects/rustle2.ogg', - "Rustle 3 (cloth)" = 'sound/effects/rustle3.ogg', - "Rustle 4 (cloth)" = 'sound/effects/rustle4.ogg', - "Rustle 5 (cloth)" = 'sound/effects/rustle5.ogg', - "Zipper" = 'sound/items/zip.ogg', + "Rustle (cloth)" = 'sound/effects/rustle/rustle1.ogg', + "Rustle 2 (cloth)" = 'sound/effects/rustle/rustle2.ogg', + "Rustle 3 (cloth)" = 'sound/effects/rustle/rustle3.ogg', + "Rustle 4 (cloth)" = 'sound/effects/rustle/rustle4.ogg', + "Rustle 5 (cloth)" = 'sound/effects/rustle/rustle5.ogg', + "Zipper" = 'sound/items/zip/zip.ogg', "Stomach Move" = 'modular_zubbers/sound/vore/sunesound/pred/stomachmove.ogg', "Pred Escape" = 'modular_zubbers/sound/vore/sunesound/pred/escape.ogg', "Splatter" = 'sound/effects/splat.ogg', diff --git a/modular_zubbers/code/datums/shuttles/emergency.dm b/modular_zubbers/code/datums/shuttles/emergency.dm index 55c7f0decd3..6aa5633aa5d 100644 --- a/modular_zubbers/code/datums/shuttles/emergency.dm +++ b/modular_zubbers/code/datums/shuttles/emergency.dm @@ -31,7 +31,7 @@ /datum/map_template/shuttle/emergency/lance/New() . = ..() - if(SSmapping.config.map_name == "Moon Station") + if(SSmapping.current_map.map_name == "Moon Station") who_can_purchase = null /datum/map_template/shuttle/emergency/vortex diff --git a/modular_zubbers/code/game/Items/big_bertha_shield.dm b/modular_zubbers/code/game/Items/big_bertha_shield.dm index 75b3c7f9da5..d857bbe8682 100644 --- a/modular_zubbers/code/game/Items/big_bertha_shield.dm +++ b/modular_zubbers/code/game/Items/big_bertha_shield.dm @@ -15,7 +15,7 @@ attack_verb_continuous = list("shoves", "bashes","berthas") attack_verb_simple = list("shove", "bash","bertha") armor_type = /datum/armor/big_bertha - block_sound = 'sound/weapons/block_shield.ogg' + block_sound = 'sound/items/weapons/block_shield.ogg' breakable_by_damage = FALSE item_flags = IMMUTABLE_SLOW | SLOWS_WHILE_IN_HAND slowdown = 2 diff --git a/modular_zubbers/code/game/Items/sec_hailer.dm b/modular_zubbers/code/game/Items/sec_hailer.dm index 28a7b9ddd79..7853b4bcba4 100644 --- a/modular_zubbers/code/game/Items/sec_hailer.dm +++ b/modular_zubbers/code/game/Items/sec_hailer.dm @@ -69,5 +69,5 @@ usr.audible_message("BACKUP REQUESTED!") balloon_alert_to_viewers("Backup Requested!", "Backup Requested!", 7) log_combat(usr, src, "has called for backup") - playsound(usr, 'sound/misc/whistle.ogg', 50, FALSE, 4) + playsound(usr, 'sound/items/whistle/whistle.ogg', 50, FALSE, 4) diff --git a/modular_zubbers/code/game/area/areas/moonstation.dm b/modular_zubbers/code/game/area/areas/moonstation.dm index 0bffdd38152..65a6b319915 100644 --- a/modular_zubbers/code/game/area/areas/moonstation.dm +++ b/modular_zubbers/code/game/area/areas/moonstation.dm @@ -93,7 +93,7 @@ area_flags = UNIQUE_AREA | FLORA_ALLOWED ambience_index = AMBIENCE_ICEMOON sound_environment = SOUND_AREA_ICEMOON - ambient_buzz = 'sound/ambience/magma.ogg' + ambient_buzz = 'sound/ambience/lavaland/magma.ogg' /area/moonstation/surface name = "Lunar Surface" diff --git a/modular_zubbers/code/game/machinery/burger_reactor/reactor.dm b/modular_zubbers/code/game/machinery/burger_reactor/reactor.dm index 8ba8d1e13e8..620083f0c26 100644 --- a/modular_zubbers/code/game/machinery/burger_reactor/reactor.dm +++ b/modular_zubbers/code/game/machinery/burger_reactor/reactor.dm @@ -202,12 +202,12 @@ return FALSE stored_rod.forceMove(T) stored_rod.throw_at(get_edge_target_turf(src,pick(GLOB.alldirs)),rand(3,6),5) - playsound(src, 'sound/weapons/gun/general/grenade_launch.ogg', 50, TRUE, extrarange = -3) + playsound(src, 'sound/items/weapons/gun/general/grenade_launch.ogg', 50, TRUE, extrarange = -3) else if(jammed) return FALSE stored_rod.forceMove(T) - playsound(src, 'sound/weapons/gun/shotgun/insert_shell.ogg', 50, TRUE, frequency = -1, extrarange = -3) + playsound(src, 'sound/items/weapons/gun/shotgun/insert_shell.ogg', 50, TRUE, frequency = -1, extrarange = -3) stored_rod = null update_appearance(UPDATE_ICON) if(user) @@ -224,7 +224,7 @@ stored_rod = desired_rod update_appearance(UPDATE_ICON) START_PROCESSING(SSmachines, src) - playsound(src, 'sound/weapons/gun/shotgun/insert_shell.ogg', 50, TRUE, frequency = 1, extrarange = -3) + playsound(src, 'sound/items/weapons/gun/shotgun/insert_shell.ogg', 50, TRUE, frequency = 1, extrarange = -3) if(user) user.log_message("inserted a rod into [src]", LOG_GAME) investigate_log("had a rod inserted by [key_name(user)] at [AREACOORD(src)].", INVESTIGATE_ENGINE) diff --git a/modular_zubbers/code/game/machinery/crew_monitor.dm b/modular_zubbers/code/game/machinery/crew_monitor.dm index 4d935160c68..ca457e04600 100644 --- a/modular_zubbers/code/game/machinery/crew_monitor.dm +++ b/modular_zubbers/code/game/machinery/crew_monitor.dm @@ -33,7 +33,7 @@ update_appearance() set_light(l_range = 1.9, l_power = 5, l_color = CIRCUIT_COLOR_SECURITY, l_on = TRUE) if(COOLDOWN_FINISHED(src, alarm_cooldown)) - playsound(source = src, soundin = 'sound/machines/twobeep.ogg', vol = 50, vary = TRUE) + playsound(source = src, soundin = 'sound/machines/beep/twobeep.ogg', vol = 50, vary = TRUE) spasm_animation(1 SECONDS) COOLDOWN_START(src, alarm_cooldown, ALARM_PERIOD) else diff --git a/modular_zubbers/code/game/objects/effects/spawners/random/moonstation_random.dm b/modular_zubbers/code/game/objects/effects/spawners/random/moonstation_random.dm index 47744e9f38e..2043d6905ce 100644 --- a/modular_zubbers/code/game/objects/effects/spawners/random/moonstation_random.dm +++ b/modular_zubbers/code/game/objects/effects/spawners/random/moonstation_random.dm @@ -195,9 +195,9 @@ icon_state = "random_vending" loot = list( /obj/machinery/vending/assist = 400, - /obj/machinery/vending/autodrobe/all_access = 200, + /obj/machinery/vending/autodrobe = 200, /obj/machinery/vending/barbervend = 50, - /obj/machinery/vending/boozeomat/all_access = 100, + /obj/machinery/vending/boozeomat = 100, /obj/machinery/vending/cigarette = 50, /obj/machinery/vending/cigarette/beach = 25, /obj/machinery/vending/cigarette/syndicate = 10, diff --git a/modular_zubbers/code/game/objects/items/more_pkas.dm b/modular_zubbers/code/game/objects/items/more_pkas.dm index 7112a8266f9..d7f6623cc76 100644 --- a/modular_zubbers/code/game/objects/items/more_pkas.dm +++ b/modular_zubbers/code/game/objects/items/more_pkas.dm @@ -116,13 +116,13 @@ projectile_type = /obj/projectile/kinetic/railgun select_name = "kinetic" e_cost = LASER_SHOTS(1, STANDARD_CELL_CHARGE * 0.5) - fire_sound = 'sound/weapons/beam_sniper.ogg' + fire_sound = 'sound/items/weapons/beam_sniper.ogg' /obj/item/ammo_casing/energy/kinetic/repeater projectile_type = /obj/projectile/kinetic/repeater select_name = "kinetic" e_cost = LASER_SHOTS(1, STANDARD_CELL_CHARGE * 0.15) //about three shots - fire_sound = 'sound/weapons/kinetic_accel.ogg' + fire_sound = 'sound/items/weapons/kinetic_accel.ogg' /obj/item/ammo_casing/energy/kinetic/shotgun projectile_type = /obj/projectile/kinetic/shotgun @@ -130,13 +130,13 @@ e_cost = LASER_SHOTS(1, STANDARD_CELL_CHARGE * 0.5) pellets = 3 variance = 50 - fire_sound = 'sound/weapons/kinetic_accel.ogg' + fire_sound = 'sound/items/weapons/kinetic_accel.ogg' /obj/item/ammo_casing/energy/kinetic/glock projectile_type = /obj/projectile/kinetic/glock select_name = "kinetic" e_cost = LASER_SHOTS(1, STANDARD_CELL_CHARGE * 0.5) - fire_sound = 'sound/weapons/kinetic_accel.ogg' + fire_sound = 'sound/items/weapons/kinetic_accel.ogg' /obj/item/ammo_casing/energy/kinetic/shockwave projectile_type = /obj/projectile/kinetic/shockwave @@ -144,13 +144,13 @@ e_cost = LASER_SHOTS(1, STANDARD_CELL_CHARGE * 0.5) pellets = 8 variance = 360 - fire_sound = 'sound/weapons/gun/general/cannon.ogg' + fire_sound = 'sound/items/weapons/gun/general/cannon.ogg' /obj/item/ammo_casing/energy/kinetic/m79 projectile_type = /obj/projectile/bullet/mining_bomb //uses the mining bomb projectile from the mining modsuit select_name = "kinetic" e_cost = LASER_SHOTS(1, STANDARD_CELL_CHARGE * 0.5) - fire_sound = 'sound/weapons/gun/general/grenade_launch.ogg' + fire_sound = 'sound/items/weapons/gun/general/grenade_launch.ogg' //Accelerator Projectiles /obj/projectile/kinetic/railgun diff --git a/modular_zubbers/code/game/objects/items/plushes.dm b/modular_zubbers/code/game/objects/items/plushes.dm index feb1321adf0..6becb736b0e 100644 --- a/modular_zubbers/code/game/objects/items/plushes.dm +++ b/modular_zubbers/code/game/objects/items/plushes.dm @@ -4,7 +4,7 @@ icon = 'modular_zubbers/icons/obj/toys/plushes.dmi' icon_state = "chaotic_toaster" attack_verb_simple = list("beeped", "booped", "pinged") - squeak_override = list('sound/machines/beep.ogg' = 1) + squeak_override = list('sound/machines/beep/beep.ogg' = 1) /obj/item/toy/plush/Synth name = "Synth plushie" @@ -32,7 +32,7 @@ icon_state = "chirp"//Sprited by Kan3/kaylexi attack_verb_continuous = list("chirps", "chimes") attack_verb_simple = list("chirps") - squeak_override = list('sound/machines/beep.ogg' = 1) + squeak_override = list('sound/machines/beep/beep.ogg' = 1) gender = FEMALE /obj/item/toy/plush/bigdeer @@ -85,7 +85,7 @@ desc = "A cute rendition of the notorious xenomorph. Its stuffing is an acidic green colour." icon = 'modular_zubbers/icons/obj/toys/plushes.dmi' icon_state = "xenoplush" - squeak_override = list('sound/voice/hiss6.ogg' = 1) + squeak_override = list('sound/mobs/non-humanoids/hiss/hiss6.ogg' = 1) lefthand_file = 'modular_zubbers/icons/mob/inhands/items/plushes_lefthand.dmi' righthand_file = 'modular_zubbers/icons/mob/inhands/items/plushes_righthand.dmi' inhand_icon_state = "xenoplush" @@ -121,7 +121,7 @@ icon_state = "blovyplushie" attack_verb_continuous = list("blorbles", "slimes", "absorbs") attack_verb_simple = list("blorble", "slime", "absorb") - squeak_override = list('sound/effects/blobattack.ogg' = 1) + squeak_override = list('sound/effects/blob/blobattack.ogg' = 1) /obj/item/toy/plush/tunafish name = "Piscene Paddle" //Donator plush for Astroturf, sprited by Crumpaloo @@ -130,7 +130,7 @@ icon_state = "tunafish" attack_verb_continuous = list("slaps", "whacks") attack_verb_simple = list("slap", "whack") - squeak_override = list('sound/weapons/slap.ogg' = 1) + squeak_override = list('sound/items/weapons/slap.ogg' = 1) lefthand_file = 'modular_zubbers/icons/mob/inhands/items/plushes_lefthand.dmi' righthand_file = 'modular_zubbers/icons/mob/inhands/items/plushes_righthand.dmi' inhand_icon_state = "tunafish" @@ -142,7 +142,7 @@ icon_state = "secoff" attack_verb_continuous = list("shoots (and misses)", "batongs", "annoys", "harmbatons", "magdumps") attack_verb_simple = list("shot (and missed)", "batong", "annoy", "harmbaton", "magdump") - squeak_override = list('sound/weapons/gun/general/bolt_rack.ogg' = 1) + squeak_override = list('sound/items/weapons/gun/general/bolt_rack.ogg' = 1) /obj/item/toy/plush/cescrewsplush name = "Chief Screws Plush" //Plush for Steals The Screwdriver/SteamStucKobold, sprited by stickygoat. and Amorbis @@ -162,4 +162,4 @@ attack_verb_continuous = list("baps", "paws", "claws") attack_verb_simple = list("bap", "paw", "claw") gender = MALE - squeak_override = list('sound/creatures/dog/growl2.ogg' = 1) + squeak_override = list('sound/mobs/non-humanoids/dog/growl2.ogg' = 1) diff --git a/modular_zubbers/code/game/objects/structures/trash_pile.dm b/modular_zubbers/code/game/objects/structures/trash_pile.dm index c85889ecc44..2d3b2ed760e 100644 --- a/modular_zubbers/code/game/objects/structures/trash_pile.dm +++ b/modular_zubbers/code/game/objects/structures/trash_pile.dm @@ -27,27 +27,27 @@ 'sound/effects/footstep/clownstep1.ogg' = 5, 'sound/effects/footstep/clownstep2.ogg' = 5, 'sound/effects/footstep/meowstep1.ogg' = 1, - 'sound/effects/attackblob.ogg' = 10, + 'sound/effects/blob/attackblob.ogg' = 10, 'sound/effects/bang.ogg' = 10, - 'sound/effects/bin_close.ogg' = 20, - 'sound/effects/bin_open.ogg' = 20, + 'sound/effects/bin/bin_close.ogg' = 20, + 'sound/effects/bin/bin_open.ogg' = 20, 'sound/effects/boing.ogg' = 5, - 'sound/effects/cartoon_splat.ogg' = 1, + 'sound/effects/cartoon_sfx/cartoon_splat.ogg' = 1, 'sound/effects/cashregister.ogg' = 1, - 'sound/effects/glassbash.ogg' = 50, - 'sound/effects/glassbr1.ogg' = 20, - 'sound/effects/glassbr2.ogg' = 20, - 'sound/effects/glassbr3.ogg' = 20, + 'sound/effects/glass/glassbash.ogg' = 50, + 'sound/effects/glass/glassbr1.ogg' = 20, + 'sound/effects/glass/glassbr2.ogg' = 20, + 'sound/effects/glass/glassbr3.ogg' = 20, 'sound/effects/grillehit.ogg' = 20, 'sound/effects/hit_on_shattered_glass.ogg' = 20, 'sound/effects/jingle.ogg' = 50, 'sound/effects/meatslap.ogg' = 50, 'sound/effects/quack.ogg' = 20, - 'sound/effects/rustle1.ogg' = 100, - 'sound/effects/rustle2.ogg' = 100, - 'sound/effects/rustle3.ogg' = 100, - 'sound/effects/rustle4.ogg' = 100, - 'sound/effects/rustle5.ogg' = 100, + 'sound/effects/rustle/rustle1.ogg' = 100, + 'sound/effects/rustle/rustle2.ogg' = 100, + 'sound/effects/rustle/rustle3.ogg' = 100, + 'sound/effects/rustle/rustle4.ogg' = 100, + 'sound/effects/rustle/rustle5.ogg' = 100, ) /obj/structure/trash_pile/Destroy() @@ -89,7 +89,7 @@ user.visible_message("[user] searches through \the [src]...", span_notice("You search through \the [src]...")) - playsound(get_turf(src), pick('sound/effects/rustle1.ogg','sound/effects/rustle2.ogg','sound/effects/rustle3.ogg','sound/effects/rustle4.ogg','sound/effects/rustle5.ogg'), 50) + playsound(get_turf(src), pick('sound/effects/rustle/rustle1.ogg','sound/effects/rustle/rustle2.ogg','sound/effects/rustle/rustle3.ogg','sound/effects/rustle/rustle4.ogg','sound/effects/rustle/rustle5.ogg'), 50) var/content_length = length(contents) if(content_length) //Something hidden inside (mob/item) @@ -210,7 +210,7 @@ spawned_item = new spawned_item(T) var/turf/throw_at = get_ranged_target_turf_direct(src, user, 7, rand(-60,60)) if(spawned_item.safe_throw_at(throw_at, rand(2,4), rand(1,3), user, spin = TRUE)) - playsound(T, 'sound/weapons/punchmiss.ogg', 10) + playsound(T, 'sound/items/weapons/punchmiss.ogg', 10) if(COOLDOWN_FINISHED(src,funny_sound_cooldown)) COOLDOWN_START(src, funny_sound_cooldown, funny_sound_delay*0.5 + rand()*funny_sound_delay) // x0.5 to x1.5 diff --git a/modular_zubbers/code/game/traits/neutral.dm b/modular_zubbers/code/game/traits/neutral.dm index 681e5e439f9..21c88731b52 100644 --- a/modular_zubbers/code/game/traits/neutral.dm +++ b/modular_zubbers/code/game/traits/neutral.dm @@ -24,7 +24,7 @@ message_admins("[holder] has died with DNR trait & element, releasing job slot in 60 seconds.") /datum/element/dnr/proc/cleanup(mob/living/holder) // What if they gib, though? - var/datum/job/job_to_free = SSjob.GetJob(holder.mind.assigned_role.title) + var/datum/job/job_to_free = SSjob.get_job(holder.mind.assigned_role.title) job_to_free.current_positions-- holder.log_message("has been released via their current body via DNR trait - ([holder])", LOG_GAME, color = COLOR_GREEN) holder.mind = null diff --git a/modular_zubbers/code/modules/alt_anomaly_refinery/anomaly_refinery.dm b/modular_zubbers/code/modules/alt_anomaly_refinery/anomaly_refinery.dm index ff609dbee84..4475cb77906 100644 --- a/modular_zubbers/code/modules/alt_anomaly_refinery/anomaly_refinery.dm +++ b/modular_zubbers/code/modules/alt_anomaly_refinery/anomaly_refinery.dm @@ -58,7 +58,7 @@ playsound( src, - pick('sound/effects/explosion1.ogg','sound/effects/explosion2.ogg','sound/effects/explosion3.ogg'), + pick('sound/effects/explosion/explosion1.ogg','sound/effects/explosion/explosion2.ogg','sound/effects/explosion/explosion3.ogg'), 50 ) diff --git a/modular_zubbers/code/modules/antagonists/bloodsucker/bloodsuckers/life.dm b/modular_zubbers/code/modules/antagonists/bloodsucker/bloodsuckers/life.dm index b816fe21815..4c70d8b7d10 100644 --- a/modular_zubbers/code/modules/antagonists/bloodsucker/bloodsuckers/life.dm +++ b/modular_zubbers/code/modules/antagonists/bloodsucker/bloodsuckers/life.dm @@ -198,7 +198,7 @@ var/obj/item/bodypart/missing_bodypart = user.get_bodypart(missing_limb) // 2) Limb returns Damaged missing_bodypart.brute_dam = missing_bodypart.max_damage to_chat(user, span_notice("Your flesh knits as it regrows your [missing_bodypart]!")) - playsound(user, 'sound/magic/demon_consume.ogg', 50, TRUE) + playsound(user, 'sound/effects/magic/demon_consume.ogg', 50, TRUE) return TRUE /* diff --git a/modular_zubbers/code/modules/antagonists/bloodsucker/bloodsuckers/objectives.dm b/modular_zubbers/code/modules/antagonists/bloodsucker/bloodsuckers/objectives.dm index f8022e52ed5..c7aabe42c5d 100644 --- a/modular_zubbers/code/modules/antagonists/bloodsucker/bloodsuckers/objectives.dm +++ b/modular_zubbers/code/modules/antagonists/bloodsucker/bloodsuckers/objectives.dm @@ -44,11 +44,11 @@ ghoul_job = bloodsucker_ghouls.owner.assigned_role // Mob Assigned else if(bloodsucker_ghouls.owner?.current?.job) - ghoul_job = SSjob.GetJob(bloodsucker_ghouls.owner.current.job) + ghoul_job = SSjob.get_job(bloodsucker_ghouls.owner.current.job) // PDA Assigned else if(bloodsucker_ghouls.owner?.current && ishuman(bloodsucker_ghouls.owner.current)) var/mob/living/carbon/human/ghoul = bloodsucker_ghouls.owner.current - ghoul_job = SSjob.GetJob(ghoul.get_assignment()) + ghoul_job = SSjob.get_job(ghoul.get_assignment()) if(ghoul_job) all_ghoul_jobs += ghoul_job return all_ghoul_jobs diff --git a/modular_zubbers/code/modules/antagonists/bloodsucker/clans/clan.dm b/modular_zubbers/code/modules/antagonists/bloodsucker/clans/clan.dm index 2c02cff3337..0a8232b8212 100644 --- a/modular_zubbers/code/modules/antagonists/bloodsucker/clans/clan.dm +++ b/modular_zubbers/code/modules/antagonists/bloodsucker/clans/clan.dm @@ -131,7 +131,7 @@ */ /datum/bloodsucker_clan/proc/on_ghoul_made(datum/antagonist/bloodsucker/source, mob/living/user, mob/living/target) SIGNAL_HANDLER - user.playsound_local(null, 'sound/effects/explosion_distant.ogg', 40, TRUE) + user.playsound_local(null, 'sound/effects/explosion/explosion_distant.ogg', 40, TRUE) target.playsound_local(null, 'sound/effects/singlebeat.ogg', 40, TRUE) target.set_timed_status_effect(15 SECONDS, /datum/status_effect/jitter, only_if_higher = TRUE) INVOKE_ASYNC(target, TYPE_PROC_REF(/mob, emote), "laugh") diff --git a/modular_zubbers/code/modules/antagonists/bloodsucker/clans/clan_malkavian.dm b/modular_zubbers/code/modules/antagonists/bloodsucker/clans/clan_malkavian.dm index b2fdccd075b..74ffba7b495 100644 --- a/modular_zubbers/code/modules/antagonists/bloodsucker/clans/clan_malkavian.dm +++ b/modular_zubbers/code/modules/antagonists/bloodsucker/clans/clan_malkavian.dm @@ -26,7 +26,7 @@ carbon_owner.gain_trauma(/datum/brain_trauma/special/bluespace_prophet, TRAUMA_RESILIENCE_ABSOLUTE) owner_datum.owner.current.update_sight() - bloodsuckerdatum.owner.current.playsound_local(get_turf(bloodsuckerdatum.owner.current), 'sound/ambience/antag/creepalert.ogg', 80, FALSE, pressure_affected = FALSE, use_reverb = FALSE) + bloodsuckerdatum.owner.current.playsound_local(get_turf(bloodsuckerdatum.owner.current), 'sound/music/antag/creepalert.ogg', 80, FALSE, pressure_affected = FALSE, use_reverb = FALSE) to_chat(bloodsuckerdatum.owner.current, span_hypnophrase("Welcome to the Malkavian...")) /datum/bloodsucker_clan/malkavian/Destroy(force) diff --git a/modular_zubbers/code/modules/antagonists/bloodsucker/powers/gohome.dm b/modular_zubbers/code/modules/antagonists/bloodsucker/powers/gohome.dm index e4cb64ba901..9f1ebad3c30 100644 --- a/modular_zubbers/code/modules/antagonists/bloodsucker/powers/gohome.dm +++ b/modular_zubbers/code/modules/antagonists/bloodsucker/powers/gohome.dm @@ -114,7 +114,7 @@ for(var/obj/item/literally_everything in owner) owner.dropItemToGround(literally_everything, TRUE) - playsound(current_turf, 'sound/magic/summon_karp.ogg', 60, 1) + playsound(current_turf, 'sound/effects/magic/summon_karp.ogg', 60, 1) var/datum/effect_system/steam_spread/bloodsucker/puff = new /datum/effect_system/steam_spread/bloodsucker() puff.set_up(3, 0, current_turf) diff --git a/modular_zubbers/code/modules/antagonists/bloodsucker/powers/targeted/brawn.dm b/modular_zubbers/code/modules/antagonists/bloodsucker/powers/targeted/brawn.dm index 129d7777cd4..fbcf1362629 100644 --- a/modular_zubbers/code/modules/antagonists/bloodsucker/powers/targeted/brawn.dm +++ b/modular_zubbers/code/modules/antagonists/bloodsucker/powers/targeted/brawn.dm @@ -140,7 +140,7 @@ target_atom.Knockdown(GetKnockdown()) // Attack! owner.balloon_alert(owner, "you punch [target_atom]!") - playsound(get_turf(target_atom), 'sound/weapons/punch4.ogg', 60, 1, -1) + playsound(get_turf(target_atom), 'sound/items/weapons/punch4.ogg', 60, 1, -1) user.do_attack_animation(target_atom, ATTACK_EFFECT_SMASH) var/obj/item/bodypart/affecting = target_atom.get_bodypart(ran_zone(target_atom.zone_selected)) target_atom.apply_damage(hitStrength, BRUTE, affecting) @@ -171,7 +171,7 @@ target.balloon_alert(user, "ability level too low to break open!") return FALSE var/obj/machinery/door/target_airlock = target - playsound(get_turf(user), 'sound/machines/airlock_alien_prying.ogg', 40, TRUE, -1) + playsound(get_turf(user), 'sound/machines/airlock/airlock_alien_prying.ogg', 40, TRUE, -1) owner.balloon_alert(owner, "you prepare to tear open [target_airlock]...") if(!do_after(user, 2.5 SECONDS, target_airlock)) user.balloon_alert(user, "interrupted!") diff --git a/modular_zubbers/code/modules/antagonists/bloodsucker/powers/targeted/haste.dm b/modular_zubbers/code/modules/antagonists/bloodsucker/powers/targeted/haste.dm index b445d4d8a2b..ef8985eec3c 100644 --- a/modular_zubbers/code/modules/antagonists/bloodsucker/powers/targeted/haste.dm +++ b/modular_zubbers/code/modules/antagonists/bloodsucker/powers/targeted/haste.dm @@ -79,7 +79,7 @@ // Go to target turf // DO NOT USE WALK TO. owner.balloon_alert(owner, "you dash into the air!") - playsound(get_turf(owner), 'sound/weapons/punchmiss.ogg', 25, 1, -1) + playsound(get_turf(owner), 'sound/items/weapons/punchmiss.ogg', 25, 1, -1) var/safety = get_dist(user, targeted_turf) * 3 + 1 var/consequetive_failures = 0 active = TRUE diff --git a/modular_zubbers/code/modules/antagonists/bloodsucker/powers/targeted/trespass.dm b/modular_zubbers/code/modules/antagonists/bloodsucker/powers/targeted/trespass.dm index a3753d7e2ba..a1d8eb1328e 100644 --- a/modular_zubbers/code/modules/antagonists/bloodsucker/powers/targeted/trespass.dm +++ b/modular_zubbers/code/modules/antagonists/bloodsucker/powers/targeted/trespass.dm @@ -71,7 +71,7 @@ ) // Effect Origin var/sound_strength = max(60, 70 - level_current * 10) - playsound(get_turf(owner), 'sound/magic/summon_karp.ogg', sound_strength, 1) + playsound(get_turf(owner), 'sound/effects/magic/summon_karp.ogg', sound_strength, 1) var/datum/effect_system/steam_spread/bloodsucker/puff = new /datum/effect_system/steam_spread() puff.set_up(3, 0, my_turf) puff.start() @@ -99,7 +99,7 @@ user.density = 1 user.invisibility = invis_was // Effect Destination - playsound(get_turf(owner), 'sound/magic/summon_karp.ogg', 60, 1) + playsound(get_turf(owner), 'sound/effects/magic/summon_karp.ogg', 60, 1) puff = new /datum/effect_system/steam_spread/() puff.effect_type = /obj/effect/particle_effect/fluid/smoke/vampsmoke puff.set_up(3, 0, target_turf) diff --git a/modular_zubbers/code/modules/antagonists/bloodsucker/powers/tremere/auspex.dm b/modular_zubbers/code/modules/antagonists/bloodsucker/powers/tremere/auspex.dm index 96d655fc586..ef46427144a 100644 --- a/modular_zubbers/code/modules/antagonists/bloodsucker/powers/tremere/auspex.dm +++ b/modular_zubbers/code/modules/antagonists/bloodsucker/powers/tremere/auspex.dm @@ -93,8 +93,8 @@ if(!can_pay_blood(blood_cost)) owner.balloon_alert(owner, "not enough blood!") return - playsound(user, 'sound/magic/summon_karp.ogg', 60) - playsound(targeted_turf, 'sound/magic/summon_karp.ogg', 60) + playsound(user, 'sound/effects/magic/summon_karp.ogg', 60) + playsound(targeted_turf, 'sound/effects/magic/summon_karp.ogg', 60) new /obj/effect/particle_effect/fluid/smoke/vampsmoke(user.drop_location()) new /obj/effect/particle_effect/fluid/smoke/vampsmoke(targeted_turf) diff --git a/modular_zubbers/code/modules/antagonists/bloodsucker/powers/tremere/thaumaturgy.dm b/modular_zubbers/code/modules/antagonists/bloodsucker/powers/tremere/thaumaturgy.dm index 360adde66de..a89993401fe 100644 --- a/modular_zubbers/code/modules/antagonists/bloodsucker/powers/tremere/thaumaturgy.dm +++ b/modular_zubbers/code/modules/antagonists/bloodsucker/powers/tremere/thaumaturgy.dm @@ -174,7 +174,7 @@ handle_shot(user, target) pay_cost(THAUMATURGY_BLOOD_COST_PER_CHARGE) - playsound(user, 'sound/magic/wand_teleport.ogg', 60, TRUE) + playsound(user, 'sound/effects/magic/wand_teleport.ogg', 60, TRUE) charges -= 1 build_all_button_icons(UPDATE_BUTTON_STATUS) if(charges <= 0) diff --git a/modular_zubbers/code/modules/antagonists/bloodsucker/powers/veil.dm b/modular_zubbers/code/modules/antagonists/bloodsucker/powers/veil.dm index 73a5fe6ca45..18f064b3f07 100644 --- a/modular_zubbers/code/modules/antagonists/bloodsucker/powers/veil.dm +++ b/modular_zubbers/code/modules/antagonists/bloodsucker/powers/veil.dm @@ -147,7 +147,7 @@ // CAST EFFECT // General effect (poof, splat, etc) when you cast. Doesn't happen automatically! /datum/action/cooldown/bloodsucker/veil/proc/cast_effect() // Effect - playsound(get_turf(owner), 'sound/magic/smoke.ogg', 20, 1) + playsound(get_turf(owner), 'sound/effects/magic/smoke.ogg', 20, 1) var/datum/effect_system/steam_spread/bloodsucker/puff = new /datum/effect_system/steam_spread/() puff.set_up(3, 0, get_turf(owner)) puff.attach(owner) //OPTIONAL diff --git a/modular_zubbers/code/modules/antagonists/bloodsucker/structures/coffin.dm b/modular_zubbers/code/modules/antagonists/bloodsucker/structures/coffin.dm index 54fa2d893b3..91866465693 100644 --- a/modular_zubbers/code/modules/antagonists/bloodsucker/structures/coffin.dm +++ b/modular_zubbers/code/modules/antagonists/bloodsucker/structures/coffin.dm @@ -202,7 +202,7 @@ update_icon() locked = FALSE return TRUE - playsound(get_turf(src), 'sound/machines/door_locked.ogg', 20, 1) + playsound(get_turf(src), 'sound/machines/door/door_locked.ogg', 20, 1) to_chat(user, span_notice("[src] appears to be locked tight from the inside.")) /obj/structure/closet/crate/coffin/close(mob/living/user) diff --git a/modular_zubbers/code/modules/antagonists/bloodsucker/structures/crypt.dm b/modular_zubbers/code/modules/antagonists/bloodsucker/structures/crypt.dm index 71b22cb0d2c..f49ad794ff1 100644 --- a/modular_zubbers/code/modules/antagonists/bloodsucker/structures/crypt.dm +++ b/modular_zubbers/code/modules/antagonists/bloodsucker/structures/crypt.dm @@ -39,7 +39,7 @@ /obj/structure/bloodsucker/attackby(obj/item/item, mob/living/user, params) /// If a Bloodsucker tries to wrench it in place, yell at them. if(item.tool_behaviour == TOOL_WRENCH && !anchored && IS_BLOODSUCKER(user)) - user.playsound_local(null, 'sound/machines/buzz-sigh.ogg', 40, FALSE, pressure_affected = FALSE) + user.playsound_local(null, 'sound/machines/buzz/buzz-sigh.ogg', 40, FALSE, pressure_affected = FALSE) to_chat(user, span_announce("* Bloodsucker Tip: Examine Bloodsucker structures to understand how they function!")) return return ..() @@ -66,7 +66,7 @@ return FALSE switch(secure_response) if("Yes") - user.playsound_local(null, 'sound/items/ratchet.ogg', 70, FALSE, pressure_affected = FALSE) + user.playsound_local(null, 'sound/items/tools/ratchet.ogg', 70, FALSE, pressure_affected = FALSE) bolt(user) return FALSE return FALSE diff --git a/modular_zubbers/code/modules/antagonists/bloodsucker/structures/objects.dm b/modular_zubbers/code/modules/antagonists/bloodsucker/structures/objects.dm index d486bb014f8..aab7f08db81 100644 --- a/modular_zubbers/code/modules/antagonists/bloodsucker/structures/objects.dm +++ b/modular_zubbers/code/modules/antagonists/bloodsucker/structures/objects.dm @@ -116,7 +116,7 @@ righthand_file = 'modular_zubbers/icons/mob/inhands/weapons/bloodsucker_righthand.dmi' slot_flags = ITEM_SLOT_POCKETS w_class = WEIGHT_CLASS_SMALL - hitsound = 'sound/weapons/bladeslice.ogg' + hitsound = 'sound/items/weapons/bladeslice.ogg' attack_verb_continuous = list("staked", "stabbed", "tore into") attack_verb_simple = list("staked", "stabbed", "tore into") sharpness = SHARP_EDGED @@ -153,7 +153,7 @@ return to_chat(user, span_notice("You put all your weight into embedding the stake into [target]'s chest...")) - playsound(user, 'sound/magic/Demon_consume.ogg', 50, 1) + playsound(user, 'sound/effects/magic/Demon_consume.ogg', 50, 1) if(!do_after(user, staketime, target, extra_checks = CALLBACK(target, TYPE_PROC_REF(/mob/living/carbon, can_be_staked)))) // user / target / time / uninterruptable / show progress bar / extra checks return // Drop & Embed Stake diff --git a/modular_zubbers/code/modules/antagonists/bloodsucker/vassal/vassal_datum.dm b/modular_zubbers/code/modules/antagonists/bloodsucker/vassal/vassal_datum.dm index 5a0f7b93752..677dc11cad0 100644 --- a/modular_zubbers/code/modules/antagonists/bloodsucker/vassal/vassal_datum.dm +++ b/modular_zubbers/code/modules/antagonists/bloodsucker/vassal/vassal_datum.dm @@ -149,11 +149,11 @@ to_chat(owner, span_userdanger("You are now the mortal servant of [master.owner.current], a Bloodsucker!")) to_chat(owner, span_boldannounce("The power of [master.owner.current.p_their()] immortal blood compels you to obey [master.owner.current.p_them()] in all things, even offering your own life to prolong theirs.\n\ You are not required to obey any other Bloodsucker, for only [master.owner.current] is your master. The laws of Nanotrasen do not apply to you now; only your vampiric master's word must be obeyed.")) - owner.current.playsound_local(null, 'sound/magic/mutate.ogg', 100, FALSE, pressure_affected = FALSE) + owner.current.playsound_local(null, 'sound/effects/magic/mutate.ogg', 100, FALSE, pressure_affected = FALSE) antag_memory += "You, becoming the mortal servant of [master.owner.current], a bloodsucking vampire!
" /// Message told to your Master. to_chat(master.owner, span_userdanger("[owner.current] has become addicted to your immortal blood. [capitalize(owner.current.p_they(TRUE))] [owner.current.p_are()] now your mortal servant!")) - master.owner.current.playsound_local(null, 'sound/magic/mutate.ogg', 100, FALSE, pressure_affected = FALSE) + master.owner.current.playsound_local(null, 'sound/effects/magic/mutate.ogg', 100, FALSE, pressure_affected = FALSE) /datum/antagonist/ghoul/farewell() if(silent) @@ -163,7 +163,7 @@ span_deconversion_message("[owner.current]'s eyes dart feverishly from side to side, and then stop. [owner.current.p_they(TRUE)] seem[owner.current.p_s()] calm, \ like [owner.current.p_they()] [owner.current.p_have()] regained some lost part of [owner.current.p_them()]self."), \ span_deconversion_message("With a snap, you are no longer enslaved to [master.owner]! You breathe in heavily, having regained your free will.")) - owner.current.playsound_local(null, 'sound/magic/mutate.ogg', 100, FALSE, pressure_affected = FALSE) + owner.current.playsound_local(null, 'sound/effects/magic/mutate.ogg', 100, FALSE, pressure_affected = FALSE) /// Message told to your (former) Master. if(master && master.owner) to_chat(master.owner, span_cult_bold("You feel the bond with your ghoul [owner.current] has somehow been broken!")) diff --git a/modular_zubbers/code/modules/antagonists/bloodsucker/vassal/vassal_procs.dm b/modular_zubbers/code/modules/antagonists/bloodsucker/vassal/vassal_procs.dm index ed53cf473b4..08151ba4ee9 100644 --- a/modular_zubbers/code/modules/antagonists/bloodsucker/vassal/vassal_procs.dm +++ b/modular_zubbers/code/modules/antagonists/bloodsucker/vassal/vassal_procs.dm @@ -74,4 +74,4 @@ //send alerts of completion to_chat(master, span_danger("You have turned [ghoul_owner.current] into your [ghouldatum.name]! They will no longer be deconverted upon Mindshielding!")) to_chat(ghoul_owner, span_notice("As Blood drips over your body, you feel closer to your Master... You are now the [ghouldatum.name]!")) - ghoul_owner.current.playsound_local(null, 'sound/magic/mutate.ogg', 75, FALSE, pressure_affected = FALSE) + ghoul_owner.current.playsound_local(null, 'sound/effects/magic/mutate.ogg', 75, FALSE, pressure_affected = FALSE) diff --git a/modular_zubbers/code/modules/antagonists/malf/remove_malf.dm b/modular_zubbers/code/modules/antagonists/malf/remove_malf.dm index a2587ec072a..b1b96275555 100644 --- a/modular_zubbers/code/modules/antagonists/malf/remove_malf.dm +++ b/modular_zubbers/code/modules/antagonists/malf/remove_malf.dm @@ -5,7 +5,7 @@ if(action == ANTIVIRUS) if(!occupier?.stat) to_chat(usr, span_notice("Dr. Moffson Antivirus is scanning your AI for corruption.")) - playsound(src, 'sound/machines/terminal_prompt_confirm.ogg', 25, FALSE) + playsound(src, 'sound/machines/terminal/terminal_prompt_confirm.ogg', 25, FALSE) restoring = TRUE run_antivirus() occupier.notify_revival("Dr. Moffson is debugging your programming!", source = src) @@ -44,7 +44,7 @@ return TRUE else say("I/O error in attempt to remove malicious files. Please try again later.") - playsound(occupier, 'sound/machines/buzz-two.ogg') + playsound(occupier, 'sound/machines/buzz/buzz-two.ogg') restoring = FALSE return FALSE @@ -54,7 +54,7 @@ . = ..() if(action == ANTIVIRUS) to_chat(usr, span_notice("Dr. Moffson Antivirus is scanning your AI for corruption.")) - playsound(src, 'sound/machines/terminal_prompt_confirm.ogg', 25, FALSE) + playsound(src, 'sound/machines/terminal/terminal_prompt_confirm.ogg', 25, FALSE) restoring = TRUE run_antivirus() . = TRUE @@ -93,7 +93,7 @@ return TRUE else computer.say("I/O error in attempt to remove malicious files. Please try again later.") - playsound(bad_ai, 'sound/machines/buzz-two.ogg') + playsound(bad_ai, 'sound/machines/buzz/buzz-two.ogg') restoring = FALSE return FALSE diff --git a/modular_zubbers/code/modules/antagonists/modglue.dm b/modular_zubbers/code/modules/antagonists/modglue.dm index d6dd3a22613..93fa29a0218 100644 --- a/modular_zubbers/code/modules/antagonists/modglue.dm +++ b/modular_zubbers/code/modules/antagonists/modglue.dm @@ -97,7 +97,7 @@ i.loc = get_turf(src) var/turf/throw_at = get_ranged_target_turf_direct(src, usr, 7, rand(-60,60)) if(i.safe_throw_at(throw_at, rand(2,4), rand(1,3), usr, spin = TRUE)) - playsound(i, 'sound/weapons/punchmiss.ogg', 10) + playsound(i, 'sound/items/weapons/punchmiss.ogg', 10) return TRUE diff --git a/modular_zubbers/code/modules/arcades/code/loot/arcade_weights_classic.dm b/modular_zubbers/code/modules/arcades/code/loot/arcade_weights_classic.dm index 90d882b6ac1..f1c0bb73772 100644 --- a/modular_zubbers/code/modules/arcades/code/loot/arcade_weights_classic.dm +++ b/modular_zubbers/code/modules/arcades/code/loot/arcade_weights_classic.dm @@ -98,11 +98,11 @@ GLOBAL_LIST_INIT(arcade_prize_pool_classic, list( /obj/item/grenade/chem_grenade/glitter/white = 1, ) = 100, list( - /obj/item/gun/ballistic/automatic/toy/unrestricted = 50, + /obj/item/gun/ballistic/automatic/toy = 50, /obj/item/gun/ballistic/automatic/pistol/toy = 75, /obj/item/gun/ballistic/automatic/l6_saw/toy/unrestricted = 25, /obj/item/gun/ballistic/shotgun/toy/crossbow = 100, - /obj/item/gun/ballistic/shotgun/toy/unrestricted = 100, + /obj/item/gun/ballistic/shotgun/toy/riot = 100, /obj/item/gun/energy/laser/practice = 10 ) = 50, list( diff --git a/modular_zubbers/code/modules/arcades/code/minesweeper/minesweeper.dm b/modular_zubbers/code/modules/arcades/code/minesweeper/minesweeper.dm index d204d837219..caf6c753345 100644 --- a/modular_zubbers/code/modules/arcades/code/minesweeper/minesweeper.dm +++ b/modular_zubbers/code/modules/arcades/code/minesweeper/minesweeper.dm @@ -176,7 +176,7 @@ playsound(user, 'modular_zubbers/sound/arcade/minesweeper_emag1.ogg', 100, 0, extrarange = 3, falloff_exponent = 10) else //Can't let you do that, star fox! to_chat(user, span_warning("The machine buzzes and sparks... the game has been reset!")) - playsound(user, 'sound/machines/buzz-sigh.ogg', 100, 0, extrarange = 3, falloff_exponent = 10) //Loud buzz + playsound(user, 'sound/machines/buzz/buzz-sigh.ogg', 100, 0, extrarange = 3, falloff_exponent = 10) //Loud buzz board.game_status = MINESWEEPER_IDLE diff --git a/modular_zubbers/code/modules/blooper/bark_list.dm b/modular_zubbers/code/modules/blooper/bark_list.dm index 6702fee9f01..902918d5a87 100644 --- a/modular_zubbers/code/modules/blooper/bark_list.dm +++ b/modular_zubbers/code/modules/blooper/bark_list.dm @@ -31,13 +31,13 @@ /datum/blooper/squeaky name = "Squeaky" id = "squeak" - soundpath = 'sound/items/toysqueak1.ogg' + soundpath = 'sound/items/toy_squeak/toysqueak1.ogg' maxspeed = 4 /datum/blooper/beep name = "Beepy" id = "beep" - soundpath = 'sound/machines/terminal_select.ogg' + soundpath = 'sound/machines/terminal/terminal_select.ogg' maxpitch = 1 //Bringing the pitch higher just hurts your ears :< maxspeed = 4 //This soundbyte's too short for larger speeds to not sound awkward @@ -55,13 +55,13 @@ /datum/blooper/synthetic name = "Synthetic (Normal)" id = "synth" - soundpath = 'sound/machines/uplinkerror.ogg' + soundpath = 'sound/machines/uplink/uplinkerror.ogg' /datum/blooper/bullet name = "Windy" id = "bullet" maxpitch = 1.6 - soundpath = 'sound/weapons/bulletflyby.ogg' + soundpath = 'sound/items/weapons/bulletflyby.ogg' /datum/blooper/coggers name = "Brassy" diff --git a/modular_zubbers/code/modules/cargo/expressconsole.dm b/modular_zubbers/code/modules/cargo/expressconsole.dm index 2340b562ab7..b2d0c069d01 100644 --- a/modular_zubbers/code/modules/cargo/expressconsole.dm +++ b/modular_zubbers/code/modules/cargo/expressconsole.dm @@ -24,7 +24,7 @@ COMPANY_NAME_BLACKSTEEL_FOUNDATION, COMPANY_NAME_NAKAMURA_ENGINEERING_MODSUITS ) - podType = /obj/structure/closet/supplypod/bluespacepod + pod_type = /obj/structure/closet/supplypod/bluespacepod /obj/machinery/computer/cargo/express/interdyne/emag_act(mob/user, obj/item/card/emag/emag_card) if(user) @@ -53,7 +53,7 @@ /obj/machinery/computer/cargo/express/interdyne/ui_act(action, params, datum/tgui/ui) if(action == "add")//if we're generating a supply order - if (!beacon || !usingBeacon)//if not using beacon + if (!beacon || !using_beacon)//if not using beacon say("Error! Destination is not whitelisted, aborting.") return var/id = params["id"] diff --git a/modular_zubbers/code/modules/changeling_zombies/infection.dm b/modular_zubbers/code/modules/changeling_zombies/infection.dm index a129f86748c..b89c78182b1 100644 --- a/modular_zubbers/code/modules/changeling_zombies/infection.dm +++ b/modular_zubbers/code/modules/changeling_zombies/infection.dm @@ -84,7 +84,7 @@ GLOBAL_VAR_INIT(changeling_zombies_detected,FALSE) if(parent) var/mob/living/carbon/human/host = parent if(zombified) - playsound(parent, 'sound/magic/demon_consume.ogg', 50, TRUE) + playsound(parent, 'sound/effects/magic/demon_consume.ogg', 50, TRUE) REMOVE_TRAITS_IN(host,TRAIT_CHANGELING_ZOMBIE) host.mind?.remove_antag_datum(/datum/antagonist/changeling_zombie) @@ -224,7 +224,7 @@ GLOBAL_VAR_INIT(changeling_zombies_detected,FALSE) host.revive(ADMIN_HEAL_ALL) host.do_jitter_animation(10 SECONDS) - playsound(host, 'sound/hallucinations/far_noise.ogg', 50, TRUE) + playsound(host, 'sound/effects/hallucinations/far_noise.ogg', 50, TRUE) host.drop_all_held_items() diff --git a/modular_zubbers/code/modules/changeling_zombies/items.dm b/modular_zubbers/code/modules/changeling_zombies/items.dm index b980e3186b7..8005a802282 100644 --- a/modular_zubbers/code/modules/changeling_zombies/items.dm +++ b/modular_zubbers/code/modules/changeling_zombies/items.dm @@ -10,13 +10,13 @@ var/blood_chance = 100 var/static/list/attack_living_sounds = list( - 'sound/hallucinations/growl1.ogg', - 'sound/hallucinations/growl2.ogg', - 'sound/hallucinations/growl3.ogg' + 'sound/effects/hallucinations/growl1.ogg', + 'sound/effects/hallucinations/growl2.ogg', + 'sound/effects/hallucinations/growl3.ogg' ) var/static/list/attack_inanimate_sounds = list( - 'sound/hallucinations/wail.ogg', + 'sound/effects/hallucinations/wail.ogg', ) COOLDOWN_DECLARE(sound_cooldown) diff --git a/modular_zubbers/code/modules/clothing/shoes/boots.dm b/modular_zubbers/code/modules/clothing/shoes/boots.dm index 6472d0e4eb9..cc40e804523 100644 --- a/modular_zubbers/code/modules/clothing/shoes/boots.dm +++ b/modular_zubbers/code/modules/clothing/shoes/boots.dm @@ -20,7 +20,7 @@ armor_type = /datum/armor/shoes_combat lace_time = 12 SECONDS - hitsound = 'sound/weapons/bladeslice.ogg' + hitsound = 'sound/items/weapons/bladeslice.ogg' strip_delay = 2 SECONDS force = 10 throwforce = 15 diff --git a/modular_zubbers/code/modules/customization/species/synths/death_sound.dm b/modular_zubbers/code/modules/customization/species/synths/death_sound.dm index 65bd00136dc..6c2834ff235 100644 --- a/modular_zubbers/code/modules/customization/species/synths/death_sound.dm +++ b/modular_zubbers/code/modules/customization/species/synths/death_sound.dm @@ -1,2 +1,2 @@ /datum/species/synthetic - death_sound = 'sound/voice/borg_deathsound.ogg' + death_sound = 'sound/mobs/non-humanoids/cyborg/borg_deathsound.ogg' diff --git a/modular_zubbers/code/modules/debug_tools/physgun.dm b/modular_zubbers/code/modules/debug_tools/physgun.dm index 6d1ecfe7775..3cad8152699 100644 --- a/modular_zubbers/code/modules/debug_tools/physgun.dm +++ b/modular_zubbers/code/modules/debug_tools/physgun.dm @@ -17,7 +17,7 @@ throwforce = 0 throw_speed = 1 throw_range = 1 - drop_sound = 'sound/items/handling/screwdriver_drop.ogg' + drop_sound = 'sound/items/handling/tools/screwdriver_drop.ogg' pickup_sound = 'modular_zubbers/sound/phystools/physgun_pickup.ogg' //The dragged object. diff --git a/modular_zubbers/code/modules/debug_tools/phystool.dm b/modular_zubbers/code/modules/debug_tools/phystool.dm index 55867ccd6af..5a0ec8e2dba 100644 --- a/modular_zubbers/code/modules/debug_tools/phystool.dm +++ b/modular_zubbers/code/modules/debug_tools/phystool.dm @@ -13,7 +13,7 @@ throwforce = 0 throw_speed = 1 throw_range = 1 - drop_sound = 'sound/items/handling/screwdriver_drop.ogg' + drop_sound = 'sound/items/handling/tools/screwdriver_drop.ogg' pickup_sound = 'modular_zubbers/sound/phystools/toolgun_select.ogg' resistance_flags = INDESTRUCTIBLE diff --git a/modular_zubbers/code/modules/emotes/emotes.dm b/modular_zubbers/code/modules/emotes/emotes.dm index 9b967dac9ad..f4a68900286 100644 --- a/modular_zubbers/code/modules/emotes/emotes.dm +++ b/modular_zubbers/code/modules/emotes/emotes.dm @@ -71,7 +71,7 @@ message = "snaps their fingers." message_param = "snaps their fingers at %t." emote_type = EMOTE_AUDIBLE | EMOTE_VISIBLE - sound = 'sound/misc/fingersnap1.ogg' + sound = 'sound/mobs/humanoids/human/snap/fingersnap1.ogg' /datum/emote/living/meow_alt key = "meow1" @@ -95,7 +95,7 @@ message = "rapidly flutters their wings!" emote_type = EMOTE_AUDIBLE vary = TRUE - sound = 'sound/voice/moth/moth_flutter.ogg' + sound = 'sound/mobs/humanoids/moth/moth_flutter.ogg' /datum/emote/living/sigh_exasperated key = "esigh" // short for exasperated sigh diff --git a/modular_zubbers/code/modules/job_interns/job_interns.dm b/modular_zubbers/code/modules/job_interns/job_interns.dm index efea9ed2a48..b997317a209 100644 --- a/modular_zubbers/code/modules/job_interns/job_interns.dm +++ b/modular_zubbers/code/modules/job_interns/job_interns.dm @@ -80,7 +80,7 @@ required_time = get_intern_time_threshold() else if(CONFIG_GET(flag/use_intern_master_job_unlock_threshold) && length(department_head)) // Use first department head job as our master job to compare to - var/datum/job/master_job = SSjob.GetJob(department_head[1]) + var/datum/job/master_job = SSjob.get_job(department_head[1]) playtime = player_client?.calc_exp_type(master_job.get_exp_req_type()) required_time = master_job.get_exp_req_amount() else diff --git a/modular_zubbers/code/modules/lunchbox/code/lunchbox.dm b/modular_zubbers/code/modules/lunchbox/code/lunchbox.dm index 248dea523c4..2b535d6eab9 100644 --- a/modular_zubbers/code/modules/lunchbox/code/lunchbox.dm +++ b/modular_zubbers/code/modules/lunchbox/code/lunchbox.dm @@ -6,8 +6,8 @@ inhand_icon_state = "lunchbox" lefthand_file = 'modular_zubbers/code/modules/lunchbox/icons/lunchbox_lefthand.dmi' righthand_file = 'modular_zubbers/code/modules/lunchbox/icons/lunchbox_righthand.dmi' - drop_sound = 'sound/items/handling/cardboardbox_drop.ogg' - pickup_sound = 'sound/items/handling/cardboardbox_pickup.ogg' + drop_sound = 'sound/items/handling/cardboard_box/cardboardbox_drop.ogg' + pickup_sound = 'sound/items/handling/cardboard_box/cardboardbox_pickup.ogg' throw_speed = 3 throw_range = 7 @@ -59,4 +59,4 @@ name = "suspicious lunchbox" icon_state = "lunchbox_suspicious" inhand_icon_state = "lunchbox_suspicious" - desc = "A plain red lunchbox... right?" \ No newline at end of file + desc = "A plain red lunchbox... right?" diff --git a/modular_zubbers/code/modules/mob/living/basic/moonstation/cazador.dm b/modular_zubbers/code/modules/mob/living/basic/moonstation/cazador.dm index be2a17ec64a..645c6d5964c 100644 --- a/modular_zubbers/code/modules/mob/living/basic/moonstation/cazador.dm +++ b/modular_zubbers/code/modules/mob/living/basic/moonstation/cazador.dm @@ -37,7 +37,7 @@ melee_damage_upper = 15 attack_vis_effect = ATTACK_EFFECT_MECHTOXIN - attack_sound = 'sound/weapons/pierce.ogg' + attack_sound = 'sound/items/weapons/pierce.ogg' attack_verb_continuous = "stings" attack_verb_simple = "sting" diff --git a/modular_zubbers/code/modules/mob/living/basic/moonstation/scorpion.dm b/modular_zubbers/code/modules/mob/living/basic/moonstation/scorpion.dm index 63c0531c885..372d49cccbb 100644 --- a/modular_zubbers/code/modules/mob/living/basic/moonstation/scorpion.dm +++ b/modular_zubbers/code/modules/mob/living/basic/moonstation/scorpion.dm @@ -37,7 +37,7 @@ melee_damage_upper = 20 attack_vis_effect = ATTACK_EFFECT_MECHTOXIN - attack_sound = 'sound/weapons/pierce_slow.ogg' + attack_sound = 'sound/items/weapons/pierce_slow.ogg' attack_verb_continuous = "stings" attack_verb_simple = "sting" diff --git a/modular_zubbers/code/modules/modular_computers/programs/siliconmanagement.dm b/modular_zubbers/code/modules/modular_computers/programs/siliconmanagement.dm index 29d546c260e..0147b9e9267 100644 --- a/modular_zubbers/code/modules/modular_computers/programs/siliconmanagement.dm +++ b/modular_zubbers/code/modules/modular_computers/programs/siliconmanagement.dm @@ -18,12 +18,12 @@ if(action) var/priority_target = params["target"] - var/datum/job/silicon = SSjob.GetJob(priority_target) + var/datum/job/silicon = SSjob.get_job(priority_target) if(silicon in SSjob.prioritized_jobs) SSjob.prioritized_jobs -= silicon else SSjob.prioritized_jobs += silicon - playsound(computer, 'sound/machines/terminal_prompt_confirm.ogg', 50, FALSE) + playsound(computer, 'sound/machines/terminal/terminal_prompt_confirm.ogg', 50, FALSE) return TRUE /datum/computer_file/program/silicon_management/ui_data(mob/user) @@ -35,8 +35,8 @@ authed = TRUE var/list/silicon_jobs = list( - SSjob.GetJob(JOB_AI), - SSjob.GetJob(JOB_CYBORG) + SSjob.get_job(JOB_AI), + SSjob.get_job(JOB_CYBORG) ) data["authed"] = authed diff --git a/modular_zubbers/code/modules/quote_of_the_round/ticker.dm b/modular_zubbers/code/modules/quote_of_the_round/ticker.dm index 8b0710399fd..1ca377cc8a4 100644 --- a/modular_zubbers/code/modules/quote_of_the_round/ticker.dm +++ b/modular_zubbers/code/modules/quote_of_the_round/ticker.dm @@ -33,6 +33,6 @@ . = ..() /datum/controller/subsystem/ticker/proc/generate_quote_of_the_round() - return "A shift on [SSmapping.config.map_name] has ended.\n\ + return "A shift on [SSmapping.current_map.map_name] has ended.\n\ [pick(strings("quote_of_the_round.json", "workers"))] [pick(strings("quote_of_the_round.json", "action"))] [pick(strings("quote_of_the_round.json", "message"))] that occured during said shift:\n\ > *[quote_of_the_round_text]*\n \\- *[quote_of_the_round_attribution]*" diff --git a/modular_zubbers/code/modules/security/secmed/security_medic.dm b/modular_zubbers/code/modules/security/secmed/security_medic.dm index 0de8ebc55c8..6921aef25d3 100644 --- a/modular_zubbers/code/modules/security/secmed/security_medic.dm +++ b/modular_zubbers/code/modules/security/secmed/security_medic.dm @@ -143,7 +143,7 @@ new /obj/item/storage/bag/garment/secmed(src) //Prevents secmed hours from counting towards HoS -/datum/controller/subsystem/job/SetupOccupations() +/datum/controller/subsystem/job/setup_occupations() . = ..() var/list/sec_exp_list = experience_jobs_map[EXP_TYPE_SECURITY] for(var/datum/job/job_type in sec_exp_list) diff --git a/modular_zubbers/code/modules/shuttle/emergency.dm b/modular_zubbers/code/modules/shuttle/emergency.dm index 4caebfd52a5..1305b17d840 100644 --- a/modular_zubbers/code/modules/shuttle/emergency.dm +++ b/modular_zubbers/code/modules/shuttle/emergency.dm @@ -1,4 +1,6 @@ /obj/docking_port/mobile/emergency/check() . = ..() if(mode == SHUTTLE_CALL && !SSshuttle.canRecall()) - SSmapping.mapvote() //Do a map vote if we're at the point of no return. + var/datum/vote/current_vote = SSvote.current_vote + if(!istype(current_vote, /datum/vote/map_vote)) + INVOKE_ASYNC(SSvote, TYPE_PROC_REF(/datum/controller/subsystem/vote, initiate_vote), /datum/vote/map_vote, vote_initiator_name = "Map Rotation", forced = TRUE) //Do a map vote if we're at the point of no return. diff --git a/modular_zubbers/code/modules/silicons/borgs/code/robot.dm b/modular_zubbers/code/modules/silicons/borgs/code/robot.dm index 1d3af7d824c..909c014ab29 100644 --- a/modular_zubbers/code/modules/silicons/borgs/code/robot.dm +++ b/modular_zubbers/code/modules/silicons/borgs/code/robot.dm @@ -12,6 +12,6 @@ return ..() /mob/living/silicon/robot/mob_try_pickup(mob/living/user, instant=FALSE) - if(stat == DEAD || status_flags & GODMODE) + if(stat == DEAD || HAS_TRAIT(src, TRAIT_GODMODE)) return return ..() diff --git a/modular_zubbers/code/modules/silicons/silicon.dm b/modular_zubbers/code/modules/silicons/silicon.dm index 1deb65b2fc4..d1372ee9ffe 100644 --- a/modular_zubbers/code/modules/silicons/silicon.dm +++ b/modular_zubbers/code/modules/silicons/silicon.dm @@ -48,9 +48,9 @@ door.visible_message(span_danger("Wow you really pissed [src] off, they bolted the door in your face!"), vision_distance = COMBAT_MESSAGE_RANGE) if("shock") door.set_electrified(MACHINE_DEFAULT_ELECTRIFY_TIME) - playsound(door, 'sound/machines/buzz-sigh.ogg', 25, FALSE, SILENCED_SOUND_EXTRARANGE, ignore_walls = FALSE) + playsound(door, 'sound/machines/buzz/buzz-sigh.ogg', 25, FALSE, SILENCED_SOUND_EXTRARANGE, ignore_walls = FALSE) door.visible_message(span_notice("The door buzzes, [src] has denied your request"), vision_distance = COMBAT_MESSAGE_RANGE) if("deny") - playsound(door, 'sound/machines/buzz-sigh.ogg', 25, FALSE, SILENCED_SOUND_EXTRARANGE, ignore_walls = FALSE) + playsound(door, 'sound/machines/buzz/buzz-sigh.ogg', 25, FALSE, SILENCED_SOUND_EXTRARANGE, ignore_walls = FALSE) door.visible_message(span_notice("The door buzzes, [src] has denied your request"), vision_distance = COMBAT_MESSAGE_RANGE) to_chat(src, "You deny [requester]'s request") diff --git a/modular_zubbers/code/modules/spells/spell_types/nerfed_spells.dm b/modular_zubbers/code/modules/spells/spell_types/nerfed_spells.dm index bce5acf9adb..ca357bcfbd3 100644 --- a/modular_zubbers/code/modules/spells/spell_types/nerfed_spells.dm +++ b/modular_zubbers/code/modules/spells/spell_types/nerfed_spells.dm @@ -49,7 +49,7 @@ invocation = "YA'YEET!!" button_icon = 'icons/mob/nonhuman-player/cult.dmi' button_icon_state = "shade_wizard" - sound = 'sound/effects/assslap.ogg' + sound = 'sound/effects/emotes/assslap.ogg' /datum/action/cooldown/spell/touch/smite/cast_on_hand_hit(obj/item/melee/touch_attack/hand, mob/living/victim, mob/living/carbon/caster) diff --git a/modular_zubbers/code/modules/storyteller/event_defines/crewset/malf.dm b/modular_zubbers/code/modules/storyteller/event_defines/crewset/malf.dm index 133a344a076..d8007587c4c 100644 --- a/modular_zubbers/code/modules/storyteller/event_defines/crewset/malf.dm +++ b/modular_zubbers/code/modules/storyteller/event_defines/crewset/malf.dm @@ -29,7 +29,7 @@ /datum/round_event_control/antagonist/solo/malf/roundstart/get_candidates() var/list/candidates = SSgamemode.get_candidates(antag_flag, pick_roundstart_players = TRUE, restricted_roles = restricted_roles) . = list() - var/datum/job/aijob = SSjob.GetJob(JOB_AI) + var/datum/job/aijob = SSjob.get_job(JOB_AI) for(var/mob/candidate as anything in candidates) if(SSjob.check_job_eligibility(candidate, aijob) == JOB_AVAILABLE) . += candidate @@ -40,7 +40,7 @@ if(!.) return . - var/datum/job/ai_job = SSjob.GetJobType(/datum/job/ai) + var/datum/job/ai_job = SSjob.get_job_type(/datum/job/ai) if(!(ai_job.total_positions - ai_job.current_positions && ai_job.spawn_positions)) return FALSE else diff --git a/modular_zubbers/code/modules/storyteller/event_defines/crewset/nuke_ops.dm b/modular_zubbers/code/modules/storyteller/event_defines/crewset/nuke_ops.dm index 2b97bf2af42..7dc3a43cfd2 100644 --- a/modular_zubbers/code/modules/storyteller/event_defines/crewset/nuke_ops.dm +++ b/modular_zubbers/code/modules/storyteller/event_defines/crewset/nuke_ops.dm @@ -24,7 +24,7 @@ var/datum/team/nuclear/nuke_team /datum/round_event/antagonist/team/nukie/candidate_roles_setup(mob/candidate) - candidate.mind.set_assigned_role(SSjob.GetJobType(job_type)) + candidate.mind.set_assigned_role(SSjob.get_job_type(job_type)) candidate.mind.special_role = required_role /datum/round_event/antagonist/team/nukie/start() diff --git a/modular_zubbers/code/modules/storyteller/event_defines/ghostset/lone_infiltrator.dm b/modular_zubbers/code/modules/storyteller/event_defines/ghostset/lone_infiltrator.dm index 63fdc299af8..0ec83cc2de6 100644 --- a/modular_zubbers/code/modules/storyteller/event_defines/ghostset/lone_infiltrator.dm +++ b/modular_zubbers/code/modules/storyteller/event_defines/ghostset/lone_infiltrator.dm @@ -38,7 +38,7 @@ SSquirks.AssignQuirks(operative, chosen_one.client, TRUE, TRUE, null, FALSE, operative) player_mind.transfer_to(operative) - player_mind.set_assigned_role(SSjob.GetJobType(/datum/job/lone_operative)) + player_mind.set_assigned_role(SSjob.get_job_type(/datum/job/lone_operative)) player_mind.special_role = "Lone Infiltrator" player_mind.add_antag_datum(/datum/antagonist/traitor/lone_infiltrator) diff --git a/modular_zubbers/code/modules/storyteller/event_defines/ghostset/voidwalker.dm b/modular_zubbers/code/modules/storyteller/event_defines/ghostset/voidwalker.dm index 22a32b1f7d7..5e36b107d18 100644 --- a/modular_zubbers/code/modules/storyteller/event_defines/ghostset/voidwalker.dm +++ b/modular_zubbers/code/modules/storyteller/event_defines/ghostset/voidwalker.dm @@ -32,10 +32,10 @@ var/mob/living/carbon/human/walker = new (spawn_location) player_mind.transfer_to(walker) - player_mind.set_assigned_role(SSjob.GetJobType(/datum/job/voidwalker)) + player_mind.set_assigned_role(SSjob.get_job_type(/datum/job/voidwalker)) player_mind.add_antag_datum(/datum/antagonist/voidwalker) walker.set_species(/datum/species/voidwalker) - playsound(walker, 'sound/magic/ethereal_exit.ogg', 50, TRUE, -1) + playsound(walker, 'sound/effects/magic/ethereal_exit.ogg', 50, TRUE, -1) message_admins("[ADMIN_LOOKUPFLW(walker)] has been made into a Voidwalker by the midround event.") walker.log_message("[key_name(walker)] was spawned as a Voidwalker by an event.", LOG_GAME) spawned_mobs += walker diff --git a/modular_zubbers/code/modules/storyteller/gamemode.dm b/modular_zubbers/code/modules/storyteller/gamemode.dm index cbbb8b2fe30..94d42cbb630 100644 --- a/modular_zubbers/code/modules/storyteller/gamemode.dm +++ b/modular_zubbers/code/modules/storyteller/gamemode.dm @@ -479,7 +479,7 @@ SUBSYSTEM_DEF(gamemode) ///Attempts to select players for special roles the mode might have. /datum/controller/subsystem/gamemode/proc/pre_setup() // We need to do this to prevent some niche fuckery... and make dep. orders work. Lol - SSjob.ResetOccupations() + SSjob.reset_occupations() calculate_ready_players() roll_pre_setup_points() handle_pre_setup_roundstart_events() diff --git a/modular_zubbers/code/modules/surgery/organs/external/wings.dm b/modular_zubbers/code/modules/surgery/organs/external/wings.dm index da2ef8d7e4d..131e37b1c27 100644 --- a/modular_zubbers/code/modules/surgery/organs/external/wings.dm +++ b/modular_zubbers/code/modules/surgery/organs/external/wings.dm @@ -58,7 +58,7 @@ ADD_TRAIT(owner, TRAIT_MOVE_FLOATING, LEAPING_TRAIT) if (owner.throw_at(dash_target, jumpdistance, jumpspeed, spin = FALSE, diagonals_first = TRUE, callback = TRAIT_CALLBACK_REMOVE(owner, TRAIT_MOVE_FLOATING, LEAPING_TRAIT))) - playsound(owner, 'sound/voice/moth/moth_flutter.ogg', 50, TRUE, TRUE) + playsound(owner, 'sound/mobs/humanoids/moth/moth_flutter.ogg', 50, TRUE, TRUE) owner.visible_message(span_warning("[usr] propels themselves forwards with a heavy wingbeat!")) COOLDOWN_START(src, dash_cooldown, 6 SECONDS) var/mob/living/dash_user = owner @@ -102,7 +102,7 @@ climb_time = 2.5 SECONDS force = 0 throwforce = 0 - climbsound = 'sound/voice/moth/moth_flutter.ogg' + climbsound = 'sound/mobs/humanoids/moth/moth_flutter.ogg' /obj/item/climbing_hook/climbing_moth_wings/ranged_interact_with_atom(atom/interacting_with, mob/living/user, list/modifiers) var/turf/check_turf = get_turf(user) diff --git a/modular_zubbers/code/modules/vehicles/mech_fabricator.dm b/modular_zubbers/code/modules/vehicles/mech_fabricator.dm index 4e55344248a..c8727102743 100644 --- a/modular_zubbers/code/modules/vehicles/mech_fabricator.dm +++ b/modular_zubbers/code/modules/vehicles/mech_fabricator.dm @@ -17,7 +17,7 @@ illegal_local_designs |= illegal_mech_design cached_designs |= illegal_mech_design say("R$c!i&ed ERROR de#i$ns. C@n%ec$%ng to ~NULL~ se%ve$s.") - playsound(src, 'sound/machines/uplinkerror.ogg', 50, TRUE) + playsound(src, 'sound/machines/uplink/uplinkerror.ogg', 50, TRUE) update_static_data_for_all_viewers() return TRUE else diff --git a/modular_zubbers/code/modules/wizard_dize/wizard_dice_object.dm b/modular_zubbers/code/modules/wizard_dize/wizard_dice_object.dm index a8b180d3bbb..5fbaf025e88 100644 --- a/modular_zubbers/code/modules/wizard_dize/wizard_dice_object.dm +++ b/modular_zubbers/code/modules/wizard_dize/wizard_dice_object.dm @@ -96,7 +96,7 @@ src.forceMove(desired_turf) new/obj/effect/temp_visual/emp/pulse(desired_turf) //Does not cause an EMP :^) - playsound(desired_turf,'sound/magic/magic_missile.ogg',50,8,FALSE) + playsound(desired_turf,'sound/effects/magic/magic_missile.ogg',50,8,FALSE) notify_ghosts( "[src] has teleported to [desired_turf.loc]!", @@ -113,7 +113,7 @@ var/turf/current_turf = get_turf(src) new/obj/effect/temp_visual/emp/pulse(current_turf) //Does not cause an EMP :^) - playsound(current_turf,'sound/magic/magic_missile.ogg',50,8,FALSE) + playsound(current_turf,'sound/effects/magic/magic_missile.ogg',50,8,FALSE) if(roll != 20) if(roll == 1) //lol. lmao @@ -157,7 +157,7 @@ var/turf/lightning_source = get_turf(src) lightning_source.Beam(target, icon_state="lightning[rand(1,12)]", time = 5) target.adjustFireLoss(LIGHTNING_BOLT_DAMAGE) - playsound(get_turf(target), 'sound/magic/lightningbolt.ogg', 50, TRUE) + playsound(get_turf(target), 'sound/effects/magic/lightningbolt.ogg', 50, TRUE) target.electrocution_animation(LIGHTNING_BOLT_ELECTROCUTION_ANIMATION_LENGTH) to_chat(target, span_warning("LIGHTNING BOLT!!")) if(5) diff --git a/modular_zubbers/code/modules/~donator/choicebeacon.dm b/modular_zubbers/code/modules/~donator/choicebeacon.dm index f60925e082b..04e723fd78e 100644 --- a/modular_zubbers/code/modules/~donator/choicebeacon.dm +++ b/modular_zubbers/code/modules/~donator/choicebeacon.dm @@ -10,6 +10,6 @@ if(user) to_chat(user, span_notice("Thank you for choosing the Jab TM for your clothing purchase!")) new droptype( user.loc ) - playsound(src, 'sound/creatures/mousesqueek.ogg', 100, TRUE, TRUE) + playsound(src, 'sound/mobs/non-humanoids/mouse/mousesqueek.ogg', 100, TRUE, TRUE) qdel(src) return diff --git a/modular_zubbers/maps/biodome/weapons.dm b/modular_zubbers/maps/biodome/weapons.dm index a6b84d47407..561742e4f00 100644 --- a/modular_zubbers/maps/biodome/weapons.dm +++ b/modular_zubbers/maps/biodome/weapons.dm @@ -17,7 +17,7 @@ armour_penetration = 65 attack_verb_continuous = list("slashes", "stings", "prickles", "pokes") attack_verb_simple = list("slash", "sting", "prickle", "poke") - hitsound = 'sound/weapons/rapierhit.ogg' + hitsound = 'sound/items/weapons/rapierhit.ogg' /obj/item/melee/fakebeesword/afterattack(atom/target, mob/user, proximity) . = ..() diff --git a/modular_zubbers/master_files/code/modules/entombed_quirk/code/entombed_mod.dm b/modular_zubbers/master_files/code/modules/entombed_quirk/code/entombed_mod.dm index 2715fbe5022..75c801ffe7e 100644 --- a/modular_zubbers/master_files/code/modules/entombed_quirk/code/entombed_mod.dm +++ b/modular_zubbers/master_files/code/modules/entombed_quirk/code/entombed_mod.dm @@ -76,7 +76,7 @@ if (istype(part, /obj/item/clothing)) // make sure it's a modsuit piece and not a module, we retract those too if (!istype(part, /obj/item/clothing/head/mod)) // they can only retract the helmet, them's the sticks human_user.balloon_alert(human_user, "part is fused to you - can't retract!") - playsound(src, 'sound/machines/scanbuzz.ogg', 25, TRUE, SILENCED_SOUND_EXTRARANGE) + playsound(src, 'sound/machines/scanner/scanbuzz.ogg', 25, TRUE, SILENCED_SOUND_EXTRARANGE) return return ..() @@ -87,7 +87,7 @@ //if we're deploy_locked, just disable this functionality entirely if (tomb_quirk && tomb_quirk.deploy_locked) human_user.balloon_alert(human_user, "you can only retract your helmet, and only manually!") - playsound(src, 'sound/machines/scanbuzz.ogg', 25, TRUE, SILENCED_SOUND_EXTRARANGE) + playsound(src, 'sound/machines/scanner/scanbuzz.ogg', 25, TRUE, SILENCED_SOUND_EXTRARANGE) return return ..() diff --git a/modular_zubbers/master_files/code/modules/mob/living/carbon/human/examine.dm b/modular_zubbers/master_files/code/modules/mob/living/carbon/human/examine.dm new file mode 100644 index 00000000000..d1e0e57bab6 --- /dev/null +++ b/modular_zubbers/master_files/code/modules/mob/living/carbon/human/examine.dm @@ -0,0 +1,19 @@ +// Species examine +/mob/living/carbon/human/examine_title(mob/user, thats = FALSE) + . = ..() + var/skipface = (wear_mask && (wear_mask.flags_inv & HIDEFACE)) || (head && (head.flags_inv & HIDEFACE)) + var/species_visible + var/species_name_string + if(skipface || get_visible_name() == "Unknown") + species_visible = FALSE + else + species_visible = TRUE + + if(!species_visible) + species_name_string = "" + else if (!dna.species.lore_protected && dna.features["custom_species"]) + species_name_string = ", [prefix_a_or_an(dna.features["custom_species"])] [dna.features["custom_species"]] ([dna.species.name])" + else + species_name_string = ", [prefix_a_or_an(dna.species.name)] [dna.species.name]" + + . += species_name_string diff --git a/tgstation.dme b/tgstation.dme index bac9a0464da..c040bee2900 100644 --- a/tgstation.dme +++ b/tgstation.dme @@ -9344,6 +9344,7 @@ #include "modular_zubbers\master_files\code\modules\entombed_quirk\code\entombed_mod.dm" #include "modular_zubbers\master_files\code\modules\events\carp_migration.dm" #include "modular_zubbers\master_files\code\modules\events\gravity_generator_blackout.dm" +#include "modular_zubbers\master_files\code\modules\mob\living\carbon\human\examine.dm" #include "modular_zubbers\master_files\code\modules\mob\living\carbon\human\species_types\abductors.dm" #include "modular_zubbers\master_files\code\modules\mob\living\carbon\human\species_types\ethereal.dm" #include "modular_zubbers\master_files\code\modules\mob\living\carbon\human\species_types\plasmamen.dm"