diff --git a/code/__DEFINES/fonts.dm b/code/__DEFINES/fonts.dm index 439106eb815329..858d6f5af14128 100644 --- a/code/__DEFINES/fonts.dm +++ b/code/__DEFINES/fonts.dm @@ -13,8 +13,8 @@ #define SIGNATURE_FONT "Segoe Script" /// Emoji icon set -#define EMOJI_SET 'modular_ss220/master_files_skyrat/icons/emoji.dmi' // SKYRAT EDIT - ORIGINAL: 'icons/ui_icons/emoji/emoji.dmi' -// ex666 edit - skyrat: modular_skyrat/master_files/icons/emoji.dmi +#define EMOJI_SET 'modular_ss220/features/emote_panel/icons/emoji.dmi' // SKYRAT EDIT - ORIGINAL: 'icons/ui_icons/emoji/emoji.dmi' +// SS1984 EDIT - skyrat original: modular_skyrat/master_files/icons/emoji.dmi // Font metrics bitfield /// Include leading A width and trailing C width in GetWidth() or in DrawText() diff --git a/code/__DEFINES/~novarat_defines_include.dm b/code/__DEFINES/~novarat_defines_include.dm new file mode 100644 index 00000000000000..319dc9cc366a0a --- /dev/null +++ b/code/__DEFINES/~novarat_defines_include.dm @@ -0,0 +1,3 @@ +// THIS IS A SS1984 FILE + +#include "..\..\modular_ss220\_defines\_main_modular_defines_include.dm" diff --git a/code/__HELPERS/~novarat_helpers_include.dm b/code/__HELPERS/~novarat_helpers_include.dm new file mode 100644 index 00000000000000..07a45df07091fb --- /dev/null +++ b/code/__HELPERS/~novarat_helpers_include.dm @@ -0,0 +1,3 @@ +// THIS IS A NOVARAT FILE + +#include "..\..\modular_ss220\_helpers\_main_modular_helpers_include.dm" diff --git a/code/_globalvars/~novarat_globalvars_include.dm b/code/_globalvars/~novarat_globalvars_include.dm new file mode 100644 index 00000000000000..7ac36818047eda --- /dev/null +++ b/code/_globalvars/~novarat_globalvars_include.dm @@ -0,0 +1,3 @@ +// THIS IS A SS1984 FILE + +#include "..\..\modular_ss220\_globalvars\_main_modular_globalvars_include.dm" diff --git a/modular_nova/modules/alerts/code/default_announcer.dm b/modular_nova/modules/alerts/code/default_announcer.dm index 402e3207cb9a6f..b9b271538d5abd 100644 --- a/modular_nova/modules/alerts/code/default_announcer.dm +++ b/modular_nova/modules/alerts/code/default_announcer.dm @@ -40,7 +40,7 @@ ANNOUNCER_SPOOKY = 'modular_nova/modules/alerts/sound/misc/admin_horror_music.ogg', ANNOUNCER_ERTYES = 'modular_nova/modules/alerts/sound/alerts/yesert.ogg', ANNOUNCER_MUTANTS = 'modular_nova/modules/alerts/sound/alerts/hazdet.ogg', - ANNOUNCER_KLAXON = 'modular_ss220/modules/return_prs/black_mesa/sound/siren1_long.ogg', + ANNOUNCER_KLAXON = 'modular_ss220/reverts/return_prs/sound/black_mesa/siren1_long.ogg', ANNOUNCER_NRI_RAIDERS = 'modular_nova/modules/encounters/sounds/morse.ogg', ANNOUNCER_DEPARTMENTAL = 'modular_nova/modules/alerts/sound/alerts/alert3.ogg', ANNOUNCER_SHUTTLE = 'modular_nova/modules/alerts/sound/alerts/alert3.ogg', diff --git a/modular_ss220/_assets_modpacks.dm b/modular_ss220/_assets_modpacks.dm new file mode 100644 index 00000000000000..4a535d9007ffb6 --- /dev/null +++ b/modular_ss220/_assets_modpacks.dm @@ -0,0 +1,18 @@ +#define MODPACKS_SET 'modular_ss220/mods_icon_placeholder.dmi' + +/datum/asset/spritesheet/simple/modpacks + name = "modpacks" + +/datum/asset/spritesheet/simple/modpacks/create_spritesheets() + InsertAll("modpack", MODPACKS_SET) + // catch all modpack's previews which are pulling icons from another file + var/icon_placeholder = "default" + for(var/datum/modpack/this_modpack as anything in subtypesof(/datum/modpack)) + var/icon = initial(this_modpack.icon) + var/icon_state = initial(this_modpack.id) + if(icon == MODPACKS_SET) + Insert("modpack-[icon_state]", icon, icon_state=icon_placeholder) + else + Insert("modpack-[icon_state]", icon, icon_state=icon_state) + +#undef MODPACKS_SET diff --git a/modular_ss220/_defines/_main_modular_defines_include.dm b/modular_ss220/_defines/_main_modular_defines_include.dm new file mode 100644 index 00000000000000..ce897fdde8d842 --- /dev/null +++ b/modular_ss220/_defines/_main_modular_defines_include.dm @@ -0,0 +1,2 @@ +// Put all you modular defines here, it would be pasted right before TG Defines +// So you can easily use your defines in TG code folder, not only in our modular folder diff --git a/modular_ss220/_defines/readme.md b/modular_ss220/_defines/readme.md new file mode 100644 index 00000000000000..ba2eb640c98051 --- /dev/null +++ b/modular_ss220/_defines/readme.md @@ -0,0 +1,5 @@ +## Тут лежат все наши Новые Defines (определения), что мы определили в нашем модуле. + +Все они добавляются непосредственно в `main_modular_defines_include.dm` + +Сами дефайны инициализируются сразу после дефайнов офф ТГ в code/\_\_DEFINES/~novarat_defines_include.dm (вот такая вот переадресация типа) diff --git a/modular_ss220/_globalvars/_main_modular_globalvars_include.dm b/modular_ss220/_globalvars/_main_modular_globalvars_include.dm new file mode 100644 index 00000000000000..2c8bbe790abcd5 --- /dev/null +++ b/modular_ss220/_globalvars/_main_modular_globalvars_include.dm @@ -0,0 +1,4 @@ +// Put all you modular helpers here, it would be pasted right before TG Helpers +// So you can easily use your helpers in TG code folder, not only in our modular folder + +#include "tgui.dm" diff --git a/modular_ss220/_globalvars/readme.md b/modular_ss220/_globalvars/readme.md new file mode 100644 index 00000000000000..621ef185e67f50 --- /dev/null +++ b/modular_ss220/_globalvars/readme.md @@ -0,0 +1,5 @@ +## Тут лежат все наши Новые Globalvars (глобальные переменные), что мы определили в нашем модуле. + +Все они добавляются непосредственно в `main_modular_globalvars_include.dm` + +Сами глобальные переменные инициализируются сразу после хелперов офф ТГ в code/\_globalvars/~novarat_globalvars_include.dm (такая же переадресация аналогичная как и у дефайнов) diff --git a/modular_ss220/_globalvars/tgui.dm b/modular_ss220/_globalvars/tgui.dm new file mode 100644 index 00000000000000..d2a271f9ffd5de --- /dev/null +++ b/modular_ss220/_globalvars/tgui.dm @@ -0,0 +1 @@ +GLOBAL_DATUM(modpacks_tgui, /datum/modpack) diff --git a/modular_ss220/_helpers/_main_modular_helpers_include.dm b/modular_ss220/_helpers/_main_modular_helpers_include.dm new file mode 100644 index 00000000000000..e39ea81bfe7ca3 --- /dev/null +++ b/modular_ss220/_helpers/_main_modular_helpers_include.dm @@ -0,0 +1,2 @@ +// Put all you modular helpers here, it would be pasted right before TG Helpers +// So you can easily use your helpers in TG code folder, not only in our modular folder diff --git a/modular_ss220/_helpers/readme.md b/modular_ss220/_helpers/readme.md new file mode 100644 index 00000000000000..ea28f403066338 --- /dev/null +++ b/modular_ss220/_helpers/readme.md @@ -0,0 +1,5 @@ +## Тут лежат все наши Новые Helpers (помощники), что мы определили в нашем модуле. + +Все они добавляются непосредственно в `main_modular_helpers_include.dm` + +Сами хелперы инициализируются сразу после хелперов офф ТГ в code/\_\_HELPERS/~novarat_helpers_include.dm (такая же переадресация аналогичная как и у дефайнов) diff --git a/modular_ss220/_modpack.dm b/modular_ss220/_modpack.dm new file mode 100644 index 00000000000000..9ae4e3cd82290a --- /dev/null +++ b/modular_ss220/_modpack.dm @@ -0,0 +1,83 @@ +/datum/modpack + /// A string unique ID for the modpack. Used for self-cheсks, must be same as modpack name in code. /datum/modpack/ru_crayons -> "id = ru_crayons" + var/id + /// An icon for modpack preview, + var/icon = 'modular_ss220/mods_icon_placeholder.dmi' + /// A string name for the modpack. Used for looking up other modpacks in init. + var/name + /// A string desc for the modpack. Can be used for modpack verb list as description. + var/desc + /// A string with authors of this modpack. + var/author + /// A string with group of this modpack. Choose between "Features", "Translations" and "Reverts" + var/group + /// A list of your modpack's dependencies. If you use obj from another modpack - put it here. + var/list/mod_depends = list() + + /// Is modpack visible, + var/visible = TRUE // by default set to TRUE + +// Modpacks initialization steps +/datum/modpack/proc/pre_initialize() // Basic modpack fuctions + if(!name) + return "Modpack name is unset." + +/datum/modpack/proc/initialize() // Mods dependencies-checks + if(!mod_depends) + return + var/passed = 0 + for(var/depend_id in mod_depends) + passed = 0 + if(depend_id == id) + return "Mod depends on itself, ok and?" + for(var/datum/modpack/package as anything in SSmodpacks.loaded_modpacks) + if(package.id == depend_id) + if(passed >= 1) + return "Multiple include of one module in [id] mod dependencies." + passed++ + if(passed == 0) + return "Module [id] depends on [depend_id], please include it in your game." + +// Modpacks TGUI +/datum/modpack/ui_assets(mob/user) + return list( + get_asset_datum(/datum/asset/spritesheet/simple/modpacks), + ) + +/datum/modpack/ui_state() + return GLOB.always_state + +/datum/modpack/ui_interact(mob/user, datum/tgui/ui) + ui = SStgui.try_update_ui(user, src, ui) + if (!ui) + ui = new(user, src, "Modpacks") + ui.open() + +/datum/modpack/ui_static_data(mob/user) + . = ..() + .["categories"] = list("Features", "Reverts", "Translations") + .["features"] = list() + .["translations"] = list() + .["reverts"] = list() + + var/datum/asset/spritesheet/simple/assets = get_asset_datum(/datum/asset/spritesheet/simple/modpacks) + for(var/datum/modpack/modpack as anything in SSmodpacks.loaded_modpacks) + if (!modpack.visible) // needed for examples (or for some kind of event) + continue + + var/list/modpack_data = list( + "name" = modpack.name, + "desc" = modpack.desc, + "author" = modpack.author, + "icon_class" = assets.icon_class_name("modpack-[modpack.id]"), + "id" = modpack.id, + ) + + if (modpack.group == "Фичи" || modpack.group == "Features") + .["features"] += list(modpack_data) + else if (modpack.group == "Переводы" || modpack.group == "Translations") + .["translations"] += list(modpack_data) + else if (modpack.group == "Баланс" || modpack.group == "Reverts") + .["reverts"] += list(modpack_data) + else + CRASH("Modpack [modpack.name] has bad group name or queued for deletion.") diff --git a/modular_ss220/_modpacks_subsystem.dm b/modular_ss220/_modpacks_subsystem.dm new file mode 100644 index 00000000000000..98f681090ce6a7 --- /dev/null +++ b/modular_ss220/_modpacks_subsystem.dm @@ -0,0 +1,41 @@ +#define INIT_ORDER_MODPACKS 84 + +// Subsystem of modpacks +SUBSYSTEM_DEF(modpacks) + name = "Modpacks" + init_order = INIT_ORDER_MODPACKS + flags = SS_NO_FIRE + var/list/loaded_modpacks = list() + +/datum/controller/subsystem/modpacks/Initialize() + var/list/all_modpacks = list() + for(var/modpack in subtypesof(/datum/modpack/)) + all_modpacks.Add(new modpack) + + // Pre-init and register all compiled modpacks. + for(var/datum/modpack/package as anything in all_modpacks) + var/fail_msg = package.pre_initialize() + if(QDELETED(package)) + CRASH("Modpack of type [package.type] is null or queued for deletion.") + if(fail_msg) + CRASH("Modpack [package.name] failed to pre-initialize: [fail_msg].") + if(loaded_modpacks[package.name]) + CRASH("Attempted to register duplicate modpack name [package.name].") + loaded_modpacks.Add(package) + + // Handle init and post-init (two stages in case a modpack needs to implement behavior based on the presence of other packs). + for(var/datum/modpack/package as anything in all_modpacks) + var/fail_msg = package.initialize() + if(fail_msg) + CRASH("Modpack [(istype(package) && package.name) || "Unknown"] failed to initialize: [fail_msg]") + + return SS_INIT_SUCCESS + +/client/verb/modpacks_list() + set name = "Modpacks List" + set category = "OOC" + + if(!GLOB.modpacks_tgui) + GLOB.modpacks_tgui = new /datum/modpack() + + GLOB.modpacks_tgui.ui_interact(mob) diff --git a/modular_ss220/modules/auto_cryo/autocryo.dm b/modular_ss220/features/auto_cryo/code/autocryo.dm similarity index 100% rename from modular_ss220/modules/auto_cryo/autocryo.dm rename to modular_ss220/features/auto_cryo/code/autocryo.dm diff --git a/modular_ss220/modules/auto_cryo/autocryo_config.dm b/modular_ss220/features/auto_cryo/code/autocryo_config.dm similarity index 100% rename from modular_ss220/modules/auto_cryo/autocryo_config.dm rename to modular_ss220/features/auto_cryo/code/autocryo_config.dm diff --git a/modular_ss220/features/auto_cryo/cryocool.dm b/modular_ss220/features/auto_cryo/cryocool.dm new file mode 100644 index 00000000000000..868c47f09d7883 --- /dev/null +++ b/modular_ss220/features/auto_cryo/cryocool.dm @@ -0,0 +1,6 @@ +/datum/modpack/auto_cryo + id = "auto_cryo" + name = "Авто крио" + group = "Features" + desc = "Система автоматического перемещения игрока в длительном состоянии SSD в крио." + author = "Dimach и Bizzonium" diff --git a/modular_ss220/features/auto_cryo/cryocool.dme b/modular_ss220/features/auto_cryo/cryocool.dme new file mode 100644 index 00000000000000..0d5500f34d585a --- /dev/null +++ b/modular_ss220/features/auto_cryo/cryocool.dme @@ -0,0 +1,9 @@ +#ifndef AUTO_CRYO +#define AUTO_CRYO + +#include "cryocool.dm" + +#include "code/autocryo.dm" +#include "code/autocryo_config.dm" + +#endif diff --git a/modular_ss220/modules/cyrillic_key_fixes/code/client_procs.dm b/modular_ss220/features/cyrillic_key_fixes/code/client_procs.dm similarity index 100% rename from modular_ss220/modules/cyrillic_key_fixes/code/client_procs.dm rename to modular_ss220/features/cyrillic_key_fixes/code/client_procs.dm diff --git a/modular_ss220/modules/cyrillic_key_fixes/code/communication.dm b/modular_ss220/features/cyrillic_key_fixes/code/communication.dm similarity index 100% rename from modular_ss220/modules/cyrillic_key_fixes/code/communication.dm rename to modular_ss220/features/cyrillic_key_fixes/code/communication.dm diff --git a/modular_ss220/modules/cyrillic_key_fixes/code/keybindings.dm b/modular_ss220/features/cyrillic_key_fixes/code/keybindings.dm similarity index 100% rename from modular_ss220/modules/cyrillic_key_fixes/code/keybindings.dm rename to modular_ss220/features/cyrillic_key_fixes/code/keybindings.dm diff --git a/modular_ss220/modules/cyrillic_key_fixes/code/text.dm b/modular_ss220/features/cyrillic_key_fixes/code/text.dm similarity index 100% rename from modular_ss220/modules/cyrillic_key_fixes/code/text.dm rename to modular_ss220/features/cyrillic_key_fixes/code/text.dm diff --git a/modular_ss220/features/cyrillic_key_fixes/cyrillic.dm b/modular_ss220/features/cyrillic_key_fixes/cyrillic.dm new file mode 100644 index 00000000000000..0de3b050792261 --- /dev/null +++ b/modular_ss220/features/cyrillic_key_fixes/cyrillic.dm @@ -0,0 +1,6 @@ +/datum/modpack/cyrillic_key_fixes + id = "cyrillic_key_fixes" + name = "Фикс букв" + group = "Features" + desc = "Фиксит использование не английских букв." + author = "Vallat и lebedev" diff --git a/modular_ss220/features/cyrillic_key_fixes/cyrillic.dme b/modular_ss220/features/cyrillic_key_fixes/cyrillic.dme new file mode 100644 index 00000000000000..b7546dd6484eb8 --- /dev/null +++ b/modular_ss220/features/cyrillic_key_fixes/cyrillic.dme @@ -0,0 +1,11 @@ +#ifndef CYRILLIC_KEY_FIXES +#define CYRILLIC_KEY_FIXES + +#include "cyrillic.dm" + +#include "code\client_procs.dm" +#include "code\communication.dm" +#include "code\keybindings.dm" +#include "code\text.dm" + +#endif diff --git a/modular_ss220/modules/discord/discord_auth.dm b/modular_ss220/features/discord/code/discord_auth.dm similarity index 100% rename from modular_ss220/modules/discord/discord_auth.dm rename to modular_ss220/features/discord/code/discord_auth.dm diff --git a/modular_ss220/modules/discord/new_player.dm b/modular_ss220/features/discord/code/new_player.dm similarity index 100% rename from modular_ss220/modules/discord/new_player.dm rename to modular_ss220/features/discord/code/new_player.dm diff --git a/modular_ss220/modules/discord/verb.dm b/modular_ss220/features/discord/code/verb.dm similarity index 100% rename from modular_ss220/modules/discord/verb.dm rename to modular_ss220/features/discord/code/verb.dm diff --git a/modular_ss220/features/discord/discord.dm b/modular_ss220/features/discord/discord.dm new file mode 100644 index 00000000000000..9b8800a6f36616 --- /dev/null +++ b/modular_ss220/features/discord/discord.dm @@ -0,0 +1,6 @@ +/datum/modpack/discord + id = "discord" + name = "Дискорд" + group = "Features" + desc = "Принудительная аутентификация Byond-аккаунта через дискорд для игры на сервере." + author = "Dimach и Bizzonium" diff --git a/modular_ss220/features/discord/discord.dme b/modular_ss220/features/discord/discord.dme new file mode 100644 index 00000000000000..c68b70082e0f93 --- /dev/null +++ b/modular_ss220/features/discord/discord.dme @@ -0,0 +1,10 @@ +#ifndef DISCORD +#define DISCORD + +#include "discord.dm" + +#include "code\discord_auth.dm" +#include "code\new_player.dm" +#include "code\verb.dm" + +#endif diff --git a/modular_ss220/master_files_skyrat/code/modules/client/preferences/emote_panel.dm b/modular_ss220/features/emote_panel/code/m_emote_panel.dm similarity index 100% rename from modular_ss220/master_files_skyrat/code/modules/client/preferences/emote_panel.dm rename to modular_ss220/features/emote_panel/code/m_emote_panel.dm diff --git a/modular_ss220/features/emote_panel/emote_panel.dm b/modular_ss220/features/emote_panel/emote_panel.dm new file mode 100644 index 00000000000000..42a418abb1827f --- /dev/null +++ b/modular_ss220/features/emote_panel/emote_panel.dm @@ -0,0 +1,6 @@ +/datum/modpack/emote_panel + id = "emote_panel" + name = "Панель с эмоутами" + group = "Features" + desc = "Вкладка с эмоциями по умолчанию включена в настройках игрока." + author = "larentoun и Bizzonium" diff --git a/modular_ss220/features/emote_panel/emote_panel.dme b/modular_ss220/features/emote_panel/emote_panel.dme new file mode 100644 index 00000000000000..c14e08d3b5d504 --- /dev/null +++ b/modular_ss220/features/emote_panel/emote_panel.dme @@ -0,0 +1,8 @@ +#ifndef EMOTE_PANEL +#define EMOTE_PANEL + +#include "emote_panel.dm" + +#include "code\m_emote_panel.dm" + +#endif diff --git a/modular_ss220/master_files_skyrat/icons/emoji.dmi b/modular_ss220/features/emote_panel/icons/emoji.dmi similarity index 100% rename from modular_ss220/master_files_skyrat/icons/emoji.dmi rename to modular_ss220/features/emote_panel/icons/emoji.dmi diff --git a/modular_ss220/modules/events/round_event.dm b/modular_ss220/features/events/code/round_event.dm similarity index 100% rename from modular_ss220/modules/events/round_event.dm rename to modular_ss220/features/events/code/round_event.dm diff --git a/modular_ss220/features/events/events.dm b/modular_ss220/features/events/events.dm new file mode 100644 index 00000000000000..64449f875f63f8 --- /dev/null +++ b/modular_ss220/features/events/events.dm @@ -0,0 +1,6 @@ +/datum/modpack/events + id = "events" + name = "Изменения существующих ивентов" + group = "Features" + desc = "Изменяет поведение ивентов (\"Всплеск мощности Суперматерии\" и \"Плесень\")." + author = "Dimach и Bizzonium" diff --git a/modular_ss220/features/events/events.dme b/modular_ss220/features/events/events.dme new file mode 100644 index 00000000000000..c5dd9ede192b1c --- /dev/null +++ b/modular_ss220/features/events/events.dme @@ -0,0 +1,8 @@ +#ifndef EVENTS +#define EVENTS + +#include "events.dm" + +#include "code\round_event.dm" + +#endif diff --git a/modular_ss220/features/feature_example/code/readme.md b/modular_ss220/features/feature_example/code/readme.md new file mode 100644 index 00000000000000..971fef1d3a872d --- /dev/null +++ b/modular_ss220/features/feature_example/code/readme.md @@ -0,0 +1 @@ +## Тут мы храним код к нашему модпаку diff --git a/modular_ss220/features/feature_example/feature_example.dm b/modular_ss220/features/feature_example/feature_example.dm new file mode 100644 index 00000000000000..2fbec8817b9439 --- /dev/null +++ b/modular_ss220/features/feature_example/feature_example.dm @@ -0,0 +1,9 @@ +/datum/modpack/feature_example + id = "feature_example" + icon = 'modular_ss220/features/feature_example/preview.dmi' + name = "feature_example" + group = "Features" + desc = "Пример написания модпаков для фич." + author = "К*дер" + + visible = FALSE diff --git a/modular_ss220/features/feature_example/feature_example.dme b/modular_ss220/features/feature_example/feature_example.dme new file mode 100644 index 00000000000000..ef3a4e900a48aa --- /dev/null +++ b/modular_ss220/features/feature_example/feature_example.dme @@ -0,0 +1,6 @@ +#ifndef FEATURE_EXAMPLE +#define FEATURE_EXAMPLE + +#include "feature_example.dm" + +#endif diff --git a/modular_ss220/features/feature_example/icons/readme.md b/modular_ss220/features/feature_example/icons/readme.md new file mode 100644 index 00000000000000..10731abc5b6906 --- /dev/null +++ b/modular_ss220/features/feature_example/icons/readme.md @@ -0,0 +1 @@ +## Тут мы храним наши иконки к обьектам и т.д. в модпаке diff --git a/modular_ss220/features/feature_example/preview.dmi b/modular_ss220/features/feature_example/preview.dmi new file mode 100644 index 00000000000000..ad042b50fd875e Binary files /dev/null and b/modular_ss220/features/feature_example/preview.dmi differ diff --git a/modular_ss220/features/feature_example/readme.md b/modular_ss220/features/feature_example/readme.md new file mode 100644 index 00000000000000..84b544585ab1bf --- /dev/null +++ b/modular_ss220/features/feature_example/readme.md @@ -0,0 +1,14 @@ +## Module ID: FEATURES_EXAMPLE + + +### Defines: + +- N/A + +### TG Proc/File Changes: + +- N/A + +### TGUI Files: + +- N/A diff --git a/modular_ss220/features/feature_example/sound/readme.md b/modular_ss220/features/feature_example/sound/readme.md new file mode 100644 index 00000000000000..c60d583bb465f7 --- /dev/null +++ b/modular_ss220/features/feature_example/sound/readme.md @@ -0,0 +1 @@ +## Тут мы храним звуки к нашему модпаку diff --git a/modular_ss220/modules/paradise_keybindings/code/keybinding/admin.dm b/modular_ss220/features/paradise_keybindings/code/keybinding/admin.dm similarity index 100% rename from modular_ss220/modules/paradise_keybindings/code/keybinding/admin.dm rename to modular_ss220/features/paradise_keybindings/code/keybinding/admin.dm diff --git a/modular_ss220/modules/paradise_keybindings/code/keybinding/artificial_intelligence.dm b/modular_ss220/features/paradise_keybindings/code/keybinding/artificial_intelligence.dm similarity index 100% rename from modular_ss220/modules/paradise_keybindings/code/keybinding/artificial_intelligence.dm rename to modular_ss220/features/paradise_keybindings/code/keybinding/artificial_intelligence.dm diff --git a/modular_ss220/modules/paradise_keybindings/code/keybinding/carbon.dm b/modular_ss220/features/paradise_keybindings/code/keybinding/carbon.dm similarity index 100% rename from modular_ss220/modules/paradise_keybindings/code/keybinding/carbon.dm rename to modular_ss220/features/paradise_keybindings/code/keybinding/carbon.dm diff --git a/modular_ss220/modules/paradise_keybindings/code/keybinding/client.dm b/modular_ss220/features/paradise_keybindings/code/keybinding/client.dm similarity index 100% rename from modular_ss220/modules/paradise_keybindings/code/keybinding/client.dm rename to modular_ss220/features/paradise_keybindings/code/keybinding/client.dm diff --git a/modular_ss220/modules/paradise_keybindings/code/keybinding/communication.dm b/modular_ss220/features/paradise_keybindings/code/keybinding/communication.dm similarity index 100% rename from modular_ss220/modules/paradise_keybindings/code/keybinding/communication.dm rename to modular_ss220/features/paradise_keybindings/code/keybinding/communication.dm diff --git a/modular_ss220/modules/paradise_keybindings/code/keybinding/human.dm b/modular_ss220/features/paradise_keybindings/code/keybinding/human.dm similarity index 100% rename from modular_ss220/modules/paradise_keybindings/code/keybinding/human.dm rename to modular_ss220/features/paradise_keybindings/code/keybinding/human.dm diff --git a/modular_ss220/modules/paradise_keybindings/code/keybinding/living.dm b/modular_ss220/features/paradise_keybindings/code/keybinding/living.dm similarity index 100% rename from modular_ss220/modules/paradise_keybindings/code/keybinding/living.dm rename to modular_ss220/features/paradise_keybindings/code/keybinding/living.dm diff --git a/modular_ss220/modules/paradise_keybindings/code/keybinding/mob.dm b/modular_ss220/features/paradise_keybindings/code/keybinding/mob.dm similarity index 100% rename from modular_ss220/modules/paradise_keybindings/code/keybinding/mob.dm rename to modular_ss220/features/paradise_keybindings/code/keybinding/mob.dm diff --git a/modular_ss220/modules/paradise_keybindings/code/keybinding/movement.dm b/modular_ss220/features/paradise_keybindings/code/keybinding/movement.dm similarity index 100% rename from modular_ss220/modules/paradise_keybindings/code/keybinding/movement.dm rename to modular_ss220/features/paradise_keybindings/code/keybinding/movement.dm diff --git a/modular_ss220/modules/paradise_keybindings/code/keybinding/robot.dm b/modular_ss220/features/paradise_keybindings/code/keybinding/robot.dm similarity index 100% rename from modular_ss220/modules/paradise_keybindings/code/keybinding/robot.dm rename to modular_ss220/features/paradise_keybindings/code/keybinding/robot.dm diff --git a/modular_ss220/features/paradise_keybindings/paradise_keybindings.dm b/modular_ss220/features/paradise_keybindings/paradise_keybindings.dm new file mode 100644 index 00000000000000..6242762c9b0bf7 --- /dev/null +++ b/modular_ss220/features/paradise_keybindings/paradise_keybindings.dm @@ -0,0 +1,6 @@ +/datum/modpack/paradise_krybindings + id = "paradise_krybindings" + name = "Бинды как на Парадайзе" + group = "Features" + desc = "Изменяет стандартное назначение клавиш как на билде Paradise." + author = "К*дер" diff --git a/modular_ss220/features/paradise_keybindings/paradise_keybindings.dme b/modular_ss220/features/paradise_keybindings/paradise_keybindings.dme new file mode 100644 index 00000000000000..1c539901a89bf8 --- /dev/null +++ b/modular_ss220/features/paradise_keybindings/paradise_keybindings.dme @@ -0,0 +1,17 @@ +#ifndef PARADISE_KEYBINDINGS +#define PARADISE_KEYBINDINGS + +#include "paradise_keybindings.dm" + +#include "code\keybinding\admin.dm" +#include "code\keybinding\artificial_intelligence.dm" +#include "code\keybinding\carbon.dm" +#include "code\keybinding\client.dm" +#include "code\keybinding\communication.dm" +#include "code\keybinding\human.dm" +#include "code\keybinding\living.dm" +#include "code\keybinding\mob.dm" +#include "code\keybinding\movement.dm" +#include "code\keybinding\robot.dm" + +#endif diff --git a/modular_ss220/features/readme.md b/modular_ss220/features/readme.md new file mode 100644 index 00000000000000..6768888a10f535 --- /dev/null +++ b/modular_ss220/features/readme.md @@ -0,0 +1,5 @@ +## Все-все-все КРУПНЫЕ фичи, что добавленны в этот репо. + +Фича считается крупной, если она с трудом уменьшается в 1 файлик .dm + она не является переводом. + +Все переводы и мелкие фиксы (они же реверты) идут в свои соответсвующие папки. diff --git a/modular_ss220/modules/shutdown/shutdown_config.dm b/modular_ss220/features/shutdown/code/shutdown_config.dm similarity index 100% rename from modular_ss220/modules/shutdown/shutdown_config.dm rename to modular_ss220/features/shutdown/code/shutdown_config.dm diff --git a/modular_ss220/modules/return_prs/black_mesa/icons/structures/dmi b/modular_ss220/features/shutdown/shutdown.dm similarity index 100% rename from modular_ss220/modules/return_prs/black_mesa/icons/structures/dmi rename to modular_ss220/features/shutdown/shutdown.dm diff --git a/modular_ss220/features/shutdown/shutdown.dme b/modular_ss220/features/shutdown/shutdown.dme new file mode 100644 index 00000000000000..aad2ef36b66ff3 --- /dev/null +++ b/modular_ss220/features/shutdown/shutdown.dme @@ -0,0 +1,8 @@ +#ifndef SHUTDOWN +#define SHUTDOWN + +#include "shutdown.dm" + +#include "code/shutdown_config.dm" + +#endif diff --git a/modular_ss220/modules/tts/code/_tts_defines.dm b/modular_ss220/features/tts/code/_tts_defines.dm similarity index 100% rename from modular_ss220/modules/tts/code/_tts_defines.dm rename to modular_ss220/features/tts/code/_tts_defines.dm diff --git a/modular_ss220/modules/tts/code/base_seeds/mobs/_base.dm b/modular_ss220/features/tts/code/base_seeds/mobs/_base.dm similarity index 100% rename from modular_ss220/modules/tts/code/base_seeds/mobs/_base.dm rename to modular_ss220/features/tts/code/base_seeds/mobs/_base.dm diff --git a/modular_ss220/modules/tts/code/base_seeds/mobs/alien.dm b/modular_ss220/features/tts/code/base_seeds/mobs/alien.dm similarity index 100% rename from modular_ss220/modules/tts/code/base_seeds/mobs/alien.dm rename to modular_ss220/features/tts/code/base_seeds/mobs/alien.dm diff --git a/modular_ss220/modules/tts/code/base_seeds/mobs/friendly.dm b/modular_ss220/features/tts/code/base_seeds/mobs/friendly.dm similarity index 100% rename from modular_ss220/modules/tts/code/base_seeds/mobs/friendly.dm rename to modular_ss220/features/tts/code/base_seeds/mobs/friendly.dm diff --git a/modular_ss220/modules/tts/code/base_seeds/mobs/guardian.dm b/modular_ss220/features/tts/code/base_seeds/mobs/guardian.dm similarity index 100% rename from modular_ss220/modules/tts/code/base_seeds/mobs/guardian.dm rename to modular_ss220/features/tts/code/base_seeds/mobs/guardian.dm diff --git a/modular_ss220/modules/tts/code/base_seeds/mobs/hostile.dm b/modular_ss220/features/tts/code/base_seeds/mobs/hostile.dm similarity index 100% rename from modular_ss220/modules/tts/code/base_seeds/mobs/hostile.dm rename to modular_ss220/features/tts/code/base_seeds/mobs/hostile.dm diff --git a/modular_ss220/modules/tts/code/base_seeds/mobs/lavaland.dm b/modular_ss220/features/tts/code/base_seeds/mobs/lavaland.dm similarity index 100% rename from modular_ss220/modules/tts/code/base_seeds/mobs/lavaland.dm rename to modular_ss220/features/tts/code/base_seeds/mobs/lavaland.dm diff --git a/modular_ss220/modules/tts/code/base_seeds/mobs/other.dm b/modular_ss220/features/tts/code/base_seeds/mobs/other.dm similarity index 100% rename from modular_ss220/modules/tts/code/base_seeds/mobs/other.dm rename to modular_ss220/features/tts/code/base_seeds/mobs/other.dm diff --git a/modular_ss220/modules/tts/code/base_seeds/mobs/pets.dm b/modular_ss220/features/tts/code/base_seeds/mobs/pets.dm similarity index 100% rename from modular_ss220/modules/tts/code/base_seeds/mobs/pets.dm rename to modular_ss220/features/tts/code/base_seeds/mobs/pets.dm diff --git a/modular_ss220/modules/tts/code/base_seeds/objs/objs.dm b/modular_ss220/features/tts/code/base_seeds/objs/objs.dm similarity index 100% rename from modular_ss220/modules/tts/code/base_seeds/objs/objs.dm rename to modular_ss220/features/tts/code/base_seeds/objs/objs.dm diff --git a/modular_ss220/modules/tts/code/providers/silero.dm b/modular_ss220/features/tts/code/providers/silero.dm similarity index 100% rename from modular_ss220/modules/tts/code/providers/silero.dm rename to modular_ss220/features/tts/code/providers/silero.dm diff --git a/modular_ss220/modules/tts/code/seeds/silero.dm b/modular_ss220/features/tts/code/seeds/silero.dm similarity index 100% rename from modular_ss220/modules/tts/code/seeds/silero.dm rename to modular_ss220/features/tts/code/seeds/silero.dm diff --git a/modular_ss220/modules/tts/code/tts_configuration.dm b/modular_ss220/features/tts/code/tts_configuration.dm similarity index 100% rename from modular_ss220/modules/tts/code/tts_configuration.dm rename to modular_ss220/features/tts/code/tts_configuration.dm diff --git a/modular_ss220/modules/tts/code/tts_mob_Hear.dm b/modular_ss220/features/tts/code/tts_mob_Hear.dm similarity index 100% rename from modular_ss220/modules/tts/code/tts_mob_Hear.dm rename to modular_ss220/features/tts/code/tts_mob_Hear.dm diff --git a/modular_ss220/modules/tts/code/tts_numbers.dm b/modular_ss220/features/tts/code/tts_numbers.dm similarity index 100% rename from modular_ss220/modules/tts/code/tts_numbers.dm rename to modular_ss220/features/tts/code/tts_numbers.dm diff --git a/modular_ss220/modules/tts/code/tts_preferences.dm b/modular_ss220/features/tts/code/tts_preferences.dm similarity index 100% rename from modular_ss220/modules/tts/code/tts_preferences.dm rename to modular_ss220/features/tts/code/tts_preferences.dm diff --git a/modular_ss220/modules/tts/code/tts_provider.dm b/modular_ss220/features/tts/code/tts_provider.dm similarity index 100% rename from modular_ss220/modules/tts/code/tts_provider.dm rename to modular_ss220/features/tts/code/tts_provider.dm diff --git a/modular_ss220/modules/tts/code/tts_seed.dm b/modular_ss220/features/tts/code/tts_seed.dm similarity index 100% rename from modular_ss220/modules/tts/code/tts_seed.dm rename to modular_ss220/features/tts/code/tts_seed.dm diff --git a/modular_ss220/modules/tts/code/tts_sound.dm b/modular_ss220/features/tts/code/tts_sound.dm similarity index 100% rename from modular_ss220/modules/tts/code/tts_sound.dm rename to modular_ss220/features/tts/code/tts_sound.dm diff --git a/modular_ss220/modules/tts/code/tts_sound_TEMPORARY.dm b/modular_ss220/features/tts/code/tts_sound_TEMPORARY.dm similarity index 100% rename from modular_ss220/modules/tts/code/tts_sound_TEMPORARY.dm rename to modular_ss220/features/tts/code/tts_sound_TEMPORARY.dm diff --git a/modular_ss220/modules/tts/code/tts_subsystem.dm b/modular_ss220/features/tts/code/tts_subsystem.dm similarity index 100% rename from modular_ss220/modules/tts/code/tts_subsystem.dm rename to modular_ss220/features/tts/code/tts_subsystem.dm diff --git a/modular_ss220/modules/new_world_topics/world_topic.dm b/modular_ss220/features/tts/code/world_topic.dm similarity index 100% rename from modular_ss220/modules/new_world_topics/world_topic.dm rename to modular_ss220/features/tts/code/world_topic.dm diff --git a/modular_ss220/modules/tts/code/~undefs/~tts_undefs.dm b/modular_ss220/features/tts/code/~undefs/~tts_undefs.dm similarity index 100% rename from modular_ss220/modules/tts/code/~undefs/~tts_undefs.dm rename to modular_ss220/features/tts/code/~undefs/~tts_undefs.dm diff --git a/modular_ss220/features/tts/tts.dm b/modular_ss220/features/tts/tts.dm new file mode 100644 index 00000000000000..e9f1ee2d6397e7 --- /dev/null +++ b/modular_ss220/features/tts/tts.dm @@ -0,0 +1,6 @@ +/datum/modpack/tts + id = "tts" + name = "TTS озвучка станции 13" + group = "Features" + desc = "Дает возможность выбрать уникальный голос для вашего персонажа." + author = "К*дер" diff --git a/modular_ss220/features/tts/tts.dme b/modular_ss220/features/tts/tts.dme new file mode 100644 index 00000000000000..a8b4c3052db0be --- /dev/null +++ b/modular_ss220/features/tts/tts.dme @@ -0,0 +1,43 @@ +#ifndef TTS +#define TTS + +#include "tts.dm" + +// define +#include "code\_tts_defines.dm" + +// base_seeds >> mobs +#include "code\base_seeds\mobs\_base.dm" +#include "code\base_seeds\mobs\alien.dm" +#include "code\base_seeds\mobs\friendly.dm" +#include "code\base_seeds\mobs\guardian.dm" +#include "code\base_seeds\mobs\hostile.dm" +#include "code\base_seeds\mobs\lavaland.dm" +#include "code\base_seeds\mobs\other.dm" +#include "code\base_seeds\mobs\pets.dm" + +// base_seeds >> objs +#include "code\base_seeds\objs\objs.dm" + +// providers +#include "code\providers\silero.dm" + +// seeds +#include "code\seeds\silero.dm" + +// code +#include "code\tts_configuration.dm" +#include "code\tts_mob_Hear.dm" +#include "code\tts_numbers.dm" +#include "code\tts_preferences.dm" +#include "code\tts_provider.dm" +#include "code\tts_seed.dm" +#include "code\tts_sound_TEMPORARY.dm" +#include "code\tts_sound.dm" +#include "code\tts_subsystem.dm" +#include "code\world_topic.dm" + +// ~undefs +#include "code\~undefs\~tts_undefs.dm" + +#endif diff --git a/modular_ss220/mods_icon_placeholder.dmi b/modular_ss220/mods_icon_placeholder.dmi new file mode 100644 index 00000000000000..aedaa85a493008 Binary files /dev/null and b/modular_ss220/mods_icon_placeholder.dmi differ diff --git a/modular_ss220/modular_includes.dme b/modular_ss220/modular_includes.dme new file mode 100644 index 00000000000000..55232b44d96133 --- /dev/null +++ b/modular_ss220/modular_includes.dme @@ -0,0 +1,26 @@ +// All new mod's includes here + +#include "_assets_modpacks.dm" // modpack picture integration system +#include "_modpack.dm" // modpack obj +#include "_modpacks_subsystem.dm" // actually mods subsystem + tgui in "tgui/packages/tgui/interfaces/Modpacks.tsx" + +/* --FEATURE-- */ + +#include "features\feature_example\feature_example.dme" +#include "features\emote_panel\emote_panel.dme" +#include "features\auto_cryo\cryocool.dme" +#include "features\cyrillic_key_fixes\cyrillic.dme" +#include "features\discord\discord.dme" +#include "features\events\events.dme" +#include "features\shutdown\shutdown.dme" +#include "features\paradise_keybindings\paradise_keybindings.dme" +#include "features\tts\tts.dme" + +/* --TRANSLATIONS-- */ + +#include "translations\translation_example\translation_example.dme" +#include "translations\customer\customer.dme" + +/* --REVERTS-- */ + +#include "reverts\return_prs\return.dme" diff --git a/modular_ss220/modularization_guide_ru.md b/modular_ss220/modularization_guide_ru.md new file mode 100644 index 00000000000000..0d8bb8fb5601b5 --- /dev/null +++ b/modular_ss220/modularization_guide_ru.md @@ -0,0 +1,453 @@ +# Руководство по модуляризации кода – MassMeta/NovaRat style, v0.3 + +**Соблюдение этого Гайда – залог успешного мержа Вашей фичи в репозиторий.** + +## Вступление + +Проект **МассМета** 🧰 – это, постоянно обновляющаяся, модульная ветка от проекта [/TG/station](https://github.com/tgstation/tgstation). Здесь мы добавляем свои фичи и по возможности откатываем неудачные. Прочитав эту инструкцию – Вы поймете как правильно нужно внедрить к нам Вашу идею, чтобы ее увидели другие игроки нашего сервера. + +Несоблюдение данного руководства приведёт к стагнации код-базы проекта, как это было до. Осознав наши прошлые ошибки – было принято решение привести проект к модульности подобно той, как на серверах Skyrat, однако доработанной под наши нужды. [Оригинальное руководство](https://github.com/NovaSector/NovaSector/blob/master/modular_nova/readme.md) (на англ.) + +Сервер **Skyrat** проекта **SS1984** по предварительному соглашению будет поддерживать такую же модульность как и на МассМете, а также участвовать в её развитии. + +⚠️ **Все Баг-фиксы и рефакторы немодульного кода, изменение не Наших карт – Вам нужно будет заливать именно в апстрим Nova Sector !** + +### Про тестирование своих [PR'ов](https://ru.stackoverflow.com/questions/134183/%D0%A7%D1%82%D0%BE-%D1%82%D0%B0%D0%BA%D0%BE%D0%B5-pull-request) 🔬 + +Прежде чем открывать PR на слияние, то было бы неплохо проверить Ваш код на работоспособность. +А именно: +* **Скомпилируй билд** на своей локальной машине и посмотри, что там выдал компилятор Byond. Если билд успешно скомпилился, то уже хорошо. +* **Запусти билд** с Фичей и посмотрите как она себя ведёт, если ли какие-либо аномалии в работе модуля. Достаточно поверхностной проверки. +* **Протестируй и так и эдак фичу**, например, если Ваша Фича предполагает взаимодействие нескольких игроков, то можете воспользоваться Гостевым аккаунтом. Для этого выйди из BYOND-хаба (надо закрыть Бьенд) и зайди на локалку как Guest-[много циферок]. + +После этого смело создавайте PR на наш репозиторий, там Вам уже подскажут как можно доработать тот или иной неочевидный момент. + +### Про платформу GitHub + +Это одна из многих видов Систем Контроля Версий. Сам Git одновременно и достаточно проработан в плане алгоритмов, он ими же и ограничен. Они не всегда могут однозначно самостоятельно разрешить определенные изменения в коде, что приводит к конфликтам, которые требуется решать вручную. + +Подробнее про сам Git и как с ним работать [тут](https://git-scm.com/book/ru/v2). + +## Суть Конфликта ⚔️ + +Начнём сразу с показательного примера. + +Предположим, что в какой-то строчке оригинального файла `foobar.dm` Nova Sector было так: + +```byond +var/something = 1 +``` + +Однако, под наши нужны нам потребовалось изменить значение с **1** на **2** под какую-то фичу в проекте, + +```diff +- var/something = 1 ++ var/something = 2 //SS1984 EDIT +``` + +Но неожиданно апстрим Nova Sector вносит свои изменения (commit: their-feature) в эту же строку файла, меняя её у себя с **1** на **4**, + +```diff +- var/something = 1 ++ var/something = 4 +``` +Затем мы решили синхронизировать изменения и видим следующее, + +```byond +<<<<<< HEAD:foobar.dm +var/something = 2 //SS1984 EDIT +====== +var/something = 4 +>>>>>> their-feature:foobar.dm +``` + +В данном случае в череду коммитов Nova Sector внедряется дополнительный, про который известно только нам самим. ГитХаб, видя подобное несоответствие - даёт нам сделать выбор. + +Например, нам нужно оставить только Наше изменение, то просто удаляем все что нам добавил ГитХаб и оставляем только нужное, + +```byond +var/something = 2 //SS1984 EDIT +``` + +Подобного рода конфликты разрешаются именно ручками, однако есть другие подходы в виде модульного кода, о которых мы расскажем далее в данном руководстве. + +Подробнее про [Ветвления и Слияния](https://git-scm.com/book/ru/v2/Ветвление-в-Git-Основы-ветвления-и-слияния). + +## Протокол модуляризации 🛠️ + +У Вашего модуля должно быть короткое и информативное название в документации, например - **`shuttle_toggle`**. + +Этим уникальным **ID** Вы затем назовёте: + +- Свою модульную папку `modular_ss220/features/shuttle_toggle/`, в которой вы будете локально работать. + +- А также в дальнейшем Вы будете помечать все **Немодульные** изменения в коде Nova Sector. + +- В редких случаях он может пригодится как некая метка для включения/отключения модуля. Об этом будет отдельно рассказано ниже. + +Теперь подробнее про виды модуляризации. + +### Не Модульные Изменения + +Иногда наступает момент, когда редактирование **оригинальных** файлов Nova Sector намного удобнее и практичее. + +📌 Пожалуйста, не забудьте записать факт их изменения под пунктом **"TG Proc/File Changes"** в `readme.md` вашего модуля. + +В этих случаях мы решили применять следующую стандартизацию: + +- **Добавление:** + + ```byond + //SS1984 EDIT ADDITION BEGIN (shuttle_toggle) + var/adminEmergencyNoRecall = FALSE + var/lastMode = SHUTTLE_IDLE + var/lastCallTime = 6000 + //SS1984 EDIT ADDITION END + ``` + +- **Удаление:** + + ```byond + //SS1984 EDIT REMOVAL BEGIN (shuttle_toggle) + /* + for(var/obj/docking_port/stationary/S in stationary) + if(S.id = id) + return S + */ + //SS1984 EDIT REMOVAL END + ``` + +- **Изменения:** + + ```byond + //SS1984 EDIT CHANGE BEGIN (shuttle_toggle) + /* ORIGINAL + if(SHUTTLE_STRANDED, SHUTTLE_ESCAPE) + */ + if(SHUTTLE_STRANDED, SHUTTLE_ESCAPE, SHUTTLE_DISABLED) + //SS1984 EDIT CHANGE END + return 1 + ``` + + 💡 Если предполагается **"Масштабное"** изменений или удаление кода, то его уже можно переместить в модуль. На месте удаления обязательно допишите куда оно было перемещенно: (Moved to: `modular_ss220/features/shuttle_toggle/randomverbs.dm`) + + ⚠️ Обязательно оставляем все что было до вашего вмешательства под пометкой **ORIGINAL**! + +### Полностью Модульные Изменения + +В нашем проекте присутствует папка `modular_ss220/`, там будут храниться все наши **"Модульные"** изменения кода Nova Sector. + +💡 Она полностью независима и этим мы гарантируем, что кодеры с Nova Sector не будут туда вмешиваться. + +В этой папке есть ещё несколько подпапок и файлов: + +| Папка/Файл | +| ---------------------------------- | +| **\_defines** 📁 | +| **\_globalvars** 📁 | +| **\_helpers** 📁 | +| **features** 📁 | +| **translations** 📁 | +| **reverts** 📁 | +| **\_assets_modpacks.dm** 📄 | +| **\_modpack.dm** 📄 | +| **\_modpacks_subsystem.dm** 📄 | +| **mods_icon_placeholder.dmi** 📄 | +| **modular_includes.dme** 📄 | +| **modularization_guide_ru.md** 📝 | +| **module_template.md** 📝 | + +Теперь подробнее про каждую из Папок: + +- **`_defines/ и _globalvars/ и _helpers/`** (D/G/H) 📂 + + Здесь лежат все наши модульные "определения" (defines), "гробальные пеменные" (globalvars) и "помощники" (helpers). + + Вынесена отдельно из папки `features/` из-за того, что их требуется ставить выше основного ТГ кода, сразу же после (D/G/H) ТГ, (за счет этого мы можем использовать наши дефайны в коде ТГ, а не только в модулях). + + Храните D/G/H своего модуля только в одном файле, назовите его также как `ID` вашего модуля. + + Все файлы в папках включены под `#include` в + - **`modular_ss220/_defines/_main_modular_defines_include.dm`** + - **`modular_ss220/_globalvars/_main_modular_globalvars_include.dm`** + - **`modular_ss220/_helpers/_main_modular_helpers_include.dm`** + + 📌 Пожалуйста, не забудьте записать факт их добавления под пунктом **"Defines/Helpers:"** в `readme.md` вашего модуля. + + 💡 Если же они применяются только лишь в рамках одного файла, то их достаточно объявить вверху и внизу файла. Такое записывать в `readme.md` не надо! + + ```byond + #define MY_DEFINE + //some code with MY_DEFINE here + #undef MY_DEFINE + ``` + + +- **`features/`** 📂 + + Здесь лежат все модульные файлы **"Новых Фич"**, которых нет в апстриме. Каждой присвоен уникальный **"module_id"**. + + Подробнее про строение папок модуля расскажем чуть ниже. + +- **`translations/`** 📂 + + Папка аналогичная `features/`, но в ней уже лежит перевод на Русский всякого в игре. + + Выделена отдельно, чтобы её можно было легко отключить из компиляции кода для англо-язычных форков. + + Такой модуль именовать уже обязательно с припиской **"ru_"**, например вот так: **ru_crayons**. + +- **`reverts/`** 📂 + + Папка аналогичная `features/`, но там располагаются недавние откаты плохих и возвраты хороших по нашему мнению фич, введёных апстримом Nova Sector. + + ❗ Если фича была уже выпилена давно или же апстрим произвел её полное удаление сразу, то она уже может рассматриваться как самостоятельный модуль в `features/`! + + Такой модуль именовать обязательно с припиской **"revert_"**, например: **"revert_buff_lasers"**. + + ⚠️ Укажите в `readme.md` модуля ссылку на пиар, который откатываевается! + +## Подробнее про наполнение папок (features/ translations/ reverts/) + +Чтобы сохранить общий стиль и обеспечить удобную навигацию по большинству модулей, а также контролировать количество файлов и папок в репозитории, Вы должны располагать определённые типы файлов по своим папкам. + +⚠️ Каждый модуль обязан содержать в себе файл документации модуля – `readme.md`. + +| Папка/Файл | Содержимое | +| ------------------- | --------------------------------------------------------------------- | +| **code/** 📁 | Файлы кода: **`.dm`** | +| **icon/** 📁 | Файлы иконок и картинок: **`.dmi`** и **`.png`** | +| **sound/** 📁 | Звуковые файлы: **`.ogg`** и **`.waw`** | +| **includes.dm** 📄 | объект модуля `/datum/modpack/` | +| **includes.dme** 📄 | Инклюд всех файлов в папке **code/** | +| **readme.md** 📝 | Полная документация к модулю, [пример](module_template.md) | + +⚠️ Файлы строк: `.txt` и `.json` вы помещаете в папку `strings/ss220/`, т.к. код Nova Sector не может работать нормально со всеми файлами-строк вне этой папки. + +⛔ У проектов **Skyrat** присуствует папка `master_files/`, однако у нас в проекте её НЕТ! Все переопредения кода у нас помещаются полностью в модуль с особыми пометками! Пояснения будут позже. + +❗ Также у проектов **Skyrat** стандартно все новые файлы сразу включаются в общий файл `tgstation.dme`, что я считаю достаточно трудным для дальнейшней поддержки. У нашего проекта другой поход в этом моменте, как Вы видите. + +### Подробнее про папку **`code/`** + +⚠️ В этих файлах не должно быть закомментированного кода, тем более полностью закомментированных файлов! А вот пояснения к коду оставлять можно, порой даже и нужно. + +Здесь располагается код двух типов: + +#### Абсолютно новые функции и объекты 🆕 + +Просто ложите все свои новые файлы кода в папку `code/` своего модуля. + +💡 Можете разбивать файлы по подпапкам, если в этом есть нужда. + +Не забывайте проставлять все пути к иконкам и звуку правильно! + +#### Переопределение объектов и функций Nova Sector 🔀 + +С помощью этих файлов мы косвенно изменяем основной код Nova Sector. Это позволяет нам очень изящно внедрять свои коррективы, не вмешиваясь напрямую в основной код. Тем самым не нарушая их череду коммитов и не создавая для нас самих в будущем **Конфликтов Слияния**. + +Однако это является и минусом такого подхода. Гитхаб не сможет нам оперативно подсказать где файл поменялся из-за вмешательства апстрима и где следует учесть измененое или дополнительное переопределение. Иногда прямые изменения кода через `//SS1984 EDIT` предпочтительнее. Старайтесь использовать здравый смысл в этом вопросе. + +⚠️ У данных файлов **Не надо соблюдать Иерархию** аналогичной папки `code/` у Nova Sector! Просто ложите вместе со всеми файлами в модуль. + +Эти файлы выносите в "отдельную группу" с помощью пометки `"m_"` в названии (от слова master), например: `m_nova_filename.dm`. + +⚠️ Над каждым блоком таких функций/объектов **подписывайте в каком оригинальном файле Nova Sector они расположены**. Таким образом нам будет проще смекнуть что к чему. + +- **Пример модульного переопределения объекта** 💡 + + Например, Вы решили модульно переопределить иконку и описание у мольберта (easel). + + Оригинальный объект в коде Nova Sector по пути `code/modules/art/paintings.dm`: + + ```byond + /obj/structure/easel + name = "easel" + desc = "Only for the finest of art!" + icon = 'icons/obj/art/artstuff.dmi' + icon_state = "easel" + density = TRUE + resistance_flags = FLAMMABLE + max_integrity = 60 + var/obj/item/canvas/painting = null + ``` + + Для этого создайте новый файл желательно с таким же именем как у оригинала и расположите в папке `code/` вашего модуля: `code/master_paintings.dm`. + + Для выполнения нашей цели, наполнение даного файла будет выглядеть примерно так: + + ```byond + //ORIGINAL FILE: code/modules/art/paintings.dm + /obj/structure/easel + desc = "Let yourself draw!" + icon = 'modular_ss220/features/art/icons/artstuff.dmi' + icon_state = "new_easel" + ``` + + Теперь при компилировании проекта, данное переопределение подменит эти переменные у оригинального объекта мольберта. Тем самым в готовом проекте у мольберта будет уже Новая иконка и описание. Даже код Nova Sector менять не пришлось! 🎉 + +- **Пример модульного добавления фичи в функцию** 💡 + + Для простоты предположим, что вы хотите заставить оружие искрить при выстреле для имитации дульной вспышки. + + Также Вы хотите, чтобы это можно было использовать со всеми видами оружия, использующими эту функцию. + + В модульном файле объекта можно начать с добавления новой переменной `var/muzzle_flash`. + + ```byond + /obj/item/gun + var/muzzle_flash = TRUE + ``` + + Теперь у Вас будет **у каждого** наследника этого объекта доступна эта переменная. После этого, допустим, вы захотите проверять её и вызвать искры после выстрела. + + У этого объекта уже есть процедура, что вызывается при стрельбе: + + ```byond + /obj/item/gun/proc/shoot_live_shot(mob/living/user, pointblank = 0, atom/pbtarget = null, message = 1) + ``` + + Теперь мы начинаем **добавлять код** для работы нашей фичи в дочернюю процедуру `/obj/item/gun/shoot_live_shot()`. + + ```byond + /obj/item/gun/shoot_live_shot(mob/living/user, pointblank = 0, atom/pbtarget = null, message = 1) + . = ..() + if(muzzle_flash) + spawn_sparks(src) + ``` + + Тут мы обязательно вызываем такую конструкцию `. = ..()`, она по сути своей говорит, что мы **наследуемся от родительской функции**. После данной конструкции добаляем весь наш новый код. + + Теперь при компилировании проекта, данные "добавления" допишутся в оригинальный объект и функцию. Этим мы добились того, что оружие при выстреле ещё и искрит, при том не вмешиваясь в функции Nova Sector напрямую! 🎉 + +### **`. = ..()`** для чайников + +Как вы уже могли заметить, у языка DM частично заложена парадигма ООП, нас в данном случае интересует процесс наследования объектов и их функций. + +💡 Вы также можете нажать F1 в Dream Maker и прочитать подробный мануал на английском. + +- `.` – это возвращаемое значение нашей функции по умолчанию. Изначально оно равно `null`. + +- `..` – это возвращаемое значение родительской функции. + + Через `..()` Вы обращаетесь к родительской функции, этим вызывая её в нужном месте Вашей функции-наследника. + +И теперь, если вы сделаетете подобый манёвр `. = ..()`, то Вы вызовите родительскую функцию и присвоите её значение возвращаемому значению нашей функции. После этого можете свободно дополнять свою `.` чем хотите. + +Так же в случае, если Вы не хотите возвращать родительский вывод, то Вы можете сохранить его в любую переменную или просто использовать `..()` + +Мы так же можем вообще не вызывать `..()` - тогда функция оверрайдится полностью. Но я бы не рекомендовал делать подобное, ради перемещения ориг. функции в модуль и дальнейшей модификации её уже там, ибо когда Nova Sector поменяет её у себя, то пиши пропало. + +Также учтите, что вы не сможете при модульном дополнии функции использовать те переменные, которые были объявленны в функции оригинале! + +## Отключаемые модули + +В папке модуля есть файл `modular_ss220/modular_includes.dme`. + +В нем перечисленны все модули, что на данный момент активны. Для отключения требуется перекомпиляция проекта, т.к. эти изменения вступают в силу только на этапе работы [препроцессора](https://ru.wikipedia.org/wiki/%D0%9F%D1%80%D0%B5%D0%BF%D1%80%D0%BE%D1%86%D0%B5%D1%81%D1%81%D0%BE%D1%80). Чтобы отключить нужный вам модуль пропишите в начале модуля // #include... + +Преимущественно там будут присутсвовать модули **"Перевода"** ну и некоторые другие, что были сделаны отключаемыми по желанию автора модуля. В ином случае, модуль можно убрать только если залезать в код напрямую. + +## Карты 🗺️ + +Используются карты: +- 🔴 Оригинальные с офф Новы (без прямых наших изменений) +- 🟡 Заимствованные с других билдов (некоторые желательно не менять, т.к. мы можем подтягивать обновления в других билдов) +- 🟢 Наши самодельные, они же полностью независимые (меняем и чиним как хотим) + +### Новые карты (наши самодельные) + +Все наши Новые карты лежат по пути со всеми остальными в `_maps/map_files/` (не в модульной папке). + +К каждой карте идёт дополнительно `.json` файл-конфигурации в `_maps/`, не забудьте добавить его тоже! + +### Модульное Изменение Карт Новы (через применение Авто-мапперов) + +⚠️ Не изменяйте оригинальные карты Nova Sector напрямую, Вы стокнётесь потом с таким же хаосом, как если вы бы меняли файлы иконок! Для внесения изменений ипользуйте модуль Авто-маппера. + +Когда вы добавляете новый элемент на карту, то вы должны сперва определеить масштаб переделок. + +- Если это **небольшое изменение на 1 предмет**, то используйте простой автоматизатор области. + + Автомаппер простых областей использует записи точек отсчета, чтобы поместить один элемент в область карты, которая имеет определенный смысл. + +- Если речь идет об **изменении целой комнаты**, то используйте автоматизатор шаблонов. + + Автомаппер использует готовые шаблоны для переопределения участков карты, используя координаты для определения начального местоположения. Примеры смотрите в файле automapper_config.toml. + +## Модульный TGUI (TG User Interface) + +**TGUI** - еще один исключительный случай, поскольку он использует Javascript, который не может быть модульным, нежели же код DM. + +ВСЕ файлы TGUI находятся в папке `/tgui/packages/tgui/interfaces/` и ее подкаталогах. Нет какой-то конкретной папки для Наших TGUI файлов! + +Частным примером может служить TGUI файл для оформления меню Модпаков `/tgui/packages/tgui/interfaces/Modpacks.tsx`. + +📌 Пожалуйста, не забудьте записать факт их добавления/изменения под пунктом **"TGUI Files:"** в `readme.md` вашего модуля. + +### Изменение оригинальных файлов Nova Sector + +При изменении оригинальных файлов TGUI поступаем аналогично, как и при изменении вышележащего кода DM, однако схема написания комментариев тут несколько иная. + +Вы можете использовать как `// SS1984 EDIT`, так и `/* SS1984 EDIT */`, хотя в некоторых случаях вам придется использовать одно вместо другого. (в некотрых языках '//' - могут не являться комментированием, учтите это) + +В целом, старайтесь, чтобы комментарии к изменениям находились на той же строке, что и само изменение. Предпочтительно внутри JSX-тега. Например: + +```js + +``` + +```js + +``` + +```js + +``` + +В крайнем случае Вы можете заключить ваше редактирование в фигурные скобки, например так: + +```js +{/* SS1984 EDIT ADDITION START */} + + someProp="whatever" + +{/* SS1984 EDIT ADDITION END */} +``` + +### Создание новых файлов TGUI + +⚠️ При создании нового файла TGUI с нуля, пожалуйста, добавьте **Заголовочный Комментарий** самом верху файла: + +```js +// THIS IS A SS1984 UI FILE +``` + +Таким образом, они легко идентифицируются как **Наши** модульные файлы TGUI `.tsx` и `.jsx`. + +Собственно ничего больше делать и не нужно, комментарии `// SS1984 EDIT` в таком файле TGUI излишне. + + + +## В заключении + +Терпение и труд – ТГ к*дера перетрут. Если мы будем последовательны, то в конечном итоге это избавит НАС от будущих болей в области ГМ, когда Нам (Вам) же придется разрешать конфликты вручную. +Благодаря более скрупулезному документированию будет сразу понятно, какие изменения были сделаны, где и с помощью каких функций, и все станет гораздо менее двусмысленным и запутанным. + +Желаю удачи в ТГ кодинге. Помните, что сообщество всегда готово помочь Вам, если вдруг понадобится помощь. + +Оригинальное руководство: Skyrat/NovaSector. Идея модульности: Nebula and Bandastation (SS220). Перевод и дополнения: Artemchik542. Доработка модульной системы: Artemchik542, Huz2e, SantaKO1. diff --git a/modular_ss220/module_template.md b/modular_ss220/module_template.md new file mode 100644 index 00000000000000..33683df7de87ed --- /dev/null +++ b/modular_ss220/module_template.md @@ -0,0 +1,20 @@ +## Module ID: YOUR_MODULE_ID + + +### Defines/Helpers: + +- N/A + +(Paste here file path to your module's defines/helpers in `_defines` and/or `_helpers`.) + +### TG Proc/File Changes: + +- N/A + +(Paste here file path to changes in TG `code/` folder.) + +### TGUI Files: + +- N/A + +(Paste here file path there original TGUI file were changed or new TGUI files made in `tgui/` folder.) diff --git a/modular_ss220/modules/return_prs/black_mesa/hev_suit/readme.md b/modular_ss220/modules/return_prs/black_mesa/hev_suit/readme.md deleted file mode 100644 index 8b2441d4a838da..00000000000000 --- a/modular_ss220/modules/return_prs/black_mesa/hev_suit/readme.md +++ /dev/null @@ -1,13 +0,0 @@ -## Title: HEV Mark IV - -MODULE ID: hev - -### Description: - -Adds a fully functional HEV suit. - -### Credits: -Gandalf2k15 - All code -Sojourn/Eris - Helmet Sprites - Modified by Gandalf2k15 -Crowbar Collective - HEV sounds - Modified by Gandalf2k15 -Hippiestation - HEV sprites - Modified by Gandalf2k15 diff --git a/modular_ss220/modules/return_prs/gunsgalore/code/guns/luger.dm b/modular_ss220/modules/return_prs/gunsgalore/code/guns/luger.dm deleted file mode 100644 index 9d1c1a050b66cd..00000000000000 --- a/modular_ss220/modules/return_prs/gunsgalore/code/guns/luger.dm +++ /dev/null @@ -1,16 +0,0 @@ -/obj/item/gun/ballistic/automatic/pistol/luger - name = "\improper Armadyne P-09X" - desc = "A small, light-weight reproduction of the Luger P08 from the 20th century, manufactured by the Oldarms division of the Armadyne Corporation. Chambered in 9x25mm." - icon_state = "luger" - inhand_icon_state = "luger" - icon = 'modular_ss220/modules/return_prs/gunsgalore/icons/guns/gunsgalore_guns.dmi' - lefthand_file = 'modular_ss220/modules/return_prs/gunsgalore/icons/guns/gunsgalore_lefthand.dmi' - righthand_file = 'modular_ss220/modules/return_prs/gunsgalore/icons/guns/gunsgalore_righthand.dmi' - fire_sound = 'modular_ss220/modules/return_prs/gunsgalore/sound/guns/fire/luger_fire.ogg' - load_sound = 'modular_ss220/modules/return_prs/gunsgalore/sound/guns/fire/luger_mag_insert.ogg' - load_empty_sound = 'modular_ss220/modules/return_prs/gunsgalore/sound/guns/fire/luger_mag_insert.ogg' - eject_sound = 'modular_ss220/modules/return_prs/gunsgalore/sound/guns/fire/luger_mag_release.ogg' - eject_empty_sound = 'modular_ss220/modules/return_prs/gunsgalore/sound/guns/fire/luger_mag_release.ogg' - rack_sound = 'modular_ss220/modules/return_prs/gunsgalore/sound/guns/fire/luger_rack.ogg' - fire_sound_volume = 100 - suppressor_x_offset = 14 diff --git a/modular_ss220/modules/return_prs/gunsgalore/code/guns/scar.dm b/modular_ss220/modules/return_prs/gunsgalore/code/guns/scar.dm deleted file mode 100644 index f1152700ef75b4..00000000000000 --- a/modular_ss220/modules/return_prs/gunsgalore/code/guns/scar.dm +++ /dev/null @@ -1,28 +0,0 @@ -/obj/item/gun/ballistic/automatic/scar - name = "SCAR-L" - desc = "Part of the SCAR family rifles. This one is SCAR-L, which is for 'Light'. Chambered in .277 Aestus." - icon = 'modular_ss220/modules/return_prs/gunsgalore/icons/guns/gunsgalore_guns40x32.dmi' - icon_state = "scar" - lefthand_file = 'modular_ss220/modules/return_prs/gunsgalore/icons/guns/gunsgalore_lefthand.dmi' - righthand_file = 'modular_ss220/modules/return_prs/gunsgalore/icons/guns/gunsgalore_righthand.dmi' - inhand_icon_state = "scar" - worn_icon = 'modular_ss220/modules/return_prs/gunsgalore/icons/guns/gunsgalore_back.dmi' - worn_icon_state = "scar" - slot_flags = ITEM_SLOT_BELT | ITEM_SLOT_BACK - w_class = WEIGHT_CLASS_BULKY - weapon_weight = WEAPON_HEAVY - accepted_magazine_type = /obj/item/ammo_box/magazine/m16 - can_suppress = FALSE - fire_delay = 1.90 - fire_sound = 'modular_ss220/modules/return_prs/gunsgalore/sound/guns/fire/scar_fire.ogg' - fire_sound_volume = 50 - rack_sound = 'modular_ss220/modules/return_prs/gunsgalore/sound/guns/interact/scar_cock.ogg' - load_sound = 'modular_ss220/modules/return_prs/gunsgalore/sound/guns/interact/scar_mag_out.ogg' - load_empty_sound = 'modular_ss220/modules/return_prs/gunsgalore/sound/guns/interact/scar_mag_in.ogg' - eject_sound = 'modular_ss220/modules/return_prs/gunsgalore/sound/guns/interact/scar_mag_out.ogg' - - -/obj/item/gun/ballistic/automatic/scar/Initialize(mapload) - . = ..() - - AddComponent(/datum/component/automatic_fire, fire_delay) diff --git a/modular_ss220/modules/return_prs/novaya_ert/readme.md b/modular_ss220/modules/return_prs/novaya_ert/readme.md deleted file mode 100644 index 590056df8a3311..00000000000000 --- a/modular_ss220/modules/return_prs/novaya_ert/readme.md +++ /dev/null @@ -1,15 +0,0 @@ -## Title: Novaya Rossiyskaya Imperiya Module - -MODULE ID: NRI STUFF - -### Description: - -Everything mainly NRI-related, from various cosmetic clothing to guns to ERTs. - -### Credits: -Gandalf2k15 - Code and some icons. -Stalkeros - Code and some icons. -Zydras - NRI police clothing, stun gun and NRI holobarriers icons. -Ramirez - Icons and idea. -Flavrius - Icons + misc. -Paxilmaniac - Surplus weapons and armor. diff --git a/modular_ss220/readme.md b/modular_ss220/readme.md new file mode 100644 index 00000000000000..b393ade2bd44ba --- /dev/null +++ b/modular_ss220/readme.md @@ -0,0 +1,21 @@ +### Это модульная папка проекта МассМета/NovaRat + +**Здесь находятся:** + +| Папка/Файл | Описание +| ----------------------------------------- | -------------------------------------------------------| +| **_\defines** 📁 | "Определения" для вашего модульного и не очень кода | +| **\_helpers** 📁 | "Помощники" для вашего модульного и не очень кода | +| **features** 📁 | Все крутые фичи кодить сюда, и только сюда | +| **russification** 📁 | Переводы всякого на более понятый язык | +| **reverts** 📁 | Откаты неугодных богу Робаста приколов в ТГ кодинге | +| **tools** 📁 | Инструменты, что позволяют удобнее вести проект | +| **\_\_config_modpaks.dm** 📄 | Конфигуратор модпаков, все что там есть - отключаемо | +| **\_modpacks_subsystem.dm** 📄 | Подсистема модпаков | +| **main_modular_include.dm** 📄 | Тут описаны все наши модули, что мы добавляем в проект | +| **modularization_guide_ru.md** 📝 | Инструкция по модульному ведению проекта (на Русском) | +| **module_template.md** 📝 | Шаблон пометок изменений кода вне модуля | + +⚠️ Все Defines и Helpers, применяющиеся в вашем модуле, должны быть реализованы в папке **\_defines** и **\_helpers** соответсвенно! ⚠️ + +📚 Вам предоставлено пособие на Русском, о том как модульно вести проект. **modularization_guide_ru.md** diff --git a/modular_ss220/reverts/readme.md b/modular_ss220/reverts/readme.md new file mode 100644 index 00000000000000..662700293226d9 --- /dev/null +++ b/modular_ss220/reverts/readme.md @@ -0,0 +1,3 @@ +## Все мелкие переделкки в коде, что мы пытаемся назвать "откатами неприятностей", что наплодил апстрим ТГ. + +По сути своей - это самая полезная папка в модуле, позволяет игрокам опять почутсвовать больше веселья в игре, что было нагло украдено меинтейнерами ТГ. diff --git a/modular_ss220/modules/return_prs/_vars/vars.dm b/modular_ss220/reverts/return_prs/code/_vars/vars.dm similarity index 100% rename from modular_ss220/modules/return_prs/_vars/vars.dm rename to modular_ss220/reverts/return_prs/code/_vars/vars.dm diff --git a/modular_ss220/modules/return_prs/ammogun/ammo_boxes.dm b/modular_ss220/reverts/return_prs/code/ammogun/ammo_boxes.dm similarity index 98% rename from modular_ss220/modules/return_prs/ammogun/ammo_boxes.dm rename to modular_ss220/reverts/return_prs/code/ammogun/ammo_boxes.dm index 22f6cf9c154643..cedf03d6ccfd0b 100644 --- a/modular_ss220/modules/return_prs/ammogun/ammo_boxes.dm +++ b/modular_ss220/reverts/return_prs/code/ammogun/ammo_boxes.dm @@ -79,7 +79,7 @@ desc = "5.6x40mm ammunition specifically made for civilian use like recreation, hunting, self-defense or LARP. While the package itself lacks any real identification \ and does, in fact, appear like a bland green box with a colored stripe, the insides have a boatload of information, \ ranging from manufacturer advertisements and intended use to the cartridge's tactical and technical characteristics." - icon = 'modular_ss220/modules/return_prs/novaya_ert/icons/ammo_boxes.dmi' + icon = 'modular_ss220/reverts/return_prs/icons/novaya_ert/ammo_boxes.dmi' icon_state = "boxnrifle-lethal" base_icon_state = "boxnrifle-lethal" multiple_sprites = AMMO_BOX_FULL_EMPTY diff --git a/modular_ss220/modules/return_prs/ammogun/modular_projectiles.dm b/modular_ss220/reverts/return_prs/code/ammogun/modular_projectiles.dm similarity index 100% rename from modular_ss220/modules/return_prs/ammogun/modular_projectiles.dm rename to modular_ss220/reverts/return_prs/code/ammogun/modular_projectiles.dm diff --git a/modular_ss220/modules/return_prs/ammogun/shotgunbox.dm b/modular_ss220/reverts/return_prs/code/ammogun/shotgunbox.dm similarity index 100% rename from modular_ss220/modules/return_prs/ammogun/shotgunbox.dm rename to modular_ss220/reverts/return_prs/code/ammogun/shotgunbox.dm diff --git a/modular_ss220/modules/return_prs/ammogun/shotgunbullets.dm b/modular_ss220/reverts/return_prs/code/ammogun/shotgunbullets.dm similarity index 100% rename from modular_ss220/modules/return_prs/ammogun/shotgunbullets.dm rename to modular_ss220/reverts/return_prs/code/ammogun/shotgunbullets.dm diff --git a/modular_ss220/modules/return_prs/black_mesa/code/armaments/__armament_bodyarmor.dm b/modular_ss220/reverts/return_prs/code/black_mesa/armaments/__armament_bodyarmor.dm similarity index 100% rename from modular_ss220/modules/return_prs/black_mesa/code/armaments/__armament_bodyarmor.dm rename to modular_ss220/reverts/return_prs/code/black_mesa/armaments/__armament_bodyarmor.dm diff --git a/modular_ss220/modules/return_prs/black_mesa/code/armaments/_armament_primary.dm b/modular_ss220/reverts/return_prs/code/black_mesa/armaments/_armament_primary.dm similarity index 100% rename from modular_ss220/modules/return_prs/black_mesa/code/armaments/_armament_primary.dm rename to modular_ss220/reverts/return_prs/code/black_mesa/armaments/_armament_primary.dm diff --git a/modular_ss220/modules/return_prs/black_mesa/code/armaments/_armaments_secondary.dm b/modular_ss220/reverts/return_prs/code/black_mesa/armaments/_armaments_secondary.dm similarity index 100% rename from modular_ss220/modules/return_prs/black_mesa/code/armaments/_armaments_secondary.dm rename to modular_ss220/reverts/return_prs/code/black_mesa/armaments/_armaments_secondary.dm diff --git a/modular_ss220/modules/return_prs/black_mesa/code/armaments/armament_explosives.dm b/modular_ss220/reverts/return_prs/code/black_mesa/armaments/armament_explosives.dm similarity index 100% rename from modular_ss220/modules/return_prs/black_mesa/code/armaments/armament_explosives.dm rename to modular_ss220/reverts/return_prs/code/black_mesa/armaments/armament_explosives.dm diff --git a/modular_ss220/modules/return_prs/black_mesa/code/armaments/armament_medical.dm b/modular_ss220/reverts/return_prs/code/black_mesa/armaments/armament_medical.dm similarity index 100% rename from modular_ss220/modules/return_prs/black_mesa/code/armaments/armament_medical.dm rename to modular_ss220/reverts/return_prs/code/black_mesa/armaments/armament_medical.dm diff --git a/modular_ss220/modules/return_prs/black_mesa/code/armaments/armament_melee.dm b/modular_ss220/reverts/return_prs/code/black_mesa/armaments/armament_melee.dm similarity index 100% rename from modular_ss220/modules/return_prs/black_mesa/code/armaments/armament_melee.dm rename to modular_ss220/reverts/return_prs/code/black_mesa/armaments/armament_melee.dm diff --git a/modular_ss220/modules/return_prs/black_mesa/code/armaments/armament_miscellaneous.dm b/modular_ss220/reverts/return_prs/code/black_mesa/armaments/armament_miscellaneous.dm similarity index 100% rename from modular_ss220/modules/return_prs/black_mesa/code/armaments/armament_miscellaneous.dm rename to modular_ss220/reverts/return_prs/code/black_mesa/armaments/armament_miscellaneous.dm diff --git a/modular_ss220/modules/return_prs/black_mesa/code/armaments/armament_utility.dm b/modular_ss220/reverts/return_prs/code/black_mesa/armaments/armament_utility.dm similarity index 100% rename from modular_ss220/modules/return_prs/black_mesa/code/armaments/armament_utility.dm rename to modular_ss220/reverts/return_prs/code/black_mesa/armaments/armament_utility.dm diff --git a/modular_ss220/modules/return_prs/black_mesa/code/armaments/hecu_armament_station.dm b/modular_ss220/reverts/return_prs/code/black_mesa/armaments/hecu_armament_station.dm similarity index 100% rename from modular_ss220/modules/return_prs/black_mesa/code/armaments/hecu_armament_station.dm rename to modular_ss220/reverts/return_prs/code/black_mesa/armaments/hecu_armament_station.dm diff --git a/modular_ss220/modules/return_prs/black_mesa/code/armor.dm b/modular_ss220/reverts/return_prs/code/black_mesa/armor.dm similarity index 80% rename from modular_ss220/modules/return_prs/black_mesa/code/armor.dm rename to modular_ss220/reverts/return_prs/code/black_mesa/armor.dm index cc8b7dd8d170ab..dcdd155a338365 100644 --- a/modular_ss220/modules/return_prs/black_mesa/code/armor.dm +++ b/modular_ss220/reverts/return_prs/code/black_mesa/armor.dm @@ -3,9 +3,9 @@ desc = "Vest designed to take heavy beating and probably keep the user alive in the process." armor_type = /datum/armor/vest_hecu icon_state = "ceramic_vest" - icon = 'modular_ss220/modules/return_prs/black_mesa/icons/misc/hecucloth.dmi' - worn_icon = 'modular_ss220/modules/return_prs/black_mesa/icons/misc/hecumob.dmi' - worn_icon_digi = 'modular_ss220/modules/return_prs/black_mesa/icons/misc/hecumob_digi.dmi' + icon = 'modular_ss220/reverts/return_prs/icons/black_mesa/misc/hecucloth.dmi' + worn_icon = 'modular_ss220/reverts/return_prs/icons/black_mesa/misc/hecumob.dmi' + worn_icon_digi = 'modular_ss220/reverts/return_prs/icons/black_mesa/misc/hecumob_digi.dmi' uses_advanced_reskins = TRUE unique_reskin = list( "Basic" = list( @@ -41,9 +41,9 @@ desc = "Helmet designed to take heavy beating and probably keep the user alive in the process." armor_type = /datum/armor/helmet_hecu icon_state = "ceramic_helmet" - icon = 'modular_ss220/modules/return_prs/black_mesa/icons/misc/hecucloth.dmi' - worn_icon = 'modular_ss220/modules/return_prs/black_mesa/icons/misc/hecumob.dmi' - worn_icon_digi = 'modular_ss220/modules/return_prs/black_mesa/icons/misc/hecumob_muzzled.dmi' + icon = 'modular_ss220/reverts/return_prs/icons/black_mesa/misc/hecucloth.dmi' + worn_icon = 'modular_ss220/reverts/return_prs/icons/black_mesa/misc/hecumob.dmi' + worn_icon_digi = 'modular_ss220/reverts/return_prs/icons/black_mesa/misc/hecumob_muzzled.dmi' uses_advanced_reskins = TRUE unique_reskin = list( "Basic" = list( diff --git a/modular_ss220/modules/return_prs/black_mesa/code/bump_teleporter.dm b/modular_ss220/reverts/return_prs/code/black_mesa/bump_teleporter.dm similarity index 100% rename from modular_ss220/modules/return_prs/black_mesa/code/bump_teleporter.dm rename to modular_ss220/reverts/return_prs/code/black_mesa/bump_teleporter.dm diff --git a/modular_ss220/modules/return_prs/black_mesa/code/drops.dm b/modular_ss220/reverts/return_prs/code/black_mesa/drops.dm similarity index 100% rename from modular_ss220/modules/return_prs/black_mesa/code/drops.dm rename to modular_ss220/reverts/return_prs/code/black_mesa/drops.dm diff --git a/modular_ss220/modules/return_prs/black_mesa/code/factions.dm b/modular_ss220/reverts/return_prs/code/black_mesa/factions.dm similarity index 100% rename from modular_ss220/modules/return_prs/black_mesa/code/factions.dm rename to modular_ss220/reverts/return_prs/code/black_mesa/factions.dm diff --git a/modular_ss220/modules/return_prs/black_mesa/code/flag.dm b/modular_ss220/reverts/return_prs/code/black_mesa/flag.dm similarity index 85% rename from modular_ss220/modules/return_prs/black_mesa/code/flag.dm rename to modular_ss220/reverts/return_prs/code/black_mesa/flag.dm index f81668d423508e..3ba9b01a01b277 100644 --- a/modular_ss220/modules/return_prs/black_mesa/code/flag.dm +++ b/modular_ss220/reverts/return_prs/code/black_mesa/flag.dm @@ -3,13 +3,13 @@ desc = "The folded flag of the United States of America." icon_state = "folded_usa" sign_path = /obj/structure/sign/flag/usa - icon = 'modular_ss220/modules/return_prs/black_mesa/icons/misc/flags.dmi' + icon = 'modular_ss220/reverts/return_prs/icons/black_mesa/misc/flags.dmi' /obj/structure/sign/flag/usa name = "flag of the United States of America" desc = "'Stars and Stripes', the flag of the United States of America. Its red color represents endurance and valor; blue one shows diligence, vigilance and justice, and the white one signs at pureness. Its thirteen red-and-white stripes show the initial thirteen founding colonies, and fifty stars designate the current fifty states." icon_state = "flag_usa" item_flag = /obj/item/sign/flag/usa - icon = 'modular_ss220/modules/return_prs/black_mesa/icons/misc/flags.dmi' + icon = 'modular_ss220/reverts/return_prs/icons/black_mesa/misc/flags.dmi' MAPPING_DIRECTIONAL_HELPERS(/obj/structure/sign/flag/usa, 32) diff --git a/modular_ss220/modules/return_prs/black_mesa/code/fluff.dm b/modular_ss220/reverts/return_prs/code/black_mesa/fluff.dm similarity index 100% rename from modular_ss220/modules/return_prs/black_mesa/code/fluff.dm rename to modular_ss220/reverts/return_prs/code/black_mesa/fluff.dm diff --git a/modular_ss220/modules/return_prs/black_mesa/code/follow_component.dm b/modular_ss220/reverts/return_prs/code/black_mesa/follow_component.dm similarity index 100% rename from modular_ss220/modules/return_prs/black_mesa/code/follow_component.dm rename to modular_ss220/reverts/return_prs/code/black_mesa/follow_component.dm diff --git a/modular_ss220/modules/return_prs/black_mesa/code/gateway.dm b/modular_ss220/reverts/return_prs/code/black_mesa/gateway.dm similarity index 100% rename from modular_ss220/modules/return_prs/black_mesa/code/gateway.dm rename to modular_ss220/reverts/return_prs/code/black_mesa/gateway.dm diff --git a/modular_ss220/modules/return_prs/black_mesa/code/ghost_spawners.dm b/modular_ss220/reverts/return_prs/code/black_mesa/ghost_spawners.dm similarity index 96% rename from modular_ss220/modules/return_prs/black_mesa/code/ghost_spawners.dm rename to modular_ss220/reverts/return_prs/code/black_mesa/ghost_spawners.dm index df6f851df1f017..772cf4218f231d 100644 --- a/modular_ss220/modules/return_prs/black_mesa/code/ghost_spawners.dm +++ b/modular_ss220/reverts/return_prs/code/black_mesa/ghost_spawners.dm @@ -116,9 +116,9 @@ /obj/item/storage/backpack/ert/odst/hecu name = "hecu backpack" - icon = 'modular_ss220/modules/return_prs/black_mesa/icons/misc/hecucloth.dmi' - worn_icon = 'modular_ss220/modules/return_prs/black_mesa/icons/misc/hecumob.dmi' - worn_icon_digi = 'modular_ss220/modules/return_prs/black_mesa/icons/misc/hecumob_digi.dmi' + icon = 'modular_ss220/reverts/return_prs/icons/black_mesa/misc/hecucloth.dmi' + worn_icon = 'modular_ss220/reverts/return_prs/icons/black_mesa/misc/hecumob.dmi' + worn_icon_digi = 'modular_ss220/reverts/return_prs/icons/black_mesa/misc/hecumob_digi.dmi' icon_state = "hecu_pack" worn_icon_state = "hecu_pack" uses_advanced_reskins = TRUE @@ -135,9 +135,9 @@ /obj/item/storage/belt/military/assault/hecu name = "hecu warbelt" - icon = 'modular_ss220/modules/return_prs/black_mesa/icons/misc/hecucloth.dmi' - worn_icon = 'modular_ss220/modules/return_prs/black_mesa/icons/misc/hecumob.dmi' - worn_icon_digi = 'modular_ss220/modules/return_prs/black_mesa/icons/misc/hecumob_digi.dmi' + icon = 'modular_ss220/reverts/return_prs/icons/black_mesa/misc/hecucloth.dmi' + worn_icon = 'modular_ss220/reverts/return_prs/icons/black_mesa/misc/hecumob.dmi' + worn_icon_digi = 'modular_ss220/reverts/return_prs/icons/black_mesa/misc/hecumob_digi.dmi' icon_state = "hecu_belt" worn_icon_state = "hecu_belt" uses_advanced_reskins = TRUE diff --git a/modular_ss220/modules/return_prs/black_mesa/code/guns.dm b/modular_ss220/reverts/return_prs/code/black_mesa/guns.dm similarity index 63% rename from modular_ss220/modules/return_prs/black_mesa/code/guns.dm rename to modular_ss220/reverts/return_prs/code/black_mesa/guns.dm index 938c1b2f8fd928..84a65f0987893c 100644 --- a/modular_ss220/modules/return_prs/black_mesa/code/guns.dm +++ b/modular_ss220/reverts/return_prs/code/black_mesa/guns.dm @@ -35,11 +35,11 @@ impact_type = /obj/effect/projectile/impact/solar /obj/item/gun/ballistic/automatic/mp5 - name = "\improper MP5/40" + name = "/improper MP5/40" desc = "An old SMG, this one is chambered in 10mm Auto. It has Heckler & Koch etched above the magazine well." - icon = 'modular_ss220/modules/return_prs/gunsgalore/icons/guns/gunsgalore_guns40x32.dmi' - lefthand_file = 'modular_ss220/modules/return_prs/gunsgalore/icons/guns/gunsgalore_lefthand.dmi' - righthand_file ='modular_ss220/modules/return_prs/gunsgalore/icons/guns/gunsgalore_righthand.dmi' + icon = 'modular_ss220/reverts/return_prs/icons/gunsgalore/guns/gunsgalore_guns40x32.dmi' + lefthand_file = 'modular_ss220/reverts/return_prs/icons/gunsgalore/guns/gunsgalore_lefthand.dmi' + righthand_file ='modular_ss220/reverts/return_prs/icons/gunsgalore/guns/gunsgalore_righthand.dmi' icon_state = "mp5" inhand_icon_state = "mp5" accepted_magazine_type = /obj/item/ammo_box/magazine/mp5 @@ -48,16 +48,16 @@ fire_delay = 1.25 spread = 2.5 mag_display = TRUE - load_sound = 'modular_ss220/modules/return_prs/gunsgalore/sound/guns/interact/mp5_magin.ogg' - load_empty_sound = 'modular_ss220/modules/return_prs/gunsgalore/sound/guns/interact/mp5_magin.ogg' - rack_sound = 'modular_ss220/modules/return_prs/gunsgalore/sound/guns/interact/mp5_cock.ogg' - lock_back_sound = 'modular_ss220/modules/return_prs/gunsgalore/sound/guns/interact/mp5_boltback.ogg' - eject_sound = 'modular_ss220/modules/return_prs/gunsgalore/sound/guns/interact/mp5_magout.ogg' - eject_empty_sound = 'modular_ss220/modules/return_prs/gunsgalore/sound/guns/interact/mp5_magout.ogg' - bolt_drop_sound = 'modular_ss220/modules/return_prs/gunsgalore/sound/guns/interact/mp5_boltforward.ogg' - fire_sound = 'modular_ss220/modules/return_prs/gunsgalore/sound/guns/fire/mp5_fire.ogg' - alternative_fire_sound = 'modular_ss220/modules/return_prs/gunsgalore/sound/guns/fire/mp5_fire_suppressed.ogg' - suppressed_sound = 'modular_ss220/modules/return_prs/gunsgalore/sound/guns/fire/mp5_fire_suppressed.ogg' + load_sound = 'modular_ss220/reverts/return_prs/sound/gunsgalore/guns/interact/mp5_magin.ogg' + load_empty_sound = 'modular_ss220/reverts/return_prs/sound/gunsgalore/guns/interact/mp5_magin.ogg' + rack_sound = 'modular_ss220/reverts/return_prs/sound/gunsgalore/guns/interact/mp5_cock.ogg' + lock_back_sound = 'modular_ss220/reverts/return_prs/sound/gunsgalore/guns/interact/mp5_boltback.ogg' + eject_sound = 'modular_ss220/reverts/return_prs/sound/gunsgalore/guns/interact/mp5_magout.ogg' + eject_empty_sound = 'modular_ss220/reverts/return_prs/sound/gunsgalore/guns/interact/mp5_magout.ogg' + bolt_drop_sound = 'modular_ss220/reverts/return_prs/sound/gunsgalore/guns/interact/mp5_boltforward.ogg' + fire_sound = 'modular_ss220/reverts/return_prs/sound/gunsgalore/guns/fire/mp5_fire.ogg' + alternative_fire_sound = 'modular_ss220/reverts/return_prs/sound/gunsgalore/guns/fire/mp5_fire_suppressed.ogg' + suppressed_sound = 'modular_ss220/reverts/return_prs/sound/gunsgalore/guns/fire/mp5_fire_suppressed.ogg' weapon_weight = WEAPON_MEDIUM w_class = WEIGHT_CLASS_NORMAL projectile_damage_multiplier = 0.7 @@ -70,7 +70,7 @@ /obj/item/ammo_box/magazine/mp5 name = "MP5 magazine (10mm Auto)" desc = "Magazines taking 10mm ammunition; it fits in the MP5." - icon = 'modular_ss220/modules/return_prs/gunsgalore/icons/guns/gunsgalore_items.dmi' + icon = 'modular_ss220/reverts/return_prs/icons/gunsgalore/guns/gunsgalore_items.dmi' icon_state = "mp5" ammo_type = /obj/item/ammo_casing/c10mm caliber = CALIBER_10MM diff --git a/modular_ss220/modules/return_prs/black_mesa/code/healing_puddle.dm b/modular_ss220/reverts/return_prs/code/black_mesa/healing_puddle.dm similarity index 100% rename from modular_ss220/modules/return_prs/black_mesa/code/healing_puddle.dm rename to modular_ss220/reverts/return_prs/code/black_mesa/healing_puddle.dm diff --git a/modular_ss220/modules/return_prs/black_mesa/code/lambda_teleporter.dm b/modular_ss220/reverts/return_prs/code/black_mesa/lambda_teleporter.dm similarity index 83% rename from modular_ss220/modules/return_prs/black_mesa/code/lambda_teleporter.dm rename to modular_ss220/reverts/return_prs/code/black_mesa/lambda_teleporter.dm index 9f3e1e2d6df345..c6b815559aef69 100644 --- a/modular_ss220/modules/return_prs/black_mesa/code/lambda_teleporter.dm +++ b/modular_ss220/reverts/return_prs/code/black_mesa/lambda_teleporter.dm @@ -1,11 +1,10 @@ - /datum/looping_sound/lambda - mid_sounds = list('modular_ss220/modules/return_prs/black_mesa/sound/lc_mainbeam.ogg' = 1) + mid_sounds = list('modular_ss220/reverts/return_prs/sound/black_mesa/lc_mainbeam.ogg' = 1) mid_length = 8.1 SECONDS volume = 100 /obj/effect/bump_teleporter/lambda - name = "\improper Lambda Teleporter" + name = "/improper Lambda Teleporter" desc = "A super powerful teleporter capable of transporting you across dimensions." icon = 'icons/obj/machines/engine/energy_ball.dmi' icon_state = "energy_ball" @@ -31,7 +30,7 @@ /obj/effect/bump_teleporter/lambda/teleport_action(atom/movable/target, turf/destination) // Play sound before moving. - playsound(src, 'modular_ss220/modules/return_prs/black_mesa/sound/lc_teleport.ogg', 100) + playsound(src, 'modular_ss220/reverts/return_prs/sound/black_mesa/lc_teleport.ogg', 100) . = ..() diff --git a/modular_ss220/modules/return_prs/black_mesa/code/m16_variations.dm b/modular_ss220/reverts/return_prs/code/black_mesa/m16_variations.dm similarity index 72% rename from modular_ss220/modules/return_prs/black_mesa/code/m16_variations.dm rename to modular_ss220/reverts/return_prs/code/black_mesa/m16_variations.dm index fdd703390dfe7f..5b626cc28238dc 100644 --- a/modular_ss220/modules/return_prs/black_mesa/code/m16_variations.dm +++ b/modular_ss220/reverts/return_prs/code/black_mesa/m16_variations.dm @@ -1,12 +1,12 @@ /obj/item/gun/ballistic/automatic/m16/oldarms name = "\improper Mk-11.4 Rifle" desc = "An old-fashioned rifle from Sol-3's bygone era. Rumor has it that it can shoot apart an entire jungle (or desert, given the time). It has \"Keep out of water\" laser-engraved on the side. Now including a free reflex sight!" - icon = 'modular_ss220/modules/return_prs/gunsgalore/icons/guns/gunsgalore_guns40x32.dmi' + icon = 'modular_ss220/reverts/return_prs/icons/gunsgalore/guns/gunsgalore_guns40x32.dmi' icon_state = "m16" - lefthand_file = 'modular_ss220/modules/return_prs/gunsgalore/icons/guns/gunsgalore_lefthand.dmi' - righthand_file = 'modular_ss220/modules/return_prs/gunsgalore/icons/guns/gunsgalore_righthand.dmi' + lefthand_file = 'modular_ss220/reverts/return_prs/icons/gunsgalore/guns/gunsgalore_lefthand.dmi' + righthand_file = 'modular_ss220/reverts/return_prs/icons/gunsgalore/guns/gunsgalore_righthand.dmi' inhand_icon_state = "m16" - worn_icon = 'modular_ss220/modules/return_prs/gunsgalore/icons/guns/gunsgalore_back.dmi' + worn_icon = 'modular_ss220/reverts/return_prs/icons/gunsgalore/guns/gunsgalore_back.dmi' worn_icon_state = "m16" slot_flags = ITEM_SLOT_BELT | ITEM_SLOT_BACK w_class = WEIGHT_CLASS_BULKY @@ -15,12 +15,12 @@ fire_delay = 3.5 burst_size = 1 actions_types = list() - fire_sound = 'modular_ss220/modules/return_prs/gunsgalore/sound/guns/fire/m16_fire.ogg' + fire_sound = 'modular_ss220/reverts/return_prs/sound/gunsgalore/guns/fire/m16_fire.ogg' fire_sound_volume = 50 - rack_sound = 'modular_ss220/modules/return_prs/gunsgalore/sound/guns/interact/sfrifle_cock.ogg' - load_sound = 'modular_ss220/modules/return_prs/gunsgalore/sound/guns/interact/sfrifle_magin.ogg' - load_empty_sound = 'modular_ss220/modules/return_prs/gunsgalore/sound/guns/interact/sfrifle_magin.ogg' - eject_sound = 'modular_ss220/modules/return_prs/gunsgalore/sound/guns/interact/sfrifle_magout.ogg' + rack_sound = 'modular_ss220/reverts/return_prs/sound/gunsgalore/guns/interact/sfrifle_cock.ogg' + load_sound = 'modular_ss220/reverts/return_prs/sound/gunsgalore/guns/interact/sfrifle_magin.ogg' + load_empty_sound = 'modular_ss220/reverts/return_prs/sound/gunsgalore/guns/interact/sfrifle_magin.ogg' + eject_sound = 'modular_ss220/reverts/return_prs/sound/gunsgalore/guns/interact/smg_magout.ogg' /obj/item/gun/ballistic/automatic/m16/oldarms/Initialize(mapload) @@ -31,7 +31,7 @@ /obj/item/ammo_box/magazine/m16/vintage/oldarms name = "old-fashioned mk-11.4 rifle magazine" desc = "A double-stack solid magazine that looks rather dated. Holds 20 rounds of .223 Stinger." - icon = 'modular_ss220/modules/return_prs/gunsgalore/icons/guns/gunsgalore_items.dmi' + icon = 'modular_ss220/reverts/return_prs/icons/gunsgalore/guns/gunsgalore_items.dmi' icon_state = "m16" ammo_type = /obj/item/ammo_casing/oldarms/a223s caliber = CALIBER_223S diff --git a/modular_ss220/modules/return_prs/black_mesa/code/mapping_fluff.dm b/modular_ss220/reverts/return_prs/code/black_mesa/mapping_fluff.dm similarity index 82% rename from modular_ss220/modules/return_prs/black_mesa/code/mapping_fluff.dm rename to modular_ss220/reverts/return_prs/code/black_mesa/mapping_fluff.dm index b2631e2a762d17..d338f93638a020 100644 --- a/modular_ss220/modules/return_prs/black_mesa/code/mapping_fluff.dm +++ b/modular_ss220/reverts/return_prs/code/black_mesa/mapping_fluff.dm @@ -19,15 +19,15 @@ /obj/structure/mineral_door/xen name = "organic door" color = "#ff8d58" - icon = 'modular_ss220/modules/return_prs/black_mesa/icons/xen_door.dmi' + icon = 'modular_ss220/reverts/return_prs/icons/black_mesa/xen_door.dmi' icon_state = "resin" - openSound = 'modular_ss220/modules/return_prs/black_mesa/sound/xen_door.ogg' - closeSound = 'modular_ss220/modules/return_prs/black_mesa/sound/xen_door.ogg' + openSound = 'modular_ss220/reverts/return_prs/sound/black_mesa/xen_door.ogg' + closeSound = 'modular_ss220/reverts/return_prs/sound/black_mesa/xen_door.ogg' /obj/machinery/door/puzzle/keycard/xen name = "locktight organic door" desc = "An oddly robust organic looking door." - icon = 'modular_ss220/modules/return_prs/black_mesa/icons/xen_door.dmi' + icon = 'modular_ss220/reverts/return_prs/icons/black_mesa/xen_door.dmi' icon_state = "resin" puzzle_id = "xen" @@ -57,7 +57,7 @@ /obj/structure/pod name = "supply pod" desc = "Someone must have sent this a long way." - icon = 'modular_ss220/modules/return_prs/black_mesa/icons/structures.dmi' + icon = 'modular_ss220/reverts/return_prs/icons/black_mesa/structures.dmi' icon_state = "pod" pixel_x = SUPPLYPOD_X_OFFSET anchored = TRUE diff --git a/modular_ss220/modules/return_prs/black_mesa/code/miscguns.dm b/modular_ss220/reverts/return_prs/code/black_mesa/miscguns.dm similarity index 85% rename from modular_ss220/modules/return_prs/black_mesa/code/miscguns.dm rename to modular_ss220/reverts/return_prs/code/black_mesa/miscguns.dm index df79a07baf241d..2b5b685e6f1c7e 100644 --- a/modular_ss220/modules/return_prs/black_mesa/code/miscguns.dm +++ b/modular_ss220/reverts/return_prs/code/black_mesa/miscguns.dm @@ -1,12 +1,12 @@ /obj/item/gun/ballistic/shotgun/m23 name = "\improper Model 23-37" desc = "An outdated police shotgun sporting an eight-round tube, chambered in twelve-gauge." - icon = 'modular_ss220/modules/return_prs/black_mesa/icons/miscweapon/guns.dmi' + icon = 'modular_ss220/reverts/return_prs/icons/black_mesa/miscweapon/guns.dmi' icon_state = "riotshotgun" - worn_icon = 'modular_ss220/modules/return_prs/black_mesa/icons/miscweapon/guns_back.dmi' + worn_icon = 'modular_ss220/reverts/return_prs/icons/black_mesa/miscweapon/guns_back.dmi' worn_icon_state = "riotshotgun" - lefthand_file = 'modular_ss220/modules/return_prs/black_mesa/icons/miscweapon/guns_lefthand.dmi' - righthand_file = 'modular_ss220/modules/return_prs/black_mesa/icons/miscweapon/guns_righthand.dmi' + lefthand_file = 'modular_ss220/reverts/return_prs/icons/black_mesa/miscweapon/guns_lefthand.dmi' + righthand_file = 'modular_ss220/reverts/return_prs/icons/black_mesa/miscweapon/guns_righthand.dmi' inhand_icon_state = "riot_shotgun" accepted_magazine_type = /obj/item/ammo_box/magazine/internal/shot/m23 w_class = WEIGHT_CLASS_BULKY @@ -23,15 +23,10 @@ ammo_type = /obj/item/ammo_casing/shotgun/rubbershot max_ammo = 8 - - - - - /obj/item/gun/ballistic/automatic/pistol/g18 name = "\improper Glock-18" desc = "A weapon from bygone times, and this is the exact 21st century version. Let's hope it's more reliable. Chambered in 9x25mm." - icon = 'modular_ss220/modules/return_prs/black_mesa/icons/miscweapon/glock.dmi' + icon = 'modular_ss220/reverts/return_prs/icons/black_mesa/miscweapon/glock.dmi' icon_state = "glock_mesa" w_class = WEIGHT_CLASS_NORMAL accepted_magazine_type = /obj/item/ammo_box/magazine/g18 @@ -57,7 +52,7 @@ /obj/item/ammo_box/magazine/g18 name = "\improper Glock-18 magazine" desc = "A magazine for the Glock-18 machine pistol, chambered for 9x25mm." - icon = 'modular_ss220/modules/return_prs/black_mesa/icons/miscweapon/mags.dmi' + icon = 'modular_ss220/reverts/return_prs/icons/black_mesa/miscweapon/mags.dmi' icon_state = "g17" ammo_type = /obj/item/ammo_casing/c9mm caliber = CALIBER_9MM @@ -73,14 +68,10 @@ /obj/item/ammo_box/magazine/g18/rubber ammo_type = /obj/item/ammo_casing/c9mm/rubber - - - - /obj/item/gun/ballistic/automatic/pistol/g20 name = "\improper Glock 20" desc = "A weapon from bygone times, and this is the exact 21st century version. In fact, even more reliable. Chambered in 10mm Auto." - icon = 'modular_ss220/modules/return_prs/black_mesa/icons/miscweapon/glock.dmi' + icon = 'modular_ss220/reverts/return_prs/icons/black_mesa/miscweapon/glock.dmi' icon_state = "glock_spec" w_class = WEIGHT_CLASS_NORMAL accepted_magazine_type = /obj/item/ammo_box/magazine/g20 @@ -99,7 +90,7 @@ /obj/item/ammo_box/magazine/g20 name = "\improper Glock-20 magazine" desc = "A magazine for the Glock-20 handgun, chambered for 10mm ammo." - icon = 'modular_ss220/modules/return_prs/black_mesa/icons/miscweapon/mags.dmi' + icon = 'modular_ss220/reverts/return_prs/icons/black_mesa/miscweapon/mags.dmi' icon_state = "pdh" ammo_type = /obj/item/ammo_casing/c10mm caliber = CALIBER_10MM @@ -129,7 +120,7 @@ /obj/item/ammo_box/magazine/cm68 name = "rifle magazine (6.8mm)" - icon = 'modular_ss220/modules/return_prs/black_mesa/icons/miscweapon/mags.dmi' + icon = 'modular_ss220/reverts/return_prs/icons/black_mesa/miscweapon/mags.dmi' icon_state = "6.8" ammo_type = /obj/item/ammo_casing/a68 caliber = CALIBER_A68 @@ -147,13 +138,13 @@ /obj/item/gun/ballistic/automatic/cfa_rifle name = "Cantanheim 6.8mm rifle" desc = "A simple semi-automatic rifle chambered in 6.8mm. The letters 'XJP' are crossed out in the receiver." //Different 6.8mm than the FTU's propietary pulse ballistics - icon = 'modular_ss220/modules/return_prs/black_mesa/icons/miscweapon/guns.dmi' + icon = 'modular_ss220/reverts/return_prs/icons/black_mesa/miscweapon/guns.dmi' icon_state = "cfa_rifle" inhand_icon_state = "irifle" inhand_x_dimension = 64 inhand_y_dimension = 64 - lefthand_file = 'modular_ss220/modules/return_prs/black_mesa/icons/miscweapon/64x_guns_left.dmi' - righthand_file = 'modular_ss220/modules/return_prs/black_mesa/icons/miscweapon/64x_guns_right.dmi' + lefthand_file = 'modular_ss220/reverts/return_prs/icons/black_mesa/miscweapon/64x_guns_left.dmi' + righthand_file = 'modular_ss220/reverts/return_prs/icons/black_mesa/miscweapon/64x_guns_right.dmi' worn_icon_state = "gun" accepted_magazine_type = /obj/item/ammo_box/magazine/cm68 fire_delay = 54 diff --git a/modular_ss220/modules/return_prs/black_mesa/code/mobs/bullsquid.dm b/modular_ss220/reverts/return_prs/code/black_mesa/mobs/bullsquid.dm similarity index 67% rename from modular_ss220/modules/return_prs/black_mesa/code/mobs/bullsquid.dm rename to modular_ss220/reverts/return_prs/code/black_mesa/mobs/bullsquid.dm index ca03db4fe05b5a..1a18a49ccec3f4 100644 --- a/modular_ss220/modules/return_prs/black_mesa/code/mobs/bullsquid.dm +++ b/modular_ss220/reverts/return_prs/code/black_mesa/mobs/bullsquid.dm @@ -1,7 +1,7 @@ /mob/living/simple_animal/hostile/blackmesa/xen/bullsquid name = "bullsquid" desc = "Some highly aggressive alien creature. Thrives in toxic environments." - icon = 'modular_ss220/modules/return_prs/black_mesa/icons/mobs.dmi' + icon = 'modular_ss220/reverts/return_prs/icons/black_mesa/mobs.dmi' icon_state = "bullsquid" icon_living = "bullsquid" icon_dead = "bullsquid_dead" @@ -24,14 +24,14 @@ minimum_distance = 4 dodging = TRUE projectiletype = /obj/projectile/bullsquid - projectilesound = 'modular_ss220/modules/return_prs/black_mesa/sound/mobs/bullsquid/goo_attack3.ogg' + projectilesound = 'modular_ss220/reverts/return_prs/sound/black_mesa/mobs/bullsquid/goo_attack3.ogg' melee_damage_upper = 18 - attack_sound = 'modular_ss220/modules/return_prs/black_mesa/sound/mobs/bullsquid/attack1.ogg' + attack_sound = 'modular_ss220/reverts/return_prs/sound/black_mesa/mobs/bullsquid/attack1.ogg' gold_core_spawnable = HOSTILE_SPAWN alert_sounds = list( - 'modular_ss220/modules/return_prs/black_mesa/sound/mobs/bullsquid/detect1.ogg', - 'modular_ss220/modules/return_prs/black_mesa/sound/mobs/bullsquid/detect2.ogg', - 'modular_ss220/modules/return_prs/black_mesa/sound/mobs/bullsquid/detect3.ogg' + 'modular_ss220/reverts/return_prs/sound/black_mesa/mobs/bullsquid/detect1.ogg', + 'modular_ss220/reverts/return_prs/sound/black_mesa/mobs/bullsquid/detect2.ogg', + 'modular_ss220/reverts/return_prs/sound/black_mesa/mobs/bullsquid/detect3.ogg' ) /obj/projectile/bullsquid @@ -42,8 +42,8 @@ knockdown = 20 armor_flag = BIO impact_effect_type = /obj/effect/temp_visual/impact_effect/neurotoxin - hitsound = 'modular_ss220/modules/return_prs/black_mesa/sound/mobs/bullsquid/splat1.ogg' - hitsound_wall = 'modular_ss220/modules/return_prs/black_mesa/sound/mobs/bullsquid/splat1.ogg' + hitsound = 'modular_ss220/reverts/return_prs/sound/black_mesa/mobs/bullsquid/splat1.ogg' + hitsound_wall = 'modular_ss220/reverts/return_prs/sound/black_mesa/mobs/bullsquid/splat1.ogg' /obj/projectile/bullsquid/on_hit(atom/target, blocked, pierce_hit) new /obj/effect/decal/cleanable/greenglow(target.loc) diff --git a/modular_ss220/modules/return_prs/black_mesa/code/mobs/gordon_freeman.dm b/modular_ss220/reverts/return_prs/code/black_mesa/mobs/gordon_freeman.dm similarity index 96% rename from modular_ss220/modules/return_prs/black_mesa/code/mobs/gordon_freeman.dm rename to modular_ss220/reverts/return_prs/code/black_mesa/mobs/gordon_freeman.dm index b52e82bb4594e9..1028687582c2e0 100644 --- a/modular_ss220/modules/return_prs/black_mesa/code/mobs/gordon_freeman.dm +++ b/modular_ss220/reverts/return_prs/code/black_mesa/mobs/gordon_freeman.dm @@ -43,7 +43,7 @@ /obj/machinery/door/puzzle/keycard/xen/freeman_boss_entry name = "entry door" desc = "Complete the puzzle to open this door." - icon = 'modular_ss220/modules/return_prs/black_mesa/icons/xen_door.dmi' + icon = 'modular_ss220/reverts/return_prs/icons/black_mesa/xen_door.dmi' icon_state = "resin" puzzle_id = "freeman_entry" @@ -55,7 +55,7 @@ /obj/machinery/door/puzzle/keycard/xen/freeman_boss_exit name = "exit door" desc = "You must defeat him." - icon = 'modular_ss220/modules/return_prs/black_mesa/icons/xen_door.dmi' + icon = 'modular_ss220/reverts/return_prs/icons/black_mesa/xen_door.dmi' icon_state = "resin" puzzle_id = "freeman_exit" diff --git a/modular_ss220/modules/return_prs/black_mesa/code/mobs/headcrab.dm b/modular_ss220/reverts/return_prs/code/black_mesa/mobs/headcrab.dm similarity index 86% rename from modular_ss220/modules/return_prs/black_mesa/code/mobs/headcrab.dm rename to modular_ss220/reverts/return_prs/code/black_mesa/mobs/headcrab.dm index 34b2369e6e3aa9..25ca4001881d82 100644 --- a/modular_ss220/modules/return_prs/black_mesa/code/mobs/headcrab.dm +++ b/modular_ss220/reverts/return_prs/code/black_mesa/mobs/headcrab.dm @@ -1,7 +1,7 @@ /mob/living/simple_animal/hostile/blackmesa/xen/headcrab name = "headcrab" desc = "Don't let it latch onto your hea-... hey, that's kinda cool." - icon = 'modular_ss220/modules/return_prs/black_mesa/icons/mobs.dmi' + icon = 'modular_ss220/reverts/return_prs/icons/black_mesa/mobs.dmi' icon_state = "headcrab" icon_living = "headcrab" icon_dead = "headcrab_dead" @@ -29,7 +29,7 @@ gold_core_spawnable = HOSTILE_SPAWN loot = list(/obj/item/stack/sheet/bone) alert_sounds = list( - 'modular_ss220/modules/return_prs/black_mesa/sound/mobs/headcrab/alert1.ogg' + 'modular_ss220/reverts/return_prs/sound/black_mesa/mobs/headcrab/alert1.ogg' ) var/is_zombie = FALSE var/mob/living/carbon/human/oldguy @@ -52,15 +52,15 @@ throw_at(targeted_atom, throw_at_range, throw_at_speed) playsound( src, - pick('modular_ss220/modules/return_prs/black_mesa/sound/mobs/headcrab/attack1.ogg', 'modular_ss220/modules/return_prs/black_mesa/sound/mobs/headcrab/attack2.ogg', 'modular_ss220/modules/return_prs/black_mesa/sound/mobs/headcrab/attack3.ogg'), + pick('modular_ss220/reverts/return_prs/sound/black_mesa/mobs/headcrab/attack1.ogg', 'modular_ss220/reverts/return_prs/sound/black_mesa/mobs/headcrab/attack2.ogg', 'modular_ss220/reverts/return_prs/sound/black_mesa/mobs/headcrab/attack3.ogg'), 100 ) /mob/living/simple_animal/hostile/blackmesa/xen/headcrab/death(gibbed) . = ..() playsound(src, pick(list( - 'modular_ss220/modules/return_prs/black_mesa/sound/mobs/headcrab/die1.ogg', - 'modular_ss220/modules/return_prs/black_mesa/sound/mobs/headcrab/die2.ogg' + 'modular_ss220/reverts/return_prs/sound/black_mesa/mobs/headcrab/die1.ogg', + 'modular_ss220/reverts/return_prs/sound/black_mesa/mobs/headcrab/die2.ogg' )), 100) /mob/living/simple_animal/hostile/blackmesa/xen/headcrab/throw_impact(atom/hit_atom, datum/thrownthing/throwingdatum) @@ -69,7 +69,7 @@ return if(!isliving(hit_atom)) return - playsound(src, 'modular_ss220/modules/return_prs/black_mesa/sound/mobs/headcrab/headbite.ogg', 100) + playsound(src, 'modular_ss220/reverts/return_prs/sound/black_mesa/mobs/headcrab/headbite.ogg', 100) var/mob/living/hit_mob = hit_atom hit_mob.apply_damage(melee_damage_upper, BRUTE) if(!ishuman(hit_atom)) @@ -133,7 +133,7 @@ . = ..() if(is_zombie) copy_overlays(oldguy, TRUE) - var/mutable_appearance/blob_head_overlay = mutable_appearance('modular_ss220/modules/return_prs/black_mesa/icons/mobs.dmi', "headcrab_zombie") + var/mutable_appearance/blob_head_overlay = mutable_appearance('modular_ss220/reverts/return_prs/icons/black_mesa/mobs.dmi', "headcrab_zombie") add_overlay(blob_head_overlay) /mob/living/simple_animal/hostile/blackmesa/xen/headcrab/fast diff --git a/modular_ss220/modules/return_prs/black_mesa/code/mobs/headcrab_zombie.dm b/modular_ss220/reverts/return_prs/code/black_mesa/mobs/headcrab_zombie.dm similarity index 60% rename from modular_ss220/modules/return_prs/black_mesa/code/mobs/headcrab_zombie.dm rename to modular_ss220/reverts/return_prs/code/black_mesa/mobs/headcrab_zombie.dm index 3dc77f8c57c6ee..e6d7cdea8efab6 100644 --- a/modular_ss220/modules/return_prs/black_mesa/code/mobs/headcrab_zombie.dm +++ b/modular_ss220/reverts/return_prs/code/black_mesa/mobs/headcrab_zombie.dm @@ -1,7 +1,7 @@ /mob/living/simple_animal/hostile/blackmesa/xen/headcrab_zombie name = "headcrab zombie" desc = "This unlucky person has had a headcrab latch onto their head. Ouch." - icon = 'modular_ss220/modules/return_prs/black_mesa/icons/mobs.dmi' + icon = 'modular_ss220/reverts/return_prs/icons/black_mesa/mobs.dmi' icon_state = "zombie" icon_living = "zombie" maxHealth = 110 @@ -15,16 +15,16 @@ taunt_chance = 100 melee_damage_lower = 21 melee_damage_upper = 21 - attack_sound = 'modular_ss220/modules/return_prs/black_mesa/sound/mobs/zombies/claw_strike.ogg' + attack_sound = 'modular_ss220/reverts/return_prs/sound/black_mesa/mobs/zombies/claw_strike.ogg' gold_core_spawnable = HOSTILE_SPAWN alert_cooldown_time = 8 SECONDS alert_sounds = list( - 'modular_ss220/modules/return_prs/black_mesa/sound/mobs/zombies/alert1.ogg', - 'modular_ss220/modules/return_prs/black_mesa/sound/mobs/zombies/alert2.ogg', - 'modular_ss220/modules/return_prs/black_mesa/sound/mobs/zombies/alert3.ogg', - 'modular_ss220/modules/return_prs/black_mesa/sound/mobs/zombies/alert4.ogg', - 'modular_ss220/modules/return_prs/black_mesa/sound/mobs/zombies/alert5.ogg', - 'modular_ss220/modules/return_prs/black_mesa/sound/mobs/zombies/alert6.ogg', + 'modular_ss220/reverts/return_prs/sound/black_mesa/mobs/zombies/alert1.ogg', + 'modular_ss220/reverts/return_prs/sound/black_mesa/mobs/zombies/alert2.ogg', + 'modular_ss220/reverts/return_prs/sound/black_mesa/mobs/zombies/alert3.ogg', + 'modular_ss220/reverts/return_prs/sound/black_mesa/mobs/zombies/alert4.ogg', + 'modular_ss220/reverts/return_prs/sound/black_mesa/mobs/zombies/alert5.ogg', + 'modular_ss220/reverts/return_prs/sound/black_mesa/mobs/zombies/alert6.ogg', ) /mob/living/simple_animal/hostile/blackmesa/xen/headcrab_zombie/death(gibbed) @@ -68,20 +68,20 @@ maxHealth = 250 health = 250 alert_sounds = list( - 'modular_ss220/modules/return_prs/black_mesa/sound/mobs/zombies/hzv1.ogg', - 'modular_ss220/modules/return_prs/black_mesa/sound/mobs/zombies/hzv2.ogg', - 'modular_ss220/modules/return_prs/black_mesa/sound/mobs/zombies/hzv3.ogg', - 'modular_ss220/modules/return_prs/black_mesa/sound/mobs/zombies/hzv4.ogg', - 'modular_ss220/modules/return_prs/black_mesa/sound/mobs/zombies/hzv5.ogg', - 'modular_ss220/modules/return_prs/black_mesa/sound/mobs/zombies/hzv6.ogg', - 'modular_ss220/modules/return_prs/black_mesa/sound/mobs/zombies/hzv7.ogg', - 'modular_ss220/modules/return_prs/black_mesa/sound/mobs/zombies/hzv8.ogg', - 'modular_ss220/modules/return_prs/black_mesa/sound/mobs/zombies/hzv9.ogg', - 'modular_ss220/modules/return_prs/black_mesa/sound/mobs/zombies/hzv10.ogg', - 'modular_ss220/modules/return_prs/black_mesa/sound/mobs/zombies/hzv11.ogg', - 'modular_ss220/modules/return_prs/black_mesa/sound/mobs/zombies/hzv12.ogg', - 'modular_ss220/modules/return_prs/black_mesa/sound/mobs/zombies/hzv13.ogg', - 'modular_ss220/modules/return_prs/black_mesa/sound/mobs/zombies/hzv14.ogg', + 'modular_ss220/reverts/return_prs/sound/black_mesa/mobs/zombies/hzv1.ogg', + 'modular_ss220/reverts/return_prs/sound/black_mesa/mobs/zombies/hzv2.ogg', + 'modular_ss220/reverts/return_prs/sound/black_mesa/mobs/zombies/hzv3.ogg', + 'modular_ss220/reverts/return_prs/sound/black_mesa/mobs/zombies/hzv4.ogg', + 'modular_ss220/reverts/return_prs/sound/black_mesa/mobs/zombies/hzv5.ogg', + 'modular_ss220/reverts/return_prs/sound/black_mesa/mobs/zombies/hzv6.ogg', + 'modular_ss220/reverts/return_prs/sound/black_mesa/mobs/zombies/hzv7.ogg', + 'modular_ss220/reverts/return_prs/sound/black_mesa/mobs/zombies/hzv8.ogg', + 'modular_ss220/reverts/return_prs/sound/black_mesa/mobs/zombies/hzv9.ogg', + 'modular_ss220/reverts/return_prs/sound/black_mesa/mobs/zombies/hzv10.ogg', + 'modular_ss220/reverts/return_prs/sound/black_mesa/mobs/zombies/hzv11.ogg', + 'modular_ss220/reverts/return_prs/sound/black_mesa/mobs/zombies/hzv12.ogg', + 'modular_ss220/reverts/return_prs/sound/black_mesa/mobs/zombies/hzv13.ogg', + 'modular_ss220/reverts/return_prs/sound/black_mesa/mobs/zombies/hzv14.ogg', ) diff --git a/modular_ss220/modules/return_prs/black_mesa/code/mobs/houndeye.dm b/modular_ss220/reverts/return_prs/code/black_mesa/mobs/houndeye.dm similarity index 78% rename from modular_ss220/modules/return_prs/black_mesa/code/mobs/houndeye.dm rename to modular_ss220/reverts/return_prs/code/black_mesa/mobs/houndeye.dm index 1716d681b81c6a..9b2169bebe7916 100644 --- a/modular_ss220/modules/return_prs/black_mesa/code/mobs/houndeye.dm +++ b/modular_ss220/reverts/return_prs/code/black_mesa/mobs/houndeye.dm @@ -1,7 +1,7 @@ /mob/living/simple_animal/hostile/blackmesa/xen/houndeye name = "houndeye" desc = "Some highly aggressive alien creature. Thrives in toxic environments." - icon = 'modular_ss220/modules/return_prs/black_mesa/icons/mobs.dmi' + icon = 'modular_ss220/reverts/return_prs/icons/black_mesa/mobs.dmi' icon_state = "houndeye" icon_living = "houndeye" icon_dead = "houndeye_dead" @@ -28,11 +28,11 @@ maxbodytemp = 1500 loot = list(/obj/item/stack/sheet/bluespace_crystal) alert_sounds = list( - 'modular_ss220/modules/return_prs/black_mesa/sound/mobs/houndeye/he_alert1.ogg', - 'modular_ss220/modules/return_prs/black_mesa/sound/mobs/houndeye/he_alert2.ogg', - 'modular_ss220/modules/return_prs/black_mesa/sound/mobs/houndeye/he_alert3.ogg', - 'modular_ss220/modules/return_prs/black_mesa/sound/mobs/houndeye/he_alert4.ogg', - 'modular_ss220/modules/return_prs/black_mesa/sound/mobs/houndeye/he_alert5.ogg' + 'modular_ss220/reverts/return_prs/sound/black_mesa/mobs/houndeye/he_alert1.ogg', + 'modular_ss220/reverts/return_prs/sound/black_mesa/mobs/houndeye/he_alert2.ogg', + 'modular_ss220/reverts/return_prs/sound/black_mesa/mobs/houndeye/he_alert3.ogg', + 'modular_ss220/reverts/return_prs/sound/black_mesa/mobs/houndeye/he_alert4.ogg', + 'modular_ss220/reverts/return_prs/sound/black_mesa/mobs/houndeye/he_alert5.ogg', ) /// Charging ability var/datum/action/cooldown/mob_cooldown/charge/basic_charge/charge diff --git a/modular_ss220/modules/return_prs/black_mesa/code/mobs/human_mobs.dm b/modular_ss220/reverts/return_prs/code/black_mesa/mobs/human_mobs.dm similarity index 63% rename from modular_ss220/modules/return_prs/black_mesa/code/mobs/human_mobs.dm rename to modular_ss220/reverts/return_prs/code/black_mesa/mobs/human_mobs.dm index ef3fec142cfcc4..807e638e4e3c8f 100644 --- a/modular_ss220/modules/return_prs/black_mesa/code/mobs/human_mobs.dm +++ b/modular_ss220/reverts/return_prs/code/black_mesa/mobs/human_mobs.dm @@ -5,7 +5,7 @@ /mob/living/simple_animal/hostile/blackmesa/hecu name = "HECU Grunt" desc = "I didn't sign on for this shit. Monsters, sure, but civilians? Who ordered this operation anyway?" - icon = 'modular_ss220/modules/return_prs/black_mesa/icons/mobs.dmi' + icon = 'modular_ss220/reverts/return_prs/icons/black_mesa/mobs.dmi' icon_state = "hecu_melee" icon_living = "hecu_melee" icon_dead = "hecu_dead" @@ -38,14 +38,14 @@ rapid_melee = 2 footstep_type = FOOTSTEP_MOB_SHOE alert_sounds = list( - 'modular_ss220/modules/return_prs/black_mesa/sound/mobs/hecu/hg_alert01.ogg', - 'modular_ss220/modules/return_prs/black_mesa/sound/mobs/hecu/hg_alert03.ogg', - 'modular_ss220/modules/return_prs/black_mesa/sound/mobs/hecu/hg_alert04.ogg', - 'modular_ss220/modules/return_prs/black_mesa/sound/mobs/hecu/hg_alert05.ogg', - 'modular_ss220/modules/return_prs/black_mesa/sound/mobs/hecu/hg_alert06.ogg', - 'modular_ss220/modules/return_prs/black_mesa/sound/mobs/hecu/hg_alert07.ogg', - 'modular_ss220/modules/return_prs/black_mesa/sound/mobs/hecu/hg_alert08.ogg', - 'modular_ss220/modules/return_prs/black_mesa/sound/mobs/hecu/hg_alert10.ogg' + 'modular_ss220/reverts/return_prs/sound/black_mesa/mobs/hecu/hg_alert01.ogg', + 'modular_ss220/reverts/return_prs/sound/black_mesa/mobs/hecu/hg_alert03.ogg', + 'modular_ss220/reverts/return_prs/sound/black_mesa/mobs/hecu/hg_alert04.ogg', + 'modular_ss220/reverts/return_prs/sound/black_mesa/mobs/hecu/hg_alert05.ogg', + 'modular_ss220/reverts/return_prs/sound/black_mesa/mobs/hecu/hg_alert06.ogg', + 'modular_ss220/reverts/return_prs/sound/black_mesa/mobs/hecu/hg_alert07.ogg', + 'modular_ss220/reverts/return_prs/sound/black_mesa/mobs/hecu/hg_alert08.ogg', + 'modular_ss220/reverts/return_prs/sound/black_mesa/mobs/hecu/hg_alert10.ogg', ) @@ -72,7 +72,7 @@ /mob/living/simple_animal/hostile/blackmesa/sec name = "Security Guard" desc = "About that beer I owe'd ya!" - icon = 'modular_ss220/modules/return_prs/black_mesa/icons/mobs.dmi' + icon = 'modular_ss220/reverts/return_prs/icons/black_mesa/mobs.dmi' icon_state = "security_guard_melee" icon_living = "security_guard_melee" icon_dead = "security_guard_dead" @@ -103,48 +103,47 @@ rapid_melee = 2 footstep_type = FOOTSTEP_MOB_SHOE alert_sounds = list( - 'modular_ss220/modules/return_prs/black_mesa/sound/mobs/security_guard/annoyance01.ogg', - 'modular_ss220/modules/return_prs/black_mesa/sound/mobs/security_guard/annoyance02.ogg', - 'modular_ss220/modules/return_prs/black_mesa/sound/mobs/security_guard/annoyance02.ogg', - 'modular_ss220/modules/return_prs/black_mesa/sound/mobs/security_guard/annoyance03.ogg', - 'modular_ss220/modules/return_prs/black_mesa/sound/mobs/security_guard/annoyance04.ogg', - 'modular_ss220/modules/return_prs/black_mesa/sound/mobs/security_guard/annoyance05.ogg', - 'modular_ss220/modules/return_prs/black_mesa/sound/mobs/security_guard/annoyance06.ogg', - 'modular_ss220/modules/return_prs/black_mesa/sound/mobs/security_guard/annoyance07.ogg', - 'modular_ss220/modules/return_prs/black_mesa/sound/mobs/security_guard/annoyance08.ogg', - 'modular_ss220/modules/return_prs/black_mesa/sound/mobs/security_guard/annoyance09.ogg', - 'modular_ss220/modules/return_prs/black_mesa/sound/mobs/security_guard/annoyance10.ogg' + 'modular_ss220/reverts/return_prs/sound/black_mesa/mobs/security_guard/annoyance01.ogg', + 'modular_ss220/reverts/return_prs/sound/black_mesa/mobs/security_guard/annoyance02.ogg', + 'modular_ss220/reverts/return_prs/sound/black_mesa/mobs/security_guard/annoyance03.ogg', + 'modular_ss220/reverts/return_prs/sound/black_mesa/mobs/security_guard/annoyance04.ogg', + 'modular_ss220/reverts/return_prs/sound/black_mesa/mobs/security_guard/annoyance05.ogg', + 'modular_ss220/reverts/return_prs/sound/black_mesa/mobs/security_guard/annoyance06.ogg', + 'modular_ss220/reverts/return_prs/sound/black_mesa/mobs/security_guard/annoyance07.ogg', + 'modular_ss220/reverts/return_prs/sound/black_mesa/mobs/security_guard/annoyance08.ogg', + 'modular_ss220/reverts/return_prs/sound/black_mesa/mobs/security_guard/annoyance09.ogg', + 'modular_ss220/reverts/return_prs/sound/black_mesa/mobs/security_guard/annoyance10.ogg', ) var/list/follow_sounds = list( - 'modular_ss220/modules/return_prs/black_mesa/sound/mobs/security_guard/leadon01.ogg', - 'modular_ss220/modules/return_prs/black_mesa/sound/mobs/security_guard/leadon02.ogg', - 'modular_ss220/modules/return_prs/black_mesa/sound/mobs/security_guard/leadon03.ogg', - 'modular_ss220/modules/return_prs/black_mesa/sound/mobs/security_guard/leadtheway01.ogg', - 'modular_ss220/modules/return_prs/black_mesa/sound/mobs/security_guard/leadtheway02.ogg', - 'modular_ss220/modules/return_prs/black_mesa/sound/mobs/security_guard/leadtheway03.ogg', - 'modular_ss220/modules/return_prs/black_mesa/sound/mobs/security_guard/leadtheway04.ogg', - 'modular_ss220/modules/return_prs/black_mesa/sound/mobs/security_guard/leadtheway05.ogg', - 'modular_ss220/modules/return_prs/black_mesa/sound/mobs/security_guard/leadtheway06.ogg', - 'modular_ss220/modules/return_prs/black_mesa/sound/mobs/security_guard/leadtheway07.ogg', - 'modular_ss220/modules/return_prs/black_mesa/sound/mobs/security_guard/leadtheway08.ogg', - 'modular_ss220/modules/return_prs/black_mesa/sound/mobs/security_guard/letsgo01.ogg', - 'modular_ss220/modules/return_prs/black_mesa/sound/mobs/security_guard/letsgo02.ogg', - 'modular_ss220/modules/return_prs/black_mesa/sound/mobs/security_guard/letsgo03.ogg', + 'modular_ss220/reverts/return_prs/sound/black_mesa/mobs/security_guard/leadon01.ogg', + 'modular_ss220/reverts/return_prs/sound/black_mesa/mobs/security_guard/leadon02.ogg', + 'modular_ss220/reverts/return_prs/sound/black_mesa/mobs/security_guard/leadon03.ogg', + 'modular_ss220/reverts/return_prs/sound/black_mesa/mobs/security_guard/leadtheway01.ogg', + 'modular_ss220/reverts/return_prs/sound/black_mesa/mobs/security_guard/leadtheway02.ogg', + 'modular_ss220/reverts/return_prs/sound/black_mesa/mobs/security_guard/leadtheway03.ogg', + 'modular_ss220/reverts/return_prs/sound/black_mesa/mobs/security_guard/leadtheway04.ogg', + 'modular_ss220/reverts/return_prs/sound/black_mesa/mobs/security_guard/leadtheway05.ogg', + 'modular_ss220/reverts/return_prs/sound/black_mesa/mobs/security_guard/leadtheway06.ogg', + 'modular_ss220/reverts/return_prs/sound/black_mesa/mobs/security_guard/leadtheway07.ogg', + 'modular_ss220/reverts/return_prs/sound/black_mesa/mobs/security_guard/leadtheway08.ogg', + 'modular_ss220/reverts/return_prs/sound/black_mesa/mobs/security_guard/letsgo01.ogg', + 'modular_ss220/reverts/return_prs/sound/black_mesa/mobs/security_guard/letsgo02.ogg', + 'modular_ss220/reverts/return_prs/sound/black_mesa/mobs/security_guard/letsgo03.ogg', ) var/list/unfollow_sounds = list( - 'modular_ss220/modules/return_prs/black_mesa/sound/mobs/security_guard/holddownspot01.ogg', - 'modular_ss220/modules/return_prs/black_mesa/sound/mobs/security_guard/holddownspot02.ogg', - 'modular_ss220/modules/return_prs/black_mesa/sound/mobs/security_guard/holddownspot03.ogg', - 'modular_ss220/modules/return_prs/black_mesa/sound/mobs/security_guard/holddownspot04.ogg', - 'modular_ss220/modules/return_prs/black_mesa/sound/mobs/security_guard/holddownspot05.ogg', - 'modular_ss220/modules/return_prs/black_mesa/sound/mobs/security_guard/illstayhere01.ogg', - 'modular_ss220/modules/return_prs/black_mesa/sound/mobs/security_guard/illstayhere02.ogg', - 'modular_ss220/modules/return_prs/black_mesa/sound/mobs/security_guard/illstayhere03.ogg', - 'modular_ss220/modules/return_prs/black_mesa/sound/mobs/security_guard/imstickinghere01.ogg', - 'modular_ss220/modules/return_prs/black_mesa/sound/mobs/security_guard/imstickinghere02.ogg', - 'modular_ss220/modules/return_prs/black_mesa/sound/mobs/security_guard/imstickinghere03.ogg', - 'modular_ss220/modules/return_prs/black_mesa/sound/mobs/security_guard/imstickinghere04.ogg', - 'modular_ss220/modules/return_prs/black_mesa/sound/mobs/security_guard/imstickinghere05.ogg', + 'modular_ss220/reverts/return_prs/sound/black_mesa/mobs/security_guard/holddownspot01.ogg', + 'modular_ss220/reverts/return_prs/sound/black_mesa/mobs/security_guard/holddownspot02.ogg', + 'modular_ss220/reverts/return_prs/sound/black_mesa/mobs/security_guard/holddownspot03.ogg', + 'modular_ss220/reverts/return_prs/sound/black_mesa/mobs/security_guard/holddownspot04.ogg', + 'modular_ss220/reverts/return_prs/sound/black_mesa/mobs/security_guard/holddownspot05.ogg', + 'modular_ss220/reverts/return_prs/sound/black_mesa/mobs/security_guard/illstayhere01.ogg', + 'modular_ss220/reverts/return_prs/sound/black_mesa/mobs/security_guard/illstayhere02.ogg', + 'modular_ss220/reverts/return_prs/sound/black_mesa/mobs/security_guard/illstayhere03.ogg', + 'modular_ss220/reverts/return_prs/sound/black_mesa/mobs/security_guard/imstickinghere01.ogg', + 'modular_ss220/reverts/return_prs/sound/black_mesa/mobs/security_guard/imstickinghere02.ogg', + 'modular_ss220/reverts/return_prs/sound/black_mesa/mobs/security_guard/imstickinghere03.ogg', + 'modular_ss220/reverts/return_prs/sound/black_mesa/mobs/security_guard/imstickinghere04.ogg', + 'modular_ss220/reverts/return_prs/sound/black_mesa/mobs/security_guard/imstickinghere05.ogg', ) var/follow_speed = 2 var/follow_distance = 2 @@ -168,7 +167,7 @@ /mob/living/simple_animal/hostile/blackmesa/blackops name = "black operative" desc = "Why do we always have to clean up a mess the grunts can't handle?" - icon = 'modular_ss220/modules/return_prs/black_mesa/icons/mobs.dmi' + icon = 'modular_ss220/reverts/return_prs/icons/black_mesa/mobs.dmi' icon_state = "blackops" icon_living = "blackops" icon_dead = "blackops" @@ -201,14 +200,14 @@ rapid_melee = 2 footstep_type = FOOTSTEP_MOB_SHOE alert_sounds = list( - 'modular_ss220/modules/return_prs/black_mesa/sound/mobs/blackops/bo_alert01.ogg', - 'modular_ss220/modules/return_prs/black_mesa/sound/mobs/blackops/bo_alert02.ogg', - 'modular_ss220/modules/return_prs/black_mesa/sound/mobs/blackops/bo_alert03.ogg', - 'modular_ss220/modules/return_prs/black_mesa/sound/mobs/blackops/bo_alert04.ogg', - 'modular_ss220/modules/return_prs/black_mesa/sound/mobs/blackops/bo_alert05.ogg', - 'modular_ss220/modules/return_prs/black_mesa/sound/mobs/blackops/bo_alert06.ogg', - 'modular_ss220/modules/return_prs/black_mesa/sound/mobs/blackops/bo_alert07.ogg', - 'modular_ss220/modules/return_prs/black_mesa/sound/mobs/blackops/bo_alert08.ogg' + 'modular_ss220/reverts/return_prs/sound/black_mesa/mobs/blackops/bo_alert01.ogg', + 'modular_ss220/reverts/return_prs/sound/black_mesa/mobs/blackops/bo_alert02.ogg', + 'modular_ss220/reverts/return_prs/sound/black_mesa/mobs/blackops/bo_alert03.ogg', + 'modular_ss220/reverts/return_prs/sound/black_mesa/mobs/blackops/bo_alert04.ogg', + 'modular_ss220/reverts/return_prs/sound/black_mesa/mobs/blackops/bo_alert05.ogg', + 'modular_ss220/reverts/return_prs/sound/black_mesa/mobs/blackops/bo_alert06.ogg', + 'modular_ss220/reverts/return_prs/sound/black_mesa/mobs/blackops/bo_alert07.ogg', + 'modular_ss220/reverts/return_prs/sound/black_mesa/mobs/blackops/bo_alert08.ogg', ) @@ -220,7 +219,7 @@ icon_state = "blackops_ranged" icon_living = "blackops_ranged" casingtype = /obj/item/ammo_casing/a223/weak - projectilesound = 'modular_ss220/modules/return_prs/gunsgalore/sound/guns/fire/m16_fire.ogg' + projectilesound = 'modular_ss220/reverts/return_prs/sound/gunsgalore/guns/fire/m16_fire.ogg' attack_sound = 'sound/items/weapons/punch1.ogg' loot = list(/obj/effect/gibspawner/human, /obj/item/ammo_box/magazine/m16) rapid_melee = 1 diff --git a/modular_ss220/modules/return_prs/black_mesa/code/mobs/mob_spawners.dm b/modular_ss220/reverts/return_prs/code/black_mesa/mobs/mob_spawners.dm similarity index 98% rename from modular_ss220/modules/return_prs/black_mesa/code/mobs/mob_spawners.dm rename to modular_ss220/reverts/return_prs/code/black_mesa/mobs/mob_spawners.dm index 9fd6b4a61ba5d0..c4aedc3bdcee26 100644 --- a/modular_ss220/modules/return_prs/black_mesa/code/mobs/mob_spawners.dm +++ b/modular_ss220/reverts/return_prs/code/black_mesa/mobs/mob_spawners.dm @@ -20,7 +20,7 @@ /obj/effect/random_mob_placer name = "mob placer" - icon = 'modular_ss220/modules/return_prs/black_mesa/icons/mapping_helpers.dmi' + icon = 'modular_ss220/reverts/return_prs/icons/black_mesa/mapping_helpers.dmi' icon_state = "mobspawner" var/list/possible_mobs = list(/mob/living/simple_animal/hostile/blackmesa/xen/headcrab) diff --git a/modular_ss220/modules/return_prs/black_mesa/code/mobs/nihilanth.dm b/modular_ss220/reverts/return_prs/code/black_mesa/mobs/nihilanth.dm similarity index 77% rename from modular_ss220/modules/return_prs/black_mesa/code/mobs/nihilanth.dm rename to modular_ss220/reverts/return_prs/code/black_mesa/mobs/nihilanth.dm index 53086d4b29d032..66cc695df61057 100644 --- a/modular_ss220/modules/return_prs/black_mesa/code/mobs/nihilanth.dm +++ b/modular_ss220/reverts/return_prs/code/black_mesa/mobs/nihilanth.dm @@ -1,7 +1,7 @@ /mob/living/simple_animal/hostile/blackmesa/xen/nihilanth name = "nihilanth" desc = "Holy shit." - icon = 'modular_ss220/modules/return_prs/black_mesa/icons/nihilanth.dmi' + icon = 'modular_ss220/reverts/return_prs/icons/black_mesa/nihilanth.dmi' icon_state = "nihilanth" icon_living = "nihilanth" SET_BASE_PIXEL(-32, -32) @@ -51,13 +51,13 @@ alert_cooldown_time = world.time + alert_cooldown switch(health) if(0 to 999) - playsound(src, pick(list('modular_ss220/modules/return_prs/black_mesa/sound/mobs/nihilanth/nihilanth_pain01.ogg', 'modular_ss220/modules/return_prs/black_mesa/sound/mobs/nihilanth/nihilanth_freeeemmaan01.ogg')), 100) + playsound(src, pick(list('modular_ss220/reverts/return_prs/sound/black_mesa/mobs/nihilanth/nihilanth_pain01.ogg', 'modular_ss220/reverts/return_prs/sound/black_mesa/mobs/nihilanth/nihilanth_freeeemmaan01.ogg')), 100) if(1000 to 2999) - playsound(src, pick(list('modular_ss220/modules/return_prs/black_mesa/sound/mobs/nihilanth/nihilanth_youalldie01.ogg', 'modular_ss220/modules/return_prs/black_mesa/sound/mobs/nihilanth/nihilanth_foryouhewaits01.ogg')), 100) + playsound(src, pick(list('modular_ss220/reverts/return_prs/sound/black_mesa/mobs/nihilanth/nihilanth_youalldie01.ogg', 'modular_ss220/reverts/return_prs/sound/black_mesa/mobs/nihilanth/nihilanth_deceiveyou01.ogg')), 100) if(3000 to 6000) - playsound(src, pick(list('modular_ss220/modules/return_prs/black_mesa/sound/mobs/nihilanth/nihilanth_whathavedone01.ogg', 'modular_ss220/modules/return_prs/black_mesa/sound/mobs/nihilanth/nihilanth_deceiveyou01.ogg')), 100) + playsound(src, pick(list('modular_ss220/reverts/return_prs/sound/black_mesa/mobs/nihilanth/nihilanth_whathavedone01.ogg', 'modular_ss220/reverts/return_prs/sound/black_mesa/mobs/nihilanth/nihilanth_deceiveyou01.ogg')), 100) else - playsound(src, pick(list('modular_ss220/modules/return_prs/black_mesa/sound/mobs/nihilanth/nihilanth_thetruth01.ogg', 'modular_ss220/modules/return_prs/black_mesa/sound/mobs/nihilanth/nihilanth_iamthelast01.ogg')), 100) + playsound(src, pick(list('modular_ss220/reverts/return_prs/sound/black_mesa/mobs/nihilanth/nihilanth_thetruth01.ogg', 'modular_ss220/reverts/return_prs/sound/black_mesa/mobs/nihilanth/nihilanth_iamthelast01.ogg')), 100) set_combat_mode(TRUE) /mob/living/simple_animal/hostile/blackmesa/xen/nihilanth/death(gibbed) diff --git a/modular_ss220/modules/return_prs/black_mesa/code/mobs/vortigaunt.dm b/modular_ss220/reverts/return_prs/code/black_mesa/mobs/vortigaunt.dm similarity index 65% rename from modular_ss220/modules/return_prs/black_mesa/code/mobs/vortigaunt.dm rename to modular_ss220/reverts/return_prs/code/black_mesa/mobs/vortigaunt.dm index a161765271533d..0012962ae6424b 100644 --- a/modular_ss220/modules/return_prs/black_mesa/code/mobs/vortigaunt.dm +++ b/modular_ss220/reverts/return_prs/code/black_mesa/mobs/vortigaunt.dm @@ -1,7 +1,7 @@ /mob/living/simple_animal/hostile/blackmesa/xen/vortigaunt name = "vortigaunt" desc = "There is no distance between us. No false veils of time or space may intervene." - icon = 'modular_ss220/modules/return_prs/black_mesa/icons/mobs.dmi' + icon = 'modular_ss220/reverts/return_prs/icons/black_mesa/mobs.dmi' icon_state = "vortigaunt" icon_living = "vortigaunt" icon_dead = "vortigaunt_dead" @@ -14,7 +14,7 @@ speed = 1 emote_taunt = list("galalungas", "galungas", "gungs") projectiletype = /obj/projectile/beam/emitter/hitscan - projectilesound = 'modular_ss220/modules/return_prs/black_mesa/sound/mobs/vortigaunt/attack_shoot4.ogg' + projectilesound = 'modular_ss220/reverts/return_prs/sound/black_mesa/mobs/vortigaunt/attack_shoot4.ogg' ranged_cooldown_time = 5 SECONDS ranged_message = "fires" taunt_chance = 100 @@ -33,22 +33,22 @@ gold_core_spawnable = FRIENDLY_SPAWN loot = list(/obj/item/stack/sheet/bone) alert_sounds = list( - 'modular_ss220/modules/return_prs/black_mesa/sound/mobs/vortigaunt/alert01.ogg', - 'modular_ss220/modules/return_prs/black_mesa/sound/mobs/vortigaunt/alert01b.ogg', - 'modular_ss220/modules/return_prs/black_mesa/sound/mobs/vortigaunt/alert02.ogg', - 'modular_ss220/modules/return_prs/black_mesa/sound/mobs/vortigaunt/alert03.ogg', - 'modular_ss220/modules/return_prs/black_mesa/sound/mobs/vortigaunt/alert04.ogg', - 'modular_ss220/modules/return_prs/black_mesa/sound/mobs/vortigaunt/alert05.ogg', - 'modular_ss220/modules/return_prs/black_mesa/sound/mobs/vortigaunt/alert06.ogg', + 'modular_ss220/reverts/return_prs/sound/black_mesa/mobs/vortigaunt/alert01.ogg', + 'modular_ss220/reverts/return_prs/sound/black_mesa/mobs/vortigaunt/alert01b.ogg', + 'modular_ss220/reverts/return_prs/sound/black_mesa/mobs/vortigaunt/alert02.ogg', + 'modular_ss220/reverts/return_prs/sound/black_mesa/mobs/vortigaunt/alert03.ogg', + 'modular_ss220/reverts/return_prs/sound/black_mesa/mobs/vortigaunt/alert04.ogg', + 'modular_ss220/reverts/return_prs/sound/black_mesa/mobs/vortigaunt/alert05.ogg', + 'modular_ss220/reverts/return_prs/sound/black_mesa/mobs/vortigaunt/alert06.ogg', ) /// SOunds we play when asked to follow/unfollow. var/list/follow_sounds = list( - 'modular_ss220/modules/return_prs/black_mesa/sound/mobs/vortigaunt/village_argue01.ogg', - 'modular_ss220/modules/return_prs/black_mesa/sound/mobs/vortigaunt/village_argue02.ogg', - 'modular_ss220/modules/return_prs/black_mesa/sound/mobs/vortigaunt/village_argue03.ogg', - 'modular_ss220/modules/return_prs/black_mesa/sound/mobs/vortigaunt/village_argue04.ogg', - 'modular_ss220/modules/return_prs/black_mesa/sound/mobs/vortigaunt/village_argue05.ogg', - 'modular_ss220/modules/return_prs/black_mesa/sound/mobs/vortigaunt/village_argue05a.ogg', + 'modular_ss220/reverts/return_prs/sound/black_mesa/mobs/vortigaunt/village_argue01.ogg', + 'modular_ss220/reverts/return_prs/sound/black_mesa/mobs/vortigaunt/village_argue02.ogg', + 'modular_ss220/reverts/return_prs/sound/black_mesa/mobs/vortigaunt/village_argue03.ogg', + 'modular_ss220/reverts/return_prs/sound/black_mesa/mobs/vortigaunt/village_argue04.ogg', + 'modular_ss220/reverts/return_prs/sound/black_mesa/mobs/vortigaunt/village_argue05.ogg', + 'modular_ss220/reverts/return_prs/sound/black_mesa/mobs/vortigaunt/village_argue05a.ogg', ) var/follow_speed = 1 var/follow_distance = 2 diff --git a/modular_ss220/modules/return_prs/black_mesa/code/objects.dm b/modular_ss220/reverts/return_prs/code/black_mesa/objects.dm similarity index 100% rename from modular_ss220/modules/return_prs/black_mesa/code/objects.dm rename to modular_ss220/reverts/return_prs/code/black_mesa/objects.dm diff --git a/modular_ss220/modules/return_prs/black_mesa/code/projectiles.dm b/modular_ss220/reverts/return_prs/code/black_mesa/projectiles.dm similarity index 100% rename from modular_ss220/modules/return_prs/black_mesa/code/projectiles.dm rename to modular_ss220/reverts/return_prs/code/black_mesa/projectiles.dm diff --git a/modular_ss220/modules/return_prs/black_mesa/code/rationpacks.dm b/modular_ss220/reverts/return_prs/code/black_mesa/rationpacks.dm similarity index 97% rename from modular_ss220/modules/return_prs/black_mesa/code/rationpacks.dm rename to modular_ss220/reverts/return_prs/code/black_mesa/rationpacks.dm index bcb893f181b2f3..fb820a5d9af818 100644 --- a/modular_ss220/modules/return_prs/black_mesa/code/rationpacks.dm +++ b/modular_ss220/reverts/return_prs/code/black_mesa/rationpacks.dm @@ -1,7 +1,7 @@ /obj/item/food/mre_course name = "undefined MRE course" desc = "Something you shouldn't see. But it's edible." - icon = 'modular_ss220/modules/return_prs/black_mesa/icons/misc/courses.dmi' + icon = 'modular_ss220/reverts/return_prs/icons/black_mesa/misc/courses.dmi' icon_state = "main_course" food_reagents = list(/datum/reagent/consumable/nutriment = 20) tastes = list("crayon powder" = 1) @@ -80,7 +80,7 @@ /obj/item/storage/box/hecu_rations name = "Meal, Ready-to-Eat" desc = "A box containing a few rations and some chewing gum, for keeping a starving crayon-eater going." - icon = 'modular_ss220/modules/return_prs/black_mesa/icons/misc/mre_hecu.dmi' + icon = 'modular_ss220/reverts/return_prs/icons/black_mesa/misc/mre_hecu.dmi' icon_state = "mre_package" illustration = null diff --git a/modular_ss220/modules/return_prs/black_mesa/code/resonance_cascade.dm b/modular_ss220/reverts/return_prs/code/black_mesa/resonance_cascade.dm similarity index 79% rename from modular_ss220/modules/return_prs/black_mesa/code/resonance_cascade.dm rename to modular_ss220/reverts/return_prs/code/black_mesa/resonance_cascade.dm index b51070c86b9139..00966e39c6489c 100644 --- a/modular_ss220/modules/return_prs/black_mesa/code/resonance_cascade.dm +++ b/modular_ss220/reverts/return_prs/code/black_mesa/resonance_cascade.dm @@ -6,11 +6,11 @@ /datum/round_event/portal_storm/resonance_cascade/announce(fake) set waitfor = 0 - sound_to_playing_players('modular_ss220/modules/return_prs/black_mesa/sound/tc_12_portalsuck.ogg') + sound_to_playing_players('modular_ss220/reverts/return_prs/sound/black_mesa/tc_12_portalsuck.ogg') sleep(40) priority_announce("GENERAL ALERT: Spacetime cascade detected; massive transdimentional rift inbound!", "Transdimentional Rift", ANNOUNCER_KLAXON) sleep(20) - sound_to_playing_players('modular_ss220/modules/return_prs/black_mesa/sound/tc_13_teleport.ogg') + sound_to_playing_players('modular_ss220/reverts/return_prs/sound/black_mesa/tc_13_teleport.ogg') /datum/round_event/portal_storm/resonance_cascade hostile_types = list( diff --git a/modular_ss220/modules/return_prs/black_mesa/code/shield_pylon.dm b/modular_ss220/reverts/return_prs/code/black_mesa/shield_pylon.dm similarity index 98% rename from modular_ss220/modules/return_prs/black_mesa/code/shield_pylon.dm rename to modular_ss220/reverts/return_prs/code/black_mesa/shield_pylon.dm index d34245218dfa55..b218512d152518 100644 --- a/modular_ss220/modules/return_prs/black_mesa/code/shield_pylon.dm +++ b/modular_ss220/reverts/return_prs/code/black_mesa/shield_pylon.dm @@ -26,7 +26,7 @@ /obj/structure/xen_pylon name = "shield plant" desc = "It seems to be some kind of force field generator." - icon = 'modular_ss220/modules/return_prs/black_mesa/icons/plants.dmi' + icon = 'modular_ss220/reverts/return_prs/icons/black_mesa/plants.dmi' icon_state = "crystal_pylon" max_integrity = 70 density = TRUE diff --git a/modular_ss220/modules/return_prs/black_mesa/code/shockplant.dm b/modular_ss220/reverts/return_prs/code/black_mesa/shockplant.dm similarity index 94% rename from modular_ss220/modules/return_prs/black_mesa/code/shockplant.dm rename to modular_ss220/reverts/return_prs/code/black_mesa/shockplant.dm index 098cd4e5aa6ab4..6b448f90f73767 100644 --- a/modular_ss220/modules/return_prs/black_mesa/code/shockplant.dm +++ b/modular_ss220/reverts/return_prs/code/black_mesa/shockplant.dm @@ -2,7 +2,7 @@ /obj/structure/shockplant name = "electrical plant" desc = "It glows with a warm buzz." - icon = 'modular_ss220/modules/return_prs/black_mesa/icons/plants.dmi' + icon = 'modular_ss220/reverts/return_prs/icons/black_mesa/plants.dmi' icon_state = "electric_plant" density = TRUE anchored = TRUE diff --git a/modular_ss220/modules/return_prs/black_mesa/code/spawners.dm b/modular_ss220/reverts/return_prs/code/black_mesa/spawners.dm similarity index 100% rename from modular_ss220/modules/return_prs/black_mesa/code/spawners.dm rename to modular_ss220/reverts/return_prs/code/black_mesa/spawners.dm diff --git a/modular_ss220/modules/return_prs/black_mesa/code/turfs.dm b/modular_ss220/reverts/return_prs/code/black_mesa/turfs.dm similarity index 92% rename from modular_ss220/modules/return_prs/black_mesa/code/turfs.dm rename to modular_ss220/reverts/return_prs/code/black_mesa/turfs.dm index 6cbf88cd1eb1dd..52df28e23091a2 100644 --- a/modular_ss220/modules/return_prs/black_mesa/code/turfs.dm +++ b/modular_ss220/reverts/return_prs/code/black_mesa/turfs.dm @@ -25,7 +25,7 @@ /turf/open/misc/xen name = "strange weeds" desc = "It feels soft to the touch, like a carpet... only... wet." - icon = 'modular_ss220/modules/return_prs/black_mesa/icons/xen_turfs.dmi' + icon = 'modular_ss220/reverts/return_prs/icons/black_mesa/xen_turfs.dmi' icon_state = "xen_turf" baseturfs = /turf/open/misc/xen footstep = FOOTSTEP_GRASS @@ -35,7 +35,7 @@ /turf/open/water/beach/xen desc = "It's mirky and filled with strange organisms." name = "xen water" - icon = 'modular_ss220/modules/return_prs/black_mesa/icons/xen_turfs.dmi' + icon = 'modular_ss220/reverts/return_prs/icons/black_mesa/xen_turfs.dmi' baseturfs = /turf/open/water/beach/xen initial_gas_mix = OPENTURF_DEFAULT_ATMOS planetary_atmos = TRUE @@ -43,7 +43,7 @@ /turf/open/misc/beach/coastline_t/xen desc = "It's mirky and filled with strange organisms." name = "xen water" - icon = 'modular_ss220/modules/return_prs/black_mesa/icons/xen_turfs.dmi' + icon = 'modular_ss220/reverts/return_prs/icons/black_mesa/xen_turfs.dmi' icon_state = "sandwater_t" baseturfs = /turf/open/misc/beach/coastline_t/xen initial_gas_mix = OPENTURF_DEFAULT_ATMOS @@ -52,7 +52,7 @@ /turf/open/misc/beach/coastline_t/sandwater_inner/xen desc = "It's mirky and filled with strange organisms." name = "xen water" - icon = 'modular_ss220/modules/return_prs/black_mesa/icons/xen_turfs.dmi' + icon = 'modular_ss220/reverts/return_prs/icons/black_mesa/xen_turfs.dmi' icon_state = "sandwater_inner" baseturfs = /turf/open/misc/beach/coastline_t/sandwater_inner/xen initial_gas_mix = OPENTURF_DEFAULT_ATMOS @@ -61,7 +61,7 @@ /turf/open/misc/beach/coastline_b/xen name = "xen water" desc = "It's mirky and filled with strange organisms." - icon = 'modular_ss220/modules/return_prs/black_mesa/icons/xen_turfs.dmi' + icon = 'modular_ss220/reverts/return_prs/icons/black_mesa/xen_turfs.dmi' icon_state = "sandwater_b" baseturfs = /turf/open/misc/beach/coastline_b/xen initial_gas_mix = OPENTURF_DEFAULT_ATMOS diff --git a/modular_ss220/modules/return_prs/black_mesa/code/turrets.dm b/modular_ss220/reverts/return_prs/code/black_mesa/turrets.dm similarity index 100% rename from modular_ss220/modules/return_prs/black_mesa/code/turrets.dm rename to modular_ss220/reverts/return_prs/code/black_mesa/turrets.dm diff --git a/modular_ss220/modules/return_prs/black_mesa/code/uber_teleporter.dm b/modular_ss220/reverts/return_prs/code/black_mesa/uber_teleporter.dm similarity index 96% rename from modular_ss220/modules/return_prs/black_mesa/code/uber_teleporter.dm rename to modular_ss220/reverts/return_prs/code/black_mesa/uber_teleporter.dm index d137c66a687dd5..8e7c5739619c99 100644 --- a/modular_ss220/modules/return_prs/black_mesa/code/uber_teleporter.dm +++ b/modular_ss220/reverts/return_prs/code/black_mesa/uber_teleporter.dm @@ -1,7 +1,7 @@ /obj/item/uber_teleporter name = "\improper Nihilanth's Divinity" desc = "It glows harshly, the power of a portal wielding monster lays within." - icon = 'modular_ss220/modules/return_prs/black_mesa/icons/plants.dmi' + icon = 'modular_ss220/reverts/return_prs/icons/black_mesa/plants.dmi' icon_state = "crystal_pylon" /obj/item/uber_teleporter/attack_self(mob/living/user, modifiers) diff --git a/modular_ss220/modules/return_prs/black_mesa/code/weapons.dm b/modular_ss220/reverts/return_prs/code/black_mesa/weapons.dm similarity index 76% rename from modular_ss220/modules/return_prs/black_mesa/code/weapons.dm rename to modular_ss220/reverts/return_prs/code/black_mesa/weapons.dm index ddc0f492c56d81..f9e82215b1cbe7 100644 --- a/modular_ss220/modules/return_prs/black_mesa/code/weapons.dm +++ b/modular_ss220/reverts/return_prs/code/black_mesa/weapons.dm @@ -1,7 +1,7 @@ /obj/item/crowbar/freeman name = "blood soaked crowbar" desc = "A heavy handed crowbar, it drips with blood." - icon = 'modular_ss220/modules/return_prs/black_mesa/icons/misc/freeman.dmi' + icon = 'modular_ss220/reverts/return_prs/icons/black_mesa/misc/freeman.dmi' icon_state = "crowbar" force = 35 throwforce = 45 @@ -12,7 +12,7 @@ force_opens = TRUE /obj/item/crowbar/freeman/ultimate - name = "\improper Freeman's crowbar" + name = "/improper Freeman's crowbar" desc = "A weapon wielded by an ancient physicist, the blood of hundreds seeps through this rod of iron and malice." force = 45 @@ -24,12 +24,12 @@ name = "ballistic shield" desc = "A shield fit for those that want to sprint headfirst into the unknown! Cumbersome as hell." icon_state = "ballistic" - icon = 'modular_ss220/modules/return_prs/black_mesa/icons/misc/ballistic.dmi' + icon = 'modular_ss220/reverts/return_prs/icons/black_mesa/misc/ballistic.dmi' worn_icon_state = "ballistic_worn" - worn_icon = 'modular_ss220/modules/return_prs/black_mesa/icons/misc/ballistic.dmi' + worn_icon = 'modular_ss220/reverts/return_prs/icons/black_mesa/misc/ballistic.dmi' inhand_icon_state = "ballistic" - lefthand_file = 'modular_ss220/modules/return_prs/black_mesa/icons/misc/ballistic_l.dmi' - righthand_file = 'modular_ss220/modules/return_prs/black_mesa/icons/misc/ballistic_r.dmi' + lefthand_file = 'modular_ss220/reverts/return_prs/icons/black_mesa/misc/ballistic_l.dmi' + righthand_file = 'modular_ss220/reverts/return_prs/icons/black_mesa/misc/ballistic_r.dmi' force = 14 throwforce = 5 throw_speed = 1 @@ -47,5 +47,5 @@ name = "broken ballistic shield" desc = "An unsalvageable, unrecoverable mess of armor steel and kevlar. Should've maintained it, huh?" icon_state = "ballistic_broken" - icon = 'modular_ss220/modules/return_prs/black_mesa/icons/misc/ballistic.dmi' + icon = 'modular_ss220/reverts/return_prs/icons/black_mesa/misc/ballistic.dmi' w_class = WEIGHT_CLASS_BULKY diff --git a/modular_ss220/modules/return_prs/black_mesa/code/xen_crystal.dm b/modular_ss220/reverts/return_prs/code/black_mesa/xen_crystal.dm similarity index 95% rename from modular_ss220/modules/return_prs/black_mesa/code/xen_crystal.dm rename to modular_ss220/reverts/return_prs/code/black_mesa/xen_crystal.dm index a2feec750fac9b..fb65256ed9a515 100644 --- a/modular_ss220/modules/return_prs/black_mesa/code/xen_crystal.dm +++ b/modular_ss220/reverts/return_prs/code/black_mesa/xen_crystal.dm @@ -1,7 +1,7 @@ /obj/structure/xen_crystal name = "resonating crystal" desc = "A strange resinating crystal." - icon = 'modular_ss220/modules/return_prs/black_mesa/icons/plants.dmi' + icon = 'modular_ss220/reverts/return_prs/icons/black_mesa/plants.dmi' icon_state = "crystal" light_power = 2 light_range = 4 @@ -44,7 +44,7 @@ /obj/item/grenade/xen_crystal name = "xen crystal" desc = "A crystal with anomalous properties." - icon = 'modular_ss220/modules/return_prs/black_mesa/icons/plants.dmi' + icon = 'modular_ss220/reverts/return_prs/icons/black_mesa/plants.dmi' icon_state = "crystal_grenade" /// Additional information on second examine. Obviously. // var/desc_extended = "Use on the Nihilanth to reduce the Resonance Cascade's chance of spawning by 15%, down to 0% if used four times." diff --git a/modular_ss220/modules/return_prs/gunsgalore/code/ammo/ammo.dm b/modular_ss220/reverts/return_prs/code/gunsgalore/ammo/ammo.dm similarity index 99% rename from modular_ss220/modules/return_prs/gunsgalore/code/ammo/ammo.dm rename to modular_ss220/reverts/return_prs/code/gunsgalore/ammo/ammo.dm index 923329e179616a..60c51b571cee2c 100644 --- a/modular_ss220/modules/return_prs/gunsgalore/code/ammo/ammo.dm +++ b/modular_ss220/reverts/return_prs/code/gunsgalore/ammo/ammo.dm @@ -1,7 +1,7 @@ ///NEW CARTRIDGES /obj/item/ammo_casing/realistic - icon = 'modular_ss220/modules/return_prs/gunsgalore/icons/ammo/ammo.dmi' + icon = 'modular_ss220/reverts/return_prs/icons/gunsgalore/ammo/ammo.dmi' //GERMAN //7.92x33mm Kurz diff --git a/modular_ss220/modules/return_prs/gunsgalore/code/ammo/misc_items.dm b/modular_ss220/reverts/return_prs/code/gunsgalore/ammo/misc_items.dm similarity index 100% rename from modular_ss220/modules/return_prs/gunsgalore/code/ammo/misc_items.dm rename to modular_ss220/reverts/return_prs/code/gunsgalore/ammo/misc_items.dm diff --git a/modular_ss220/modules/return_prs/gunsgalore/code/guns/akm.dm b/modular_ss220/reverts/return_prs/code/gunsgalore/guns/akm.dm similarity index 87% rename from modular_ss220/modules/return_prs/gunsgalore/code/guns/akm.dm rename to modular_ss220/reverts/return_prs/code/gunsgalore/guns/akm.dm index f48ea22d0bdbca..ad3ff4f970e4d8 100644 --- a/modular_ss220/modules/return_prs/gunsgalore/code/guns/akm.dm +++ b/modular_ss220/reverts/return_prs/code/gunsgalore/guns/akm.dm @@ -1,10 +1,10 @@ /obj/item/gun/ballistic/automatic/akm name = "\improper Krinkov carbine" desc = "A timeless human design of a carbine chambered in the NRI's 5.6mm ammo. A weapon so simple that even a child could use it - and they often did." - icon = 'modular_ss220/modules/return_prs/gunsgalore/icons/guns/gunsgalore_guns40x32.dmi' + icon = 'modular_ss220/reverts/return_prs/icons/gunsgalore/guns/gunsgalore_guns40x32.dmi' icon_state = "akm" - lefthand_file = 'modular_ss220/modules/return_prs/gunsgalore/icons/guns/gunsgalore_lefthand.dmi' - righthand_file = 'modular_ss220/modules/return_prs/gunsgalore/icons/guns/gunsgalore_righthand.dmi' + lefthand_file = 'modular_ss220/reverts/return_prs/icons/gunsgalore/guns/gunsgalore_lefthand.dmi' + righthand_file = 'modular_ss220/reverts/return_prs/icons/gunsgalore/guns/gunsgalore_righthand.dmi' inhand_icon_state = "akm" slot_flags = ITEM_SLOT_BELT | ITEM_SLOT_BACK w_class = WEIGHT_CLASS_BULKY @@ -13,13 +13,13 @@ can_suppress = FALSE fire_delay = 2 actions_types = list() - worn_icon = 'modular_ss220/modules/return_prs/gunsgalore/icons/guns/gunsgalore_back.dmi' + worn_icon = 'modular_ss220/reverts/return_prs/icons/gunsgalore/guns/gunsgalore_back.dmi' worn_icon_state = "akm" - fire_sound = 'modular_ss220/modules/return_prs/gunsgalore/sound/guns/fire/akm_fire.ogg' - rack_sound = 'modular_ss220/modules/return_prs/gunsgalore/sound/guns/interact/ltrifle_cock.ogg' - load_sound = 'modular_ss220/modules/return_prs/gunsgalore/sound/guns/interact/ltrifle_magin.ogg' - load_empty_sound = 'modular_ss220/modules/return_prs/gunsgalore/sound/guns/interact/ltrifle_magin.ogg' - eject_sound = 'modular_ss220/modules/return_prs/gunsgalore/sound/guns/interact/ltrifle_magout.ogg' + fire_sound = 'modular_ss220/reverts/return_prs/sound/gunsgalore/guns/fire/akm_fire.ogg' + rack_sound = 'modular_ss220/reverts/return_prs/sound/gunsgalore/guns/interact/ltrifle_cock.ogg' + load_sound = 'modular_ss220/reverts/return_prs/sound/gunsgalore/guns/interact/ltrifle_magin.ogg' + load_empty_sound = 'modular_ss220/reverts/return_prs/sound/gunsgalore/guns/interact/ltrifle_magin.ogg' + eject_sound = 'modular_ss220/reverts/return_prs/sound/gunsgalore/guns/interact/ltrifle_magout.ogg' /obj/item/gun/ballistic/automatic/akm/Initialize(mapload) @@ -33,7 +33,7 @@ /obj/item/ammo_box/magazine/akm name = "\improper Krinkov magazine" desc = "a banana-shaped double-stack magazine able to hold 30 rounds of 5.6mm ammo. It's said that in the early days of SolFed's spread, Spanish colony rebels often referred to these as 'Goat Horns'." - icon = 'modular_ss220/modules/return_prs/gunsgalore/icons/guns/gunsgalore_items.dmi' + icon = 'modular_ss220/reverts/return_prs/icons/gunsgalore/guns/gunsgalore_items.dmi' icon_state = "akm" ammo_type = /obj/item/ammo_casing/realistic/a762x39 caliber = "a762x39" diff --git a/modular_ss220/modules/return_prs/gunsgalore/code/guns/energy.dm b/modular_ss220/reverts/return_prs/code/gunsgalore/guns/energy.dm similarity index 100% rename from modular_ss220/modules/return_prs/gunsgalore/code/guns/energy.dm rename to modular_ss220/reverts/return_prs/code/gunsgalore/guns/energy.dm diff --git a/modular_ss220/modules/return_prs/gunsgalore/code/guns/fg42.dm b/modular_ss220/reverts/return_prs/code/gunsgalore/guns/fg42.dm similarity index 54% rename from modular_ss220/modules/return_prs/gunsgalore/code/guns/fg42.dm rename to modular_ss220/reverts/return_prs/code/gunsgalore/guns/fg42.dm index 3c5f26f71f0bad..7bfb204f164da4 100644 --- a/modular_ss220/modules/return_prs/gunsgalore/code/guns/fg42.dm +++ b/modular_ss220/reverts/return_prs/code/gunsgalore/guns/fg42.dm @@ -1,10 +1,10 @@ /obj/item/gun/ballistic/automatic/fg42 name = "\improper FGP-90" desc = "A German paratrooper rifle designed to be used at long range chambered in 7.92x57mm. Most likely a reproduction of the original." - icon = 'modular_ss220/modules/return_prs/gunsgalore/icons/guns/gunsgalore_guns40x32.dmi' + icon = 'modular_ss220/reverts/return_prs/icons/gunsgalore/guns/gunsgalore_guns40x32.dmi' icon_state = "fg42" - lefthand_file = 'modular_ss220/modules/return_prs/gunsgalore/icons/guns/gunsgalore_lefthand.dmi' - righthand_file = 'modular_ss220/modules/return_prs/gunsgalore/icons/guns/gunsgalore_righthand.dmi' + lefthand_file = 'modular_ss220/reverts/return_prs/icons/gunsgalore/guns/gunsgalore_lefthand.dmi' + righthand_file = 'modular_ss220/reverts/return_prs/icons/gunsgalore/guns/gunsgalore_righthand.dmi' inhand_icon_state = "fg42" slot_flags = ITEM_SLOT_BELT | ITEM_SLOT_BACK w_class = WEIGHT_CLASS_BULKY @@ -14,15 +14,14 @@ burst_size = 2 spread = 0 fire_delay = 2 - worn_icon = 'modular_ss220/modules/return_prs/gunsgalore/icons/guns/gunsgalore_back.dmi' + worn_icon = 'modular_ss220/reverts/return_prs/icons/gunsgalore/guns/gunsgalore_back.dmi' worn_icon_state = "fg42" - fire_sound = 'modular_ss220/modules/return_prs/gunsgalore/sound/guns/fire/fg42_fire.ogg' - - rack_sound = 'modular_ss220/modules/return_prs/gunsgalore/sound/guns/interact/batrifle_cock.ogg' - load_sound = 'modular_ss220/modules/return_prs/gunsgalore/sound/guns/interact/batrifle_magin.ogg' - load_empty_sound = 'modular_ss220/modules/return_prs/gunsgalore/sound/guns/interact/batrifle_magin.ogg' - eject_sound = 'modular_ss220/modules/return_prs/gunsgalore/sound/guns/interact/batrifle_magout.ogg' - eject_empty_sound = 'modular_ss220/modules/return_prs/gunsgalore/sound/guns/interact/batrifle_magout.ogg' + fire_sound = 'modular_ss220/reverts/return_prs/sound/gunsgalore/guns/fire/fg42_fire.ogg' + rack_sound = 'modular_ss220/reverts/return_prs/sound/gunsgalore/guns/interact/batrifle_cock.ogg' + load_sound = 'modular_ss220/reverts/return_prs/sound/gunsgalore/guns/interact/batrifle_magin.ogg' + load_empty_sound = 'modular_ss220/reverts/return_prs/sound/gunsgalore/guns/interact/batrifle_magin.ogg' + eject_sound = 'modular_ss220/reverts/return_prs/sound/gunsgalore/guns/interact/batrifle_magout.ogg' + eject_empty_sound = 'modular_ss220/reverts/return_prs/sound/gunsgalore/guns/interact/batrifle_magout.ogg' /obj/item/gun/ballistic/automatic/fg42/Initialize(mapload) . = ..() @@ -33,7 +32,7 @@ /obj/item/ammo_box/magazine/fg42 name = "fg42 magazine (7.92x57mm)" - icon = 'modular_ss220/modules/return_prs/gunsgalore/icons/guns/gunsgalore_items.dmi' + icon = 'modular_ss220/reverts/return_prs/icons/gunsgalore/guns/gunsgalore_items.dmi' icon_state = "fg42" ammo_type = /obj/item/ammo_casing/realistic/a792x57 caliber = "a792x57" diff --git a/modular_ss220/modules/return_prs/gunsgalore/code/guns/guncrate.dm b/modular_ss220/reverts/return_prs/code/gunsgalore/guns/guncrate.dm similarity index 100% rename from modular_ss220/modules/return_prs/gunsgalore/code/guns/guncrate.dm rename to modular_ss220/reverts/return_prs/code/gunsgalore/guns/guncrate.dm diff --git a/modular_ss220/reverts/return_prs/code/gunsgalore/guns/luger.dm b/modular_ss220/reverts/return_prs/code/gunsgalore/guns/luger.dm new file mode 100644 index 00000000000000..80724c01e77be4 --- /dev/null +++ b/modular_ss220/reverts/return_prs/code/gunsgalore/guns/luger.dm @@ -0,0 +1,16 @@ +/obj/item/gun/ballistic/automatic/pistol/luger + name = "\improper Armadyne P-09X" + desc = "A small, light-weight reproduction of the Luger P08 from the 20th century, manufactured by the Oldarms division of the Armadyne Corporation. Chambered in 9x25mm." + icon_state = "luger" + inhand_icon_state = "luger" + icon = 'modular_ss220/reverts/return_prs/icons/gunsgalore/guns/gunsgalore_guns.dmi' + lefthand_file = 'modular_ss220/reverts/return_prs/icons/gunsgalore/guns/gunsgalore_lefthand.dmi' + righthand_file = 'modular_ss220/reverts/return_prs/icons/gunsgalore/guns/gunsgalore_righthand.dmi' + fire_sound = 'modular_ss220/reverts/return_prs/sound/gunsgalore/guns/fire/luger_fire.ogg' + load_sound = 'modular_ss220/reverts/return_prs/sound/gunsgalore/guns/fire/luger_mag_insert.ogg' + load_empty_sound = 'modular_ss220/reverts/return_prs/sound/gunsgalore/guns/fire/luger_mag_insert.ogg' + eject_sound = 'modular_ss220/reverts/return_prs/sound/gunsgalore/guns/fire/luger_mag_release.ogg' + eject_empty_sound = 'modular_ss220/reverts/return_prs/sound/gunsgalore/guns/fire/luger_mag_release.ogg' + rack_sound = 'modular_ss220/reverts/return_prs/sound/gunsgalore/guns/fire/luger_rack.ogg' + fire_sound_volume = 100 + suppressor_x_offset = 14 diff --git a/modular_ss220/modules/return_prs/gunsgalore/code/guns/m16.dm b/modular_ss220/reverts/return_prs/code/gunsgalore/guns/m16.dm similarity index 74% rename from modular_ss220/modules/return_prs/gunsgalore/code/guns/m16.dm rename to modular_ss220/reverts/return_prs/code/gunsgalore/guns/m16.dm index e88730caaa69aa..aaed456d96af4e 100644 --- a/modular_ss220/modules/return_prs/gunsgalore/code/guns/m16.dm +++ b/modular_ss220/reverts/return_prs/code/gunsgalore/guns/m16.dm @@ -1,12 +1,12 @@ /obj/item/gun/ballistic/automatic/m16 name = "\improper XM-2537 rifle" desc = "A relatively new infantry rifle chambered for the .277 Aestus round, designed for use by private security and freight crews. \"Armentarium Centrale\" is printed on the side of the receiver, right next to a yellow sun." - icon = 'modular_ss220/modules/return_prs/gunsgalore/icons/guns/gunsgalore_guns40x32.dmi' + icon = 'modular_ss220/reverts/return_prs/icons/gunsgalore/guns/gunsgalore_guns40x32.dmi' icon_state = "m16" - lefthand_file = 'modular_ss220/modules/return_prs/gunsgalore/icons/guns/gunsgalore_lefthand.dmi' - righthand_file = 'modular_ss220/modules/return_prs/gunsgalore/icons/guns/gunsgalore_righthand.dmi' + lefthand_file = 'modular_ss220/reverts/return_prs/icons/gunsgalore/guns/gunsgalore_lefthand.dmi' + righthand_file = 'modular_ss220/reverts/return_prs/icons/gunsgalore/guns/gunsgalore_righthand.dmi' inhand_icon_state = "m16" - worn_icon = 'modular_ss220/modules/return_prs/gunsgalore/icons/guns/gunsgalore_back.dmi' + worn_icon = 'modular_ss220/reverts/return_prs/icons/gunsgalore/guns/gunsgalore_back.dmi' worn_icon_state = "m16" slot_flags = ITEM_SLOT_BELT | ITEM_SLOT_BACK w_class = WEIGHT_CLASS_BULKY @@ -15,18 +15,18 @@ can_suppress = FALSE burst_size = 3 fire_delay = 2 - fire_sound = 'modular_ss220/modules/return_prs/gunsgalore/sound/guns/fire/m16_fire.ogg' + fire_sound = 'modular_ss220/reverts/return_prs/sound/gunsgalore/guns/fire/m16_fire.ogg' fire_sound_volume = 50 - rack_sound = 'modular_ss220/modules/return_prs/gunsgalore/sound/guns/interact/sfrifle_cock.ogg' - load_sound = 'modular_ss220/modules/return_prs/gunsgalore/sound/guns/interact/sfrifle_magin.ogg' - load_empty_sound = 'modular_ss220/modules/return_prs/gunsgalore/sound/guns/interact/sfrifle_magin.ogg' - eject_sound = 'modular_ss220/modules/return_prs/gunsgalore/sound/guns/interact/sfrifle_magout.ogg' + rack_sound = 'modular_ss220/reverts/return_prs/sound/gunsgalore/guns/interact/sfrifle_cock.ogg' + load_sound = 'modular_ss220/reverts/return_prs/sound/gunsgalore/guns/interact/sfrifle_magin.ogg' + load_empty_sound = 'modular_ss220/reverts/return_prs/sound/gunsgalore/guns/interact/sfrifle_magin.ogg' + eject_sound = 'modular_ss220/reverts/return_prs/sound/gunsgalore/guns/interact/sfrifle_magout.ogg' /obj/item/ammo_box/magazine/m16 name = "\improper XM-2537 magazine" desc = "A double-stack translucent polymer magazine for use with the XM-2537 rifles. Holds 30 rounds of .277 Aestus." - icon = 'modular_ss220/modules/return_prs/gunsgalore/icons/guns/gunsgalore_items.dmi' + icon = 'modular_ss220/reverts/return_prs/icons/gunsgalore/guns/gunsgalore_items.dmi' icon_state = "m16e" ammo_type = /obj/item/ammo_casing/a223 caliber = CALIBER_A223 @@ -36,7 +36,7 @@ /obj/item/ammo_box/magazine/m16/vintage name = "outdated .277 magazine" desc = "A double-stack solid magazine that looks rather dated. Holds 20 rounds of .277 Aestus." - icon = 'modular_ss220/modules/return_prs/gunsgalore/icons/guns/gunsgalore_items.dmi' + icon = 'modular_ss220/reverts/return_prs/icons/gunsgalore/guns/gunsgalore_items.dmi' icon_state = "m16" max_ammo = 20 multiple_sprites = AMMO_BOX_FULL_EMPTY @@ -69,7 +69,7 @@ /obj/item/ammo_box/magazine/m16/patriot name = "\improper XM-2537 drum magazine" desc = "A double-stack solid polymer drum made for use with the Amans Patriae rifle. Holds 50 rounds of .277 ammo." - icon = 'modular_ss220/modules/return_prs/gunsgalore/icons/guns/gunsgalore_items.dmi' + icon = 'modular_ss220/reverts/return_prs/icons/gunsgalore/guns/gunsgalore_items.dmi' icon_state = "m16" max_ammo = 50 multiple_sprites = AMMO_BOX_FULL_EMPTY diff --git a/modular_ss220/modules/return_prs/gunsgalore/code/guns/mg34.dm b/modular_ss220/reverts/return_prs/code/gunsgalore/guns/mg34.dm similarity index 89% rename from modular_ss220/modules/return_prs/gunsgalore/code/guns/mg34.dm rename to modular_ss220/reverts/return_prs/code/gunsgalore/guns/mg34.dm index ef6ca67827239e..f6f5801ac037a7 100644 --- a/modular_ss220/modules/return_prs/gunsgalore/code/guns/mg34.dm +++ b/modular_ss220/reverts/return_prs/code/gunsgalore/guns/mg34.dm @@ -1,15 +1,15 @@ /obj/item/gun/ballistic/automatic/mg34 name = "\improper MG-4T" desc = "A reproduction of the German MG-34 general purpose machine gun, this one is a revision from the 2200's and was one of several thousand distributed to SolFed expedition teams. It has been rechambered to fire 7.92mm Mauser instead of 7.62mm NATO." - icon = 'modular_ss220/modules/return_prs/gunsgalore/icons/guns/gunsgalore_guns40x32.dmi' - lefthand_file = 'modular_ss220/modules/return_prs/gunsgalore/icons/guns/gunsgalore_lefthand.dmi' - righthand_file = 'modular_ss220/modules/return_prs/gunsgalore/icons/guns/gunsgalore_righthand.dmi' - worn_icon = 'modular_ss220/modules/return_prs/gunsgalore/icons/guns/gunsgalore_back.dmi' + icon = 'modular_ss220/reverts/return_prs/icons/gunsgalore/guns/gunsgalore_guns40x32.dmi' + lefthand_file = 'modular_ss220/reverts/return_prs/icons/gunsgalore/guns/gunsgalore_lefthand.dmi' + righthand_file = 'modular_ss220/reverts/return_prs/icons/gunsgalore/guns/gunsgalore_righthand.dmi' + worn_icon = 'modular_ss220/reverts/return_prs/icons/gunsgalore/guns/gunsgalore_back.dmi' icon_state = "mg34" base_icon_state = "mg34" worn_icon_state = "mg34" inhand_icon_state = "mg34" - fire_sound = 'modular_ss220/modules/return_prs/gunsgalore/sound/guns/fire/mg34_fire.ogg' + fire_sound = 'modular_ss220/reverts/return_prs/sound/gunsgalore/guns/fire/mg34_fire.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 @@ -71,7 +71,7 @@ /obj/item/ammo_box/magazine/mg34 name = "mg34 drum (7.92x57mm)" - icon = 'modular_ss220/modules/return_prs/gunsgalore/icons/guns/gunsgalore_items.dmi' + icon = 'modular_ss220/reverts/return_prs/icons/gunsgalore/guns/gunsgalore_items.dmi' icon_state = "mg34_drum" ammo_type = /obj/item/ammo_casing/realistic/a792x57 caliber = "a792x57" @@ -110,7 +110,7 @@ inhand_icon_state = "mg42" fire_sound_volume = 100 fire_delay = 0.5 - fire_sound = 'modular_ss220/modules/return_prs/gunsgalore/sound/guns/fire/mg42_fire.ogg' + fire_sound = 'modular_ss220/reverts/return_prs/sound/gunsgalore/guns/fire/mg42_fire.ogg' accepted_magazine_type = /obj/item/ammo_box/magazine/mg42 spread = SPREAD_UNDEPLOYED /// If we are resting, the bipod is deployed. @@ -169,7 +169,7 @@ else bipod_deployed = FALSE spread = SPREAD_UNDEPLOYED - playsound(src, 'modular_ss220/modules/return_prs/gunsgalore/sound/guns/fire/mg42_bipod.ogg', 100) + playsound(src, 'modular_ss220/reverts/return_prs/sound/gunsgalore/guns/fire/mg42_bipod.ogg', 100) balloon_alert_to_viewers("bipod [bipod_deployed ? "deployed" : "undeployed"]!") update_appearance() @@ -180,7 +180,7 @@ barrel_heat += HEAT_PER_SHOT if(barrel_heat >= 100) overheated = TRUE - playsound(src, 'modular_ss220/modules/return_prs/gunsgalore/sound/guns/fire/mg_overheat.ogg', 100) + playsound(src, 'modular_ss220/reverts/return_prs/sound/gunsgalore/guns/fire/mg_overheat.ogg', 100) addtimer(CALLBACK(src, PROC_REF(reset_overheat)), TIME_TO_COOLDOWN) update_appearance() @@ -206,7 +206,7 @@ /obj/item/ammo_box/magazine/mg42 name = "mg42 drum (7.92x57mm)" - icon = 'modular_ss220/modules/return_prs/gunsgalore/icons/guns/gunsgalore_items.dmi' + icon = 'modular_ss220/reverts/return_prs/icons/gunsgalore/guns/gunsgalore_items.dmi' icon_state = "mg42_drum" ammo_type = /obj/item/ammo_casing/realistic/a792x57 caliber = "a792x57" diff --git a/modular_ss220/modules/return_prs/gunsgalore/code/guns/mp40.dm b/modular_ss220/reverts/return_prs/code/gunsgalore/guns/mp40.dm similarity index 63% rename from modular_ss220/modules/return_prs/gunsgalore/code/guns/mp40.dm rename to modular_ss220/reverts/return_prs/code/gunsgalore/guns/mp40.dm index 6e4ff46edc9947..984dd69720782d 100644 --- a/modular_ss220/modules/return_prs/gunsgalore/code/guns/mp40.dm +++ b/modular_ss220/reverts/return_prs/code/gunsgalore/guns/mp40.dm @@ -1,24 +1,24 @@ /obj/item/gun/ballistic/automatic/mp40 name = "\improper MP-40" desc = "The instantly recognizable 'kraut gun'. Extremely outdated SMG that has only seen service during Sol-3's second World War. This one's a poor, unlicensed reproduction." - icon = 'modular_ss220/modules/return_prs/gunsgalore/icons/guns/gunsgalore_guns40x32.dmi' + icon = 'modular_ss220/reverts/return_prs/icons/gunsgalore/guns/gunsgalore_guns40x32.dmi' icon_state = "mp40" - lefthand_file = 'modular_ss220/modules/return_prs/gunsgalore/icons/guns/gunsgalore_lefthand.dmi' - righthand_file = 'modular_ss220/modules/return_prs/gunsgalore/icons/guns/gunsgalore_righthand.dmi' + lefthand_file = 'modular_ss220/reverts/return_prs/icons/gunsgalore/guns/gunsgalore_lefthand.dmi' + righthand_file = 'modular_ss220/reverts/return_prs/icons/gunsgalore/guns/gunsgalore_righthand.dmi' inhand_icon_state = "mp40" - worn_icon = 'modular_ss220/modules/return_prs/gunsgalore/icons/guns/gunsgalore_back.dmi' + worn_icon = 'modular_ss220/reverts/return_prs/icons/gunsgalore/guns/gunsgalore_back.dmi' worn_icon_state = "mp40" slot_flags = ITEM_SLOT_BELT | ITEM_SLOT_BACK accepted_magazine_type = /obj/item/ammo_box/magazine/mp40 can_suppress = FALSE burst_size = 1 fire_delay = 1.7 - fire_sound = 'modular_ss220/modules/return_prs/gunsgalore/sound/guns/fire/mp40_fire.ogg' + fire_sound = 'modular_ss220/reverts/return_prs/sound/gunsgalore/guns/fire/mp40_fire.ogg' fire_sound_volume = 100 - rack_sound = 'modular_ss220/modules/return_prs/gunsgalore/sound/guns/interact/smg_cock.ogg' - load_sound = 'modular_ss220/modules/return_prs/gunsgalore/sound/guns/interact/smg_magin.ogg' - load_empty_sound = 'modular_ss220/modules/return_prs/gunsgalore/sound/guns/interact/smg_magin.ogg' - eject_sound = 'modular_ss220/modules/return_prs/gunsgalore/sound/guns/interact/smg_magout.ogg' + rack_sound = 'modular_ss220/reverts/return_prs/sound/gunsgalore/guns/interact/smg_cock.ogg' + load_sound = 'modular_ss220/reverts/return_prs/sound/gunsgalore/guns/interact/smg_magin.ogg' + load_empty_sound = 'modular_ss220/reverts/return_prs/sound/gunsgalore/guns/interact/smg_magin.ogg' + eject_sound = 'modular_ss220/reverts/return_prs/sound/gunsgalore/guns/interact/smg_magout.ogg' /obj/item/gun/ballistic/automatic/mp40/Initialize(mapload) @@ -28,7 +28,7 @@ /obj/item/ammo_box/magazine/mp40 name = "mp40 magazine (9mmx19)" - icon = 'modular_ss220/modules/return_prs/gunsgalore/icons/guns/gunsgalore_items.dmi' + icon = 'modular_ss220/reverts/return_prs/icons/gunsgalore/guns/gunsgalore_items.dmi' icon_state = "mp40" ammo_type = /obj/item/ammo_casing/c9mm caliber = CALIBER_9MM diff --git a/modular_ss220/modules/return_prs/gunsgalore/code/guns/p90.dm b/modular_ss220/reverts/return_prs/code/gunsgalore/guns/p90.dm similarity index 52% rename from modular_ss220/modules/return_prs/gunsgalore/code/guns/p90.dm rename to modular_ss220/reverts/return_prs/code/gunsgalore/guns/p90.dm index 9647ace7b8814a..b72b04fdfd87f0 100644 --- a/modular_ss220/modules/return_prs/gunsgalore/code/guns/p90.dm +++ b/modular_ss220/reverts/return_prs/code/gunsgalore/guns/p90.dm @@ -1,23 +1,23 @@ /obj/item/gun/ballistic/automatic/p90 name = "\improper P90-02" desc = "A compact, top-loaded bullpup PDW chambered in .32 ammo." - icon = 'modular_ss220/modules/return_prs/gunsgalore/icons/guns/gunsgalore_guns40x32.dmi' + icon = 'modular_ss220/reverts/return_prs/icons/gunsgalore/guns/gunsgalore_guns40x32.dmi' icon_state = "p90" - lefthand_file = 'modular_ss220/modules/return_prs/gunsgalore/icons/guns/gunsgalore_lefthand.dmi' - righthand_file = 'modular_ss220/modules/return_prs/gunsgalore/icons/guns/gunsgalore_righthand.dmi' + lefthand_file = 'modular_ss220/reverts/return_prs/icons/gunsgalore/guns/gunsgalore_lefthand.dmi' + righthand_file = 'modular_ss220/reverts/return_prs/icons/gunsgalore/guns/gunsgalore_righthand.dmi' inhand_icon_state = "p90" - worn_icon = 'modular_ss220/modules/return_prs/gunsgalore/icons/guns/gunsgalore_back.dmi' + worn_icon = 'modular_ss220/reverts/return_prs/icons/gunsgalore/guns/gunsgalore_back.dmi' worn_icon_state = "p90" slot_flags = ITEM_SLOT_BELT | ITEM_SLOT_BACK accepted_magazine_type = /obj/item/ammo_box/magazine/p90 can_suppress = FALSE fire_delay = 1 - fire_sound = 'modular_ss220/modules/return_prs/gunsgalore/sound/guns/fire/p90_fire.ogg' + fire_sound = 'modular_ss220/reverts/return_prs/sound/gunsgalore/guns/fire/p90_fire.ogg' fire_sound_volume = 100 - rack_sound = 'modular_ss220/modules/return_prs/gunsgalore/sound/guns/interact/p90_cock.ogg' - load_sound = 'modular_ss220/modules/return_prs/gunsgalore/sound/guns/interact/p90_magin.ogg' - load_empty_sound = 'modular_ss220/modules/return_prs/gunsgalore/sound/guns/interact/p90_magin.ogg' - eject_sound = 'modular_ss220/modules/return_prs/gunsgalore/sound/guns/interact/p90_magout.ogg' + rack_sound = 'modular_ss220/reverts/return_prs/sound/gunsgalore/guns/interact/p90_cock.ogg' + load_sound = 'modular_ss220/reverts/return_prs/sound/gunsgalore/guns/interact/p90_magin.ogg' + load_empty_sound = 'modular_ss220/reverts/return_prs/sound/gunsgalore/guns/interact/p90_magin.ogg' + eject_sound = 'modular_ss220/reverts/return_prs/sound/gunsgalore/guns/interact/p90_magout.ogg' /obj/item/gun/ballistic/automatic/p90/Initialize(mapload) @@ -27,7 +27,7 @@ /obj/item/ammo_box/magazine/p90 name = "\improper P90-02 magazine" - icon = 'modular_ss220/modules/return_prs/gunsgalore/icons/guns/gunsgalore_items.dmi' + icon = 'modular_ss220/reverts/return_prs/icons/gunsgalore/guns/gunsgalore_items.dmi' icon_state = "p90" ammo_type = /obj/item/ammo_casing/c34 caliber = "c34acp" diff --git a/modular_ss220/modules/return_prs/gunsgalore/code/guns/pps.dm b/modular_ss220/reverts/return_prs/code/gunsgalore/guns/pps.dm similarity index 55% rename from modular_ss220/modules/return_prs/gunsgalore/code/guns/pps.dm rename to modular_ss220/reverts/return_prs/code/gunsgalore/guns/pps.dm index c970ba241a0617..035f007247db67 100644 --- a/modular_ss220/modules/return_prs/gunsgalore/code/guns/pps.dm +++ b/modular_ss220/reverts/return_prs/code/gunsgalore/guns/pps.dm @@ -1,24 +1,24 @@ /obj/item/gun/ballistic/automatic/pps name = "\improper PPS-43" desc = "A very cheap, barely reliable reproduction of a personal defense weapon based on the original Soviet model. Not nearly as infamous as the Mosin." - icon = 'modular_ss220/modules/return_prs/gunsgalore/icons/guns/gunsgalore_guns40x32.dmi' + icon = 'modular_ss220/reverts/return_prs/icons/gunsgalore/guns/gunsgalore_guns40x32.dmi' icon_state = "pps" - lefthand_file = 'modular_ss220/modules/return_prs/gunsgalore/icons/guns/gunsgalore_lefthand.dmi' - righthand_file = 'modular_ss220/modules/return_prs/gunsgalore/icons/guns/gunsgalore_righthand.dmi' + lefthand_file = 'modular_ss220/reverts/return_prs/icons/gunsgalore/guns/gunsgalore_lefthand.dmi' + righthand_file = 'modular_ss220/reverts/return_prs/icons/gunsgalore/guns/gunsgalore_righthand.dmi' inhand_icon_state = "pps" slot_flags = ITEM_SLOT_BELT | ITEM_SLOT_BACK accepted_magazine_type = /obj/item/ammo_box/magazine/pps can_suppress = FALSE fire_delay = 3 - worn_icon = 'modular_ss220/modules/return_prs/gunsgalore/icons/guns/gunsgalore_back.dmi' + worn_icon = 'modular_ss220/reverts/return_prs/icons/gunsgalore/guns/gunsgalore_back.dmi' worn_icon_state = "pps" - fire_sound = 'modular_ss220/modules/return_prs/gunsgalore/sound/guns/fire/pps_fire.ogg' + fire_sound = 'modular_ss220/reverts/return_prs/sound/gunsgalore/guns/fire/pps_fire.ogg' fire_sound_volume = 100 - rack_sound = 'modular_ss220/modules/return_prs/gunsgalore/sound/guns/interact/smg_cock.ogg' - load_sound = 'modular_ss220/modules/return_prs/gunsgalore/sound/guns/interact/smg_magin.ogg' - load_empty_sound = 'modular_ss220/modules/return_prs/gunsgalore/sound/guns/interact/smg_magin.ogg' - eject_sound = 'modular_ss220/modules/return_prs/gunsgalore/sound/guns/interact/smg_magout.ogg' + rack_sound = 'modular_ss220/reverts/return_prs/sound/gunsgalore/guns/interact/smg_cock.ogg' + load_sound = 'modular_ss220/reverts/return_prs/sound/gunsgalore/guns/interact/smg_magin.ogg' + load_empty_sound = 'modular_ss220/reverts/return_prs/sound/gunsgalore/guns/interact/smg_magin.ogg' + eject_sound = 'modular_ss220/reverts/return_prs/sound/gunsgalore/guns/interact/smg_magout.ogg' /obj/item/gun/ballistic/automatic/pps/Initialize(mapload) . = ..() @@ -27,7 +27,7 @@ /obj/item/ammo_box/magazine/pps name = "pps magazine (7.62x25mm)" - icon = 'modular_ss220/modules/return_prs/gunsgalore/icons/guns/gunsgalore_items.dmi' + icon = 'modular_ss220/reverts/return_prs/icons/gunsgalore/guns/gunsgalore_items.dmi' icon_state = "pps" ammo_type = /obj/item/ammo_casing/realistic/a762x25 caliber = "a762x25" diff --git a/modular_ss220/modules/return_prs/gunsgalore/code/guns/ppsh.dm b/modular_ss220/reverts/return_prs/code/gunsgalore/guns/ppsh.dm similarity index 65% rename from modular_ss220/modules/return_prs/gunsgalore/code/guns/ppsh.dm rename to modular_ss220/reverts/return_prs/code/gunsgalore/guns/ppsh.dm index c721821658631e..bd2b94a5bba90d 100644 --- a/modular_ss220/modules/return_prs/gunsgalore/code/guns/ppsh.dm +++ b/modular_ss220/reverts/return_prs/code/gunsgalore/guns/ppsh.dm @@ -1,12 +1,12 @@ /obj/item/gun/ballistic/automatic/ppsh name = "\improper Asha 76" desc = "A reproduction of a simple Soviet SMG chambered in 7.62x25 Tokarev rounds. Its heavy wooden stock and leather breech buffer help absorb the bolt’s heavy recoil, making it great for spraying and praying. Uraaaa!" - icon = 'modular_ss220/modules/return_prs/gunsgalore/icons/guns/gunsgalore_guns40x32.dmi' + icon = 'modular_ss220/reverts/return_prs/icons/gunsgalore/guns/gunsgalore_guns40x32.dmi' icon_state = "ppsh" - lefthand_file = 'modular_ss220/modules/return_prs/gunsgalore/icons/guns/gunsgalore_lefthand.dmi' - righthand_file = 'modular_ss220/modules/return_prs/gunsgalore/icons/guns/gunsgalore_righthand.dmi' + lefthand_file = 'modular_ss220/reverts/return_prs/icons/gunsgalore/guns/gunsgalore_lefthand.dmi' + righthand_file = 'modular_ss220/reverts/return_prs/icons/gunsgalore/guns/gunsgalore_righthand.dmi' inhand_icon_state = "ppsh" - worn_icon = 'modular_ss220/modules/return_prs/gunsgalore/icons/guns/gunsgalore_back.dmi' + worn_icon = 'modular_ss220/reverts/return_prs/icons/gunsgalore/guns/gunsgalore_back.dmi' worn_icon_state = "ppsh" slot_flags = ITEM_SLOT_BELT | ITEM_SLOT_BACK w_class = WEIGHT_CLASS_BULKY @@ -14,13 +14,13 @@ can_suppress = FALSE spread = 20 fire_delay = 0.5 - fire_sound = 'modular_ss220/modules/return_prs/gunsgalore/sound/guns/fire/ppsh_fire.ogg' + fire_sound = 'modular_ss220/reverts/return_prs/sound/gunsgalore/guns/fire/ppsh_fire.ogg' fire_sound_volume = 80 - rack_sound = 'modular_ss220/modules/return_prs/gunsgalore/sound/guns/interact/smg_cock.ogg' - load_sound = 'modular_ss220/modules/return_prs/gunsgalore/sound/guns/interact/smg_magin.ogg' - load_empty_sound = 'modular_ss220/modules/return_prs/gunsgalore/sound/guns/interact/smg_magin.ogg' - eject_sound = 'modular_ss220/modules/return_prs/gunsgalore/sound/guns/interact/smg_magout.ogg' + rack_sound = 'modular_ss220/reverts/return_prs/sound/gunsgalore/guns/interact/smg_cock.ogg' + load_sound = 'modular_ss220/reverts/return_prs/sound/gunsgalore/guns/interact/smg_magin.ogg' + load_empty_sound = 'modular_ss220/reverts/return_prs/sound/gunsgalore/guns/interact/smg_magin.ogg' + eject_sound = 'modular_ss220/reverts/return_prs/sound/gunsgalore/guns/interact/smg_magout.ogg' /obj/item/gun/ballistic/automatic/ppsh/Initialize(mapload) . = ..() @@ -29,7 +29,7 @@ /obj/item/ammo_box/magazine/ppsh name = "Asha 76 magazine (7.62x25mm)" - icon = 'modular_ss220/modules/return_prs/gunsgalore/icons/guns/gunsgalore_items.dmi' + icon = 'modular_ss220/reverts/return_prs/icons/gunsgalore/guns/gunsgalore_items.dmi' icon_state = "ppsh" ammo_type = /obj/item/ammo_casing/realistic/a762x25 caliber = "a762x25" diff --git a/modular_ss220/reverts/return_prs/code/gunsgalore/guns/scar.dm b/modular_ss220/reverts/return_prs/code/gunsgalore/guns/scar.dm new file mode 100644 index 00000000000000..103c7e2d9dd3ed --- /dev/null +++ b/modular_ss220/reverts/return_prs/code/gunsgalore/guns/scar.dm @@ -0,0 +1,28 @@ +/obj/item/gun/ballistic/automatic/scar + name = "SCAR-L" + desc = "Part of the SCAR family rifles. This one is SCAR-L, which is for 'Light'. Chambered in .277 Aestus." + icon = 'modular_ss220/reverts/return_prs/icons/gunsgalore/guns/gunsgalore_guns40x32.dmi' + icon_state = "scar" + lefthand_file = 'modular_ss220/reverts/return_prs/icons/gunsgalore/guns/gunsgalore_lefthand.dmi' + righthand_file = 'modular_ss220/reverts/return_prs/icons/gunsgalore/guns/gunsgalore_righthand.dmi' + inhand_icon_state = "scar" + worn_icon = 'modular_ss220/reverts/return_prs/icons/gunsgalore/guns/gunsgalore_back.dmi' + worn_icon_state = "scar" + slot_flags = ITEM_SLOT_BELT | ITEM_SLOT_BACK + w_class = WEIGHT_CLASS_BULKY + weapon_weight = WEAPON_HEAVY + accepted_magazine_type = /obj/item/ammo_box/magazine/m16 + can_suppress = FALSE + fire_delay = 1.90 + fire_sound = 'modular_ss220/reverts/return_prs/sound/gunsgalore/guns/fire/scar_fire.ogg' + fire_sound_volume = 50 + rack_sound = 'modular_ss220/reverts/return_prs/sound/gunsgalore/guns/interact/scar_cock.ogg' + load_sound = 'modular_ss220/reverts/return_prs/sound/gunsgalore/guns/interact/scar_mag_in.ogg' + load_empty_sound = 'modular_ss220/reverts/return_prs/sound/gunsgalore/guns/interact/scar_mag_in.ogg' + eject_sound = 'modular_ss220/reverts/return_prs/sound/gunsgalore/guns/interact/smg_magout.ogg' + + +/obj/item/gun/ballistic/automatic/scar/Initialize(mapload) + . = ..() + + AddComponent(/datum/component/automatic_fire, fire_delay) diff --git a/modular_ss220/modules/return_prs/gunsgalore/code/guns/stg.dm b/modular_ss220/reverts/return_prs/code/gunsgalore/guns/stg.dm similarity index 57% rename from modular_ss220/modules/return_prs/gunsgalore/code/guns/stg.dm rename to modular_ss220/reverts/return_prs/code/gunsgalore/guns/stg.dm index b42be4df2c365e..b9e17bcfdeb5dd 100644 --- a/modular_ss220/modules/return_prs/gunsgalore/code/guns/stg.dm +++ b/modular_ss220/reverts/return_prs/code/gunsgalore/guns/stg.dm @@ -1,12 +1,12 @@ /obj/item/gun/ballistic/automatic/stg name = "\improper StG-99" desc = "A reproduction of the Sturmgewehr 44 German infantry rifle chambered in 7.92mm, manufactured by the Oldarms division of the Armadyne Corporation." - icon = 'modular_ss220/modules/return_prs/gunsgalore/icons/guns/gunsgalore_guns40x32.dmi' + icon = 'modular_ss220/reverts/return_prs/icons/gunsgalore/guns/gunsgalore_guns40x32.dmi' icon_state = "stg" - lefthand_file = 'modular_ss220/modules/return_prs/gunsgalore/icons/guns/gunsgalore_lefthand.dmi' - righthand_file = 'modular_ss220/modules/return_prs/gunsgalore/icons/guns/gunsgalore_righthand.dmi' + lefthand_file = 'modular_ss220/reverts/return_prs/icons/gunsgalore/guns/gunsgalore_lefthand.dmi' + righthand_file = 'modular_ss220/reverts/return_prs/icons/gunsgalore/guns/gunsgalore_righthand.dmi' inhand_icon_state = "stg" - worn_icon = 'modular_ss220/modules/return_prs/gunsgalore/icons/guns/gunsgalore_back.dmi' + worn_icon = 'modular_ss220/reverts/return_prs/icons/gunsgalore/guns/gunsgalore_back.dmi' worn_icon_state = "stg" slot_flags = ITEM_SLOT_BELT | ITEM_SLOT_BACK w_class = WEIGHT_CLASS_BULKY @@ -16,12 +16,12 @@ fire_delay = 1.5 burst_size = 1 actions_types = list() - fire_sound = 'modular_ss220/modules/return_prs/gunsgalore/sound/guns/fire/stg_fire.ogg' + fire_sound = 'modular_ss220/reverts/return_prs/sound/gunsgalore/guns/fire/stg_fire.ogg' fire_sound_volume = 70 - rack_sound = 'modular_ss220/modules/return_prs/gunsgalore/sound/guns/interact/ltrifle_cock.ogg' - load_sound = 'modular_ss220/modules/return_prs/gunsgalore/sound/guns/interact/ltrifle_magin.ogg' - load_empty_sound = 'modular_ss220/modules/return_prs/gunsgalore/sound/guns/interact/ltrifle_magin.ogg' - eject_sound = 'modular_ss220/modules/return_prs/gunsgalore/sound/guns/interact/ltrifle_magout.ogg' + rack_sound = 'modular_ss220/reverts/return_prs/sound/gunsgalore/guns/interact/ltrifle_cock.ogg' + load_sound = 'modular_ss220/reverts/return_prs/sound/gunsgalore/guns/interact/ltrifle_magin.ogg' + load_empty_sound = 'modular_ss220/reverts/return_prs/sound/gunsgalore/guns/interact/ltrifle_magin.ogg' + eject_sound = 'modular_ss220/reverts/return_prs/sound/gunsgalore/guns/interact/ltrifle_magout.ogg' /obj/item/gun/ballistic/automatic/stg/Initialize(mapload) . = ..() @@ -30,7 +30,7 @@ /obj/item/ammo_box/magazine/stg name = "stg magazine (7.92x33mm)" - icon = 'modular_ss220/modules/return_prs/gunsgalore/icons/guns/gunsgalore_items.dmi' + icon = 'modular_ss220/reverts/return_prs/icons/gunsgalore/guns/gunsgalore_items.dmi' icon_state = "stg" ammo_type = /obj/item/ammo_casing/realistic/a792x33 caliber = "a792x33" diff --git a/modular_ss220/modules/return_prs/black_mesa/hev_suit/code/hev_suit.dm b/modular_ss220/reverts/return_prs/code/hev_suit/hev_suit.dm similarity index 77% rename from modular_ss220/modules/return_prs/black_mesa/hev_suit/code/hev_suit.dm rename to modular_ss220/reverts/return_prs/code/hev_suit/hev_suit.dm index c9d5d5711dbecf..f03c65548641eb 100644 --- a/modular_ss220/modules/return_prs/black_mesa/hev_suit/code/hev_suit.dm +++ b/modular_ss220/reverts/return_prs/code/hev_suit/hev_suit.dm @@ -32,8 +32,8 @@ /obj/item/clothing/head/helmet/space/hev_suit name = "hazardous environment suit helmet" desc = "The Mark IV HEV suit helmet." - icon = 'modular_ss220/modules/return_prs/black_mesa/hev_suit/icons/helmeq.dmi' - worn_icon = 'modular_ss220/modules/return_prs/black_mesa/hev_suit/icons/helmet.dmi' + icon = 'modular_ss220/reverts/return_prs/icons/hev_suit/helmeq.dmi' + worn_icon = 'modular_ss220/reverts/return_prs/icons/hev_suit/helmet.dmi' icon_state = "hev" armor_type = /datum/armor/space_hev_suit obj_flags = NO_MAT_REDEMPTION @@ -74,9 +74,9 @@ /obj/item/clothing/suit/space/hev_suit name = "hazardous environment suit" desc = "The Mark IV HEV suit protects the user from a number of hazardous environments and has in build ballistic protection." - icon = 'modular_ss220/modules/return_prs/black_mesa/hev_suit/icons/hevsuiteq.dmi' - worn_icon = 'modular_ss220/modules/return_prs/black_mesa/hev_suit/icons/hevsuit.dmi' - worn_icon_digi = 'modular_ss220/modules/return_prs/black_mesa/hev_suit/icons/hevsuit_digi.dmi' + icon = 'modular_ss220/reverts/return_prs/icons/hev_suit/hevsuiteq.dmi' + worn_icon = 'modular_ss220/reverts/return_prs/icons/hev_suit/hevsuit.dmi' + worn_icon_digi = 'modular_ss220/reverts/return_prs/icons/hev_suit/hevsuit_digi.dmi' icon_state = "hev" inhand_icon_state = "syndicate-orange" armor_type = /datum/armor/space_hev_suit @@ -107,43 +107,43 @@ var/user_old_oxyloss ///Lots of sound vars. - var/activation_song = 'modular_ss220/modules/return_prs/black_mesa/hev_suit/sound/hev/anomalous_materials.ogg' - - var/logon_sound = 'modular_ss220/modules/return_prs/black_mesa/hev_suit/sound/hev/01_hev_logon.ogg' - var/armor_sound = 'modular_ss220/modules/return_prs/black_mesa/hev_suit/sound/hev/02_powerarmor_on.ogg' - var/atmospherics_sound = 'modular_ss220/modules/return_prs/black_mesa/hev_suit/sound/hev/03_atmospherics_on.ogg' - var/vitalsigns_sound = 'modular_ss220/modules/return_prs/black_mesa/hev_suit/sound/hev/04_vitalsigns_on.ogg' - var/automedic_sound = 'modular_ss220/modules/return_prs/black_mesa/hev_suit/sound/hev/05_automedic_on.ogg' - var/weaponselect_sound = 'modular_ss220/modules/return_prs/black_mesa/hev_suit/sound/hev/06_weaponselect_on.ogg' - var/munitions_sound = 'modular_ss220/modules/return_prs/black_mesa/hev_suit/sound/hev/07_munitionview_on.ogg' - var/communications_sound = 'modular_ss220/modules/return_prs/black_mesa/hev_suit/sound/hev/08_communications_on.ogg' - var/safe_day_sound = 'modular_ss220/modules/return_prs/black_mesa/hev_suit/sound/hev/09_safe_day.ogg' - - var/batt_50_sound = 'modular_ss220/modules/return_prs/black_mesa/hev_suit/sound/hev/power_level_is_fifty.ogg' - var/batt_40_sound = 'modular_ss220/modules/return_prs/black_mesa/hev_suit/sound/hev/power_level_is_fourty.ogg' - var/batt_30_sound = 'modular_ss220/modules/return_prs/black_mesa/hev_suit/sound/hev/power_level_is_thirty.ogg' - var/batt_20_sound = 'modular_ss220/modules/return_prs/black_mesa/hev_suit/sound/hev/power_level_is_twenty.ogg' - var/batt_10_sound = 'modular_ss220/modules/return_prs/black_mesa/hev_suit/sound/hev/power_level_is_ten.ogg' - - var/near_death_sound = 'modular_ss220/modules/return_prs/black_mesa/hev_suit/sound/hev/near_death.ogg' - var/health_critical_sound = 'modular_ss220/modules/return_prs/black_mesa/hev_suit/sound/hev/health_critical.ogg' - var/health_dropping_sound = 'modular_ss220/modules/return_prs/black_mesa/hev_suit/sound/hev/health_dropping2.ogg' - - var/blood_loss_sound = 'modular_ss220/modules/return_prs/black_mesa/hev_suit/sound/hev/blood_loss.ogg' - var/blood_toxins_sound = 'modular_ss220/modules/return_prs/black_mesa/hev_suit/sound/hev/blood_toxins.ogg' - var/biohazard_sound = 'modular_ss220/modules/return_prs/black_mesa/hev_suit/sound/hev/biohazard_detected.ogg' - var/chemical_sound = 'modular_ss220/modules/return_prs/black_mesa/hev_suit/sound/hev/chemical_detected.ogg' - var/radiation_sound = 'modular_ss220/modules/return_prs/black_mesa/hev_suit/sound/hev/radiation_detected.ogg' - - var/minor_fracture_sound = 'modular_ss220/modules/return_prs/black_mesa/hev_suit/sound/hev/minor_fracture.ogg' - var/major_fracture_sound = 'modular_ss220/modules/return_prs/black_mesa/hev_suit/sound/hev/major_fracture.ogg' - var/minor_lacerations_sound = 'modular_ss220/modules/return_prs/black_mesa/hev_suit/sound/hev/minor_lacerations.ogg' - var/major_lacerations_sound = 'modular_ss220/modules/return_prs/black_mesa/hev_suit/sound/hev/major_lacerations.ogg' - - var/morphine_sound = 'modular_ss220/modules/return_prs/black_mesa/hev_suit/sound/hev/morphine_shot.ogg' - var/wound_sound = 'modular_ss220/modules/return_prs/black_mesa/hev_suit/sound/hev/wound_sterilized.ogg' - var/antitoxin_sound = 'modular_ss220/modules/return_prs/black_mesa/hev_suit/sound/hev/antitoxin_shot.ogg' - var/antidote_sound = 'modular_ss220/modules/return_prs/black_mesa/hev_suit/sound/hev/antidote_shot.ogg' + var/activation_song = 'modular_ss220/reverts/return_prs/sound/hev_suit/hev/anomalous_materials.ogg' + + var/logon_sound = 'modular_ss220/reverts/return_prs/sound/hev_suit/hev/01_hev_logon.ogg' + var/armor_sound = 'modular_ss220/reverts/return_prs/sound/hev_suit/hev/02_powerarmor_on.ogg' + var/atmospherics_sound = 'modular_ss220/reverts/return_prs/sound/hev_suit/hev/03_atmospherics_on.ogg' + var/vitalsigns_sound = 'modular_ss220/reverts/return_prs/sound/hev_suit/hev/04_vitalsigns_on.ogg' + var/automedic_sound = 'modular_ss220/reverts/return_prs/sound/hev_suit/hev/05_automedic_on.ogg' + var/weaponselect_sound = 'modular_ss220/reverts/return_prs/sound/hev_suit/hev/06_weaponselect_on.ogg' + var/munitions_sound = 'modular_ss220/reverts/return_prs/sound/hev_suit/hev/07_munitionview_on.ogg' + var/communications_sound = 'modular_ss220/reverts/return_prs/sound/hev_suit/hev/08_communications_on.ogg' + var/safe_day_sound = 'modular_ss220/reverts/return_prs/sound/hev_suit/hev/09_safe_day.ogg' + + var/batt_50_sound = 'modular_ss220/reverts/return_prs/sound/hev_suit/hev/power_level_is_fifty.ogg' + var/batt_40_sound = 'modular_ss220/reverts/return_prs/sound/hev_suit/hev/power_level_is_fourty.ogg' + var/batt_30_sound = 'modular_ss220/reverts/return_prs/sound/hev_suit/hev/power_level_is_thirty.ogg' + var/batt_20_sound = 'modular_ss220/reverts/return_prs/sound/hev_suit/hev/power_level_is_twenty.ogg' + var/batt_10_sound = 'modular_ss220/reverts/return_prs/sound/hev_suit/hev/power_level_is_ten.ogg' + + var/near_death_sound = 'modular_ss220/reverts/return_prs/sound/hev_suit/hev/near_death.ogg' + var/health_critical_sound = 'modular_ss220/reverts/return_prs/sound/hev_suit/hev/health_critical.ogg' + var/health_dropping_sound = 'modular_ss220/reverts/return_prs/sound/hev_suit/hev/health_dropping2.ogg' + + var/blood_loss_sound = 'modular_ss220/reverts/return_prs/sound/hev_suit/hev/blood_loss.ogg' + var/blood_toxins_sound = 'modular_ss220/reverts/return_prs/sound/hev_suit/hev/blood_toxins.ogg' + var/biohazard_sound = 'modular_ss220/reverts/return_prs/sound/hev_suit/hev/biohazard_detected.ogg' + var/chemical_sound = 'modular_ss220/reverts/return_prs/sound/hev_suit/hev/chemical_detected.ogg' + var/radiation_sound = 'modular_ss220/reverts/return_prs/sound/hev_suit/hev/radiation_detected.ogg' + + var/minor_fracture_sound = 'modular_ss220/reverts/return_prs/sound/hev_suit/hev/minor_fracture.ogg' + var/major_fracture_sound = 'modular_ss220/reverts/return_prs/sound/hev_suit/hev/major_fracture.ogg' + var/minor_lacerations_sound = 'modular_ss220/reverts/return_prs/sound/hev_suit/hev/minor_lacerations.ogg' + var/major_lacerations_sound = 'modular_ss220/reverts/return_prs/sound/hev_suit/hev/major_lacerations.ogg' + + var/morphine_sound = 'modular_ss220/reverts/return_prs/sound/hev_suit/hev/morphine_shot.ogg' + var/wound_sound = 'modular_ss220/reverts/return_prs/sound/hev_suit/hev/wound_sterilized.ogg' + var/antitoxin_sound = 'modular_ss220/reverts/return_prs/sound/hev_suit/hev/antitoxin_shot.ogg' + var/antidote_sound = 'modular_ss220/reverts/return_prs/sound/hev_suit/hev/antidote_shot.ogg' var/radio_channel = RADIO_CHANNEL_COMMON @@ -219,13 +219,13 @@ /datum/action/item_action/hev_toggle name = "Toggle HEV Suit" - button_icon = 'modular_ss220/modules/return_prs/black_mesa/hev_suit/icons/toggles.dmi' + button_icon = 'modular_ss220/reverts/return_prs/icons/hev_suit/toggles.dmi' button_icon_state = "system_off" /datum/action/item_action/hev_toggle_notifs name = "Toggle HEV Suit Notifications" - button_icon = 'modular_ss220/modules/return_prs/black_mesa/hev_suit/icons/toggles.dmi' + button_icon = 'modular_ss220/reverts/return_prs/icons/hev_suit/toggles.dmi' button_icon_state = "sound_VOICE_AND_TEXT" @@ -243,7 +243,7 @@ button_icon_state = "sound_[new_setting]" - playsound(my_suit, 'modular_ss220/modules/return_prs/black_mesa/hev_suit/sound/hev/blip.ogg', 50) + playsound(my_suit, 'modular_ss220/reverts/return_prs/sound/hev_suit/hev/blip.ogg', 50) build_all_button_icons() @@ -261,7 +261,7 @@ button_icon_state = toggle ? "system_on" : "system_off" - playsound(my_suit, 'modular_ss220/modules/return_prs/black_mesa/hev_suit/sound/hev/blip.ogg', 50) + playsound(my_suit, 'modular_ss220/reverts/return_prs/sound/hev_suit/hev/blip.ogg', 50) build_all_button_icons() @@ -504,7 +504,7 @@ /obj/item/clothing/suit/space/hev_suit/proc/stat_changed(datum/source, new_stat) SIGNAL_HANDLER if(new_stat == DEAD) - playsound(src, 'modular_ss220/modules/return_prs/black_mesa/hev_suit/sound/hev/flatline.ogg', 40) + playsound(src, 'modular_ss220/reverts/return_prs/sound/hev_suit/hev/flatline.ogg', 40) internal_radio.talk_into(src, "WARNING! USER [uppertext(current_user.real_name)] VITALSIGNS HAVE FLATLINED, CURRENT POSITION: [loc.x], [loc.y], [loc.z]!", radio_channel) deactivate() @@ -715,9 +715,9 @@ /obj/item/clothing/head/helmet/space/hev_suit/pcv name = "powered combat helmet" desc = "A deprecated combat helmet developed during the early 21th century in Sol-3, with protections rated level III-A. Contains attachment points for AN/PVS night vision goggles." - icon = 'modular_ss220/modules/return_prs/black_mesa/icons/misc/hecucloth.dmi' - worn_icon = 'modular_ss220/modules/return_prs/black_mesa/icons/misc/hecumob.dmi' - worn_icon_digi = 'modular_ss220/modules/return_prs/black_mesa/icons/misc/hecumob_muzzled.dmi' + icon = 'modular_ss220/reverts/return_prs/icons/black_mesa/misc/hecucloth.dmi' + worn_icon = 'modular_ss220/reverts/return_prs/icons/black_mesa/misc/hecumob.dmi' + worn_icon_digi = 'modular_ss220/reverts/return_prs/icons/black_mesa/misc/hecumob_muzzled.dmi' icon_state = "hecu_helm" armor_type = /datum/armor/hev_suit_pcv flags_inv = HIDEHAIR @@ -778,9 +778,9 @@ /obj/item/clothing/suit/space/hev_suit/pcv name = "powered combat vest" desc = "An electrically charged piece of body armor, the power stiffens the suit's fibers to provide a layer of resilient armor in response to trauma received from kinetic force. It's fitted with a geiger counter, tactical radio, a heads up display and a combat cocktail injector that allows the user to function normally even after serious injury. The concentration of mass in the lower rear side from the onboard computer makes your ass feel heavy." - icon = 'modular_ss220/modules/return_prs/black_mesa/icons/misc/hecucloth.dmi' - worn_icon = 'modular_ss220/modules/return_prs/black_mesa/icons/misc/hecumob.dmi' - worn_icon_digi = 'modular_ss220/modules/return_prs/black_mesa/icons/misc/hecumob_digi.dmi' + icon = 'modular_ss220/reverts/return_prs/icons/black_mesa/misc/hecucloth.dmi' + worn_icon = 'modular_ss220/reverts/return_prs/icons/black_mesa/misc/hecumob.dmi' + worn_icon_digi = 'modular_ss220/reverts/return_prs/icons/black_mesa/misc/hecumob_digi.dmi' icon_state = "hecu_vest" armor_type = /datum/armor/hev_suit_pcv flags_inv = null @@ -812,40 +812,40 @@ activation_song = null // removal of song only standard suit will have the song - logon_sound = 'modular_ss220/modules/return_prs/black_mesa/hev_suit/sound/pcv/01_pcv_logon.ogg' - armor_sound = 'modular_ss220/modules/return_prs/black_mesa/hev_suit/sound/pcv/02_powerarmor_on.ogg' - atmospherics_sound = 'modular_ss220/modules/return_prs/black_mesa/hev_suit/sound/pcv/03_atmospherics_on.ogg' - vitalsigns_sound = 'modular_ss220/modules/return_prs/black_mesa/hev_suit/sound/pcv/04_vitalsigns_on.ogg' - automedic_sound = 'modular_ss220/modules/return_prs/black_mesa/hev_suit/sound/pcv/05_automedic_on.ogg' - weaponselect_sound = 'modular_ss220/modules/return_prs/black_mesa/hev_suit/sound/pcv/06_weaponselect_on.ogg' - munitions_sound = 'modular_ss220/modules/return_prs/black_mesa/hev_suit/sound/pcv/07_munitionview_on.ogg' - communications_sound = 'modular_ss220/modules/return_prs/black_mesa/hev_suit/sound/pcv/08_communications_on.ogg' - safe_day_sound = 'modular_ss220/modules/return_prs/black_mesa/hev_suit/sound/pcv/09_safe_day.ogg' - - batt_50_sound = 'modular_ss220/modules/return_prs/black_mesa/hev_suit/sound/pcv/power_level_is_fifty.ogg' - batt_40_sound = 'modular_ss220/modules/return_prs/black_mesa/hev_suit/sound/pcv/power_level_is_fourty.ogg' - batt_30_sound = 'modular_ss220/modules/return_prs/black_mesa/hev_suit/sound/pcv/power_level_is_thirty.ogg' - batt_20_sound = 'modular_ss220/modules/return_prs/black_mesa/hev_suit/sound/pcv/power_level_is_twenty.ogg' - batt_10_sound = 'modular_ss220/modules/return_prs/black_mesa/hev_suit/sound/pcv/power_level_is_ten.ogg' - - near_death_sound = 'modular_ss220/modules/return_prs/black_mesa/hev_suit/sound/pcv/near_death.ogg' - health_critical_sound = 'modular_ss220/modules/return_prs/black_mesa/hev_suit/sound/pcv/health_critical.ogg' - health_dropping_sound = 'modular_ss220/modules/return_prs/black_mesa/hev_suit/sound/pcv/health_dropping2.ogg' - - blood_loss_sound = 'modular_ss220/modules/return_prs/black_mesa/hev_suit/sound/pcv/blood_loss.ogg' - blood_toxins_sound = 'modular_ss220/modules/return_prs/black_mesa/hev_suit/sound/pcv/blood_toxins.ogg' - biohazard_sound = 'modular_ss220/modules/return_prs/black_mesa/hev_suit/sound/pcv/biohazard_detected.ogg' - chemical_sound = 'modular_ss220/modules/return_prs/black_mesa/hev_suit/sound/pcv/chemical_detected.ogg' - - minor_fracture_sound = 'modular_ss220/modules/return_prs/black_mesa/hev_suit/sound/pcv/minor_fracture.ogg' - major_fracture_sound = 'modular_ss220/modules/return_prs/black_mesa/hev_suit/sound/pcv/major_fracture.ogg' - minor_lacerations_sound = 'modular_ss220/modules/return_prs/black_mesa/hev_suit/sound/pcv/minor_lacerations.ogg' - major_lacerations_sound = 'modular_ss220/modules/return_prs/black_mesa/hev_suit/sound/pcv/major_lacerations.ogg' - - morphine_sound = 'modular_ss220/modules/return_prs/black_mesa/hev_suit/sound/pcv/morphine_shot.ogg' - wound_sound = 'modular_ss220/modules/return_prs/black_mesa/hev_suit/sound/pcv/wound_sterilized.ogg' - antitoxin_sound = 'modular_ss220/modules/return_prs/black_mesa/hev_suit/sound/pcv/antitoxin_shot.ogg' - antidote_sound = 'modular_ss220/modules/return_prs/black_mesa/hev_suit/sound/pcv/antidote_shot.ogg' + logon_sound = 'modular_ss220/reverts/return_prs/sound/hev_suit/pcv/01_pcv_logon.ogg' + armor_sound = 'modular_ss220/reverts/return_prs/sound/hev_suit/pcv/02_powerarmor_on.ogg' + atmospherics_sound = 'modular_ss220/reverts/return_prs/sound/hev_suit/pcv/03_atmospherics_on.ogg' + vitalsigns_sound = 'modular_ss220/reverts/return_prs/sound/hev_suit/pcv/04_vitalsigns_on.ogg' + automedic_sound = 'modular_ss220/reverts/return_prs/sound/hev_suit/pcv/05_automedic_on.ogg' + weaponselect_sound = 'modular_ss220/reverts/return_prs/sound/hev_suit/pcv/06_weaponselect_on.ogg' + munitions_sound = 'modular_ss220/reverts/return_prs/sound/hev_suit/pcv/07_munitionview_on.ogg' + communications_sound = 'modular_ss220/reverts/return_prs/sound/hev_suit/pcv/08_communications_on.ogg' + safe_day_sound = 'modular_ss220/reverts/return_prs/sound/hev_suit/pcv/09_safe_day.ogg' + + batt_50_sound = 'modular_ss220/reverts/return_prs/sound/hev_suit/pcv/power_level_is_fifty.ogg' + batt_40_sound = 'modular_ss220/reverts/return_prs/sound/hev_suit/pcv/power_level_is_fourty.ogg' + batt_30_sound = 'modular_ss220/reverts/return_prs/sound/hev_suit/pcv/power_level_is_thirty.ogg' + batt_20_sound = 'modular_ss220/reverts/return_prs/sound/hev_suit/pcv/power_level_is_twenty.ogg' + batt_10_sound = 'modular_ss220/reverts/return_prs/sound/hev_suit/pcv/ten.ogg' + + near_death_sound = 'modular_ss220/reverts/return_prs/sound/hev_suit/pcv/near_death.ogg' + health_critical_sound = 'modular_ss220/reverts/return_prs/sound/hev_suit/pcv/health_critical.ogg' + health_dropping_sound = 'modular_ss220/reverts/return_prs/sound/hev_suit/pcv/health_dropping2.ogg' + + blood_loss_sound = 'modular_ss220/reverts/return_prs/sound/hev_suit/pcv/blood_loss.ogg' + blood_toxins_sound = 'modular_ss220/reverts/return_prs/sound/hev_suit/pcv/blood_toxins.ogg' + biohazard_sound = 'modular_ss220/reverts/return_prs/sound/hev_suit/pcv/biohazard_detected.ogg' + chemical_sound = 'modular_ss220/reverts/return_prs/sound/hev_suit/pcv/chemical_detected.ogg' + + minor_fracture_sound = 'modular_ss220/reverts/return_prs/sound/hev_suit/pcv/minor_fracture.ogg' + major_fracture_sound = 'modular_ss220/reverts/return_prs/sound/hev_suit/pcv/major_fracture.ogg' + minor_lacerations_sound = 'modular_ss220/reverts/return_prs/sound/hev_suit/pcv/minor_lacerations.ogg' + major_lacerations_sound = 'modular_ss220/reverts/return_prs/sound/hev_suit/pcv/major_lacerations.ogg' + + morphine_sound = 'modular_ss220/reverts/return_prs/sound/hev_suit/pcv/morphine_shot.ogg' + wound_sound = 'modular_ss220/reverts/return_prs/sound/hev_suit/pcv/wound_sterilized.ogg' + antitoxin_sound = 'modular_ss220/reverts/return_prs/sound/hev_suit/pcv/antitoxin_shot.ogg' + antidote_sound = 'modular_ss220/reverts/return_prs/sound/hev_suit/pcv/antidote_shot.ogg' armor_unpowered = /datum/armor/hev_suit_pcv armor_powered = /datum/armor/hev_suit_pcv/powered @@ -855,7 +855,6 @@ rads_static_cooldown = PCV_COOLDOWN_RADS acid_static_cooldown = PCV_COOLDOWN_ACID suit_name = "PCV MARK II" - /obj/item/clothing/suit/space/hev_suit/pcv/click_alt(mob/living/user) reskin_obj(user) . = ..() @@ -879,3 +878,4 @@ #undef HEV_NOTIFICATION_VOICE #undef HEV_NOTIFICATION_OFF #undef HEV_NOTIFICATIONS + diff --git a/modular_ss220/modules/return_prs/black_mesa/icons/mapping_helpers.dmi b/modular_ss220/reverts/return_prs/icons/black_mesa/mapping_helpers.dmi similarity index 100% rename from modular_ss220/modules/return_prs/black_mesa/icons/mapping_helpers.dmi rename to modular_ss220/reverts/return_prs/icons/black_mesa/mapping_helpers.dmi diff --git a/modular_ss220/modules/return_prs/black_mesa/icons/misc/ballistic.dmi b/modular_ss220/reverts/return_prs/icons/black_mesa/misc/ballistic.dmi similarity index 100% rename from modular_ss220/modules/return_prs/black_mesa/icons/misc/ballistic.dmi rename to modular_ss220/reverts/return_prs/icons/black_mesa/misc/ballistic.dmi diff --git a/modular_ss220/modules/return_prs/black_mesa/icons/misc/ballistic_l.dmi b/modular_ss220/reverts/return_prs/icons/black_mesa/misc/ballistic_l.dmi similarity index 100% rename from modular_ss220/modules/return_prs/black_mesa/icons/misc/ballistic_l.dmi rename to modular_ss220/reverts/return_prs/icons/black_mesa/misc/ballistic_l.dmi diff --git a/modular_ss220/modules/return_prs/black_mesa/icons/misc/ballistic_r.dmi b/modular_ss220/reverts/return_prs/icons/black_mesa/misc/ballistic_r.dmi similarity index 100% rename from modular_ss220/modules/return_prs/black_mesa/icons/misc/ballistic_r.dmi rename to modular_ss220/reverts/return_prs/icons/black_mesa/misc/ballistic_r.dmi diff --git a/modular_ss220/modules/return_prs/black_mesa/icons/misc/courses.dmi b/modular_ss220/reverts/return_prs/icons/black_mesa/misc/courses.dmi similarity index 100% rename from modular_ss220/modules/return_prs/black_mesa/icons/misc/courses.dmi rename to modular_ss220/reverts/return_prs/icons/black_mesa/misc/courses.dmi diff --git a/modular_ss220/modules/return_prs/black_mesa/icons/misc/flags.dmi b/modular_ss220/reverts/return_prs/icons/black_mesa/misc/flags.dmi similarity index 100% rename from modular_ss220/modules/return_prs/black_mesa/icons/misc/flags.dmi rename to modular_ss220/reverts/return_prs/icons/black_mesa/misc/flags.dmi diff --git a/modular_ss220/modules/return_prs/black_mesa/icons/misc/freeman.dmi b/modular_ss220/reverts/return_prs/icons/black_mesa/misc/freeman.dmi similarity index 100% rename from modular_ss220/modules/return_prs/black_mesa/icons/misc/freeman.dmi rename to modular_ss220/reverts/return_prs/icons/black_mesa/misc/freeman.dmi diff --git a/modular_ss220/modules/return_prs/black_mesa/icons/misc/hecucloth.dmi b/modular_ss220/reverts/return_prs/icons/black_mesa/misc/hecucloth.dmi similarity index 100% rename from modular_ss220/modules/return_prs/black_mesa/icons/misc/hecucloth.dmi rename to modular_ss220/reverts/return_prs/icons/black_mesa/misc/hecucloth.dmi diff --git a/modular_ss220/modules/return_prs/black_mesa/icons/misc/hecumob.dmi b/modular_ss220/reverts/return_prs/icons/black_mesa/misc/hecumob.dmi similarity index 100% rename from modular_ss220/modules/return_prs/black_mesa/icons/misc/hecumob.dmi rename to modular_ss220/reverts/return_prs/icons/black_mesa/misc/hecumob.dmi diff --git a/modular_ss220/modules/return_prs/black_mesa/icons/misc/hecumob_digi.dmi b/modular_ss220/reverts/return_prs/icons/black_mesa/misc/hecumob_digi.dmi similarity index 100% rename from modular_ss220/modules/return_prs/black_mesa/icons/misc/hecumob_digi.dmi rename to modular_ss220/reverts/return_prs/icons/black_mesa/misc/hecumob_digi.dmi diff --git a/modular_ss220/modules/return_prs/black_mesa/icons/misc/hecumob_muzzled.dmi b/modular_ss220/reverts/return_prs/icons/black_mesa/misc/hecumob_muzzled.dmi similarity index 100% rename from modular_ss220/modules/return_prs/black_mesa/icons/misc/hecumob_muzzled.dmi rename to modular_ss220/reverts/return_prs/icons/black_mesa/misc/hecumob_muzzled.dmi diff --git a/modular_ss220/modules/return_prs/black_mesa/icons/misc/mre_hecu.dmi b/modular_ss220/reverts/return_prs/icons/black_mesa/misc/mre_hecu.dmi similarity index 100% rename from modular_ss220/modules/return_prs/black_mesa/icons/misc/mre_hecu.dmi rename to modular_ss220/reverts/return_prs/icons/black_mesa/misc/mre_hecu.dmi diff --git a/modular_ss220/modules/return_prs/black_mesa/icons/miscweapon/64x_guns_left.dmi b/modular_ss220/reverts/return_prs/icons/black_mesa/miscweapon/64x_guns_left.dmi similarity index 100% rename from modular_ss220/modules/return_prs/black_mesa/icons/miscweapon/64x_guns_left.dmi rename to modular_ss220/reverts/return_prs/icons/black_mesa/miscweapon/64x_guns_left.dmi diff --git a/modular_ss220/modules/return_prs/black_mesa/icons/miscweapon/64x_guns_right.dmi b/modular_ss220/reverts/return_prs/icons/black_mesa/miscweapon/64x_guns_right.dmi similarity index 100% rename from modular_ss220/modules/return_prs/black_mesa/icons/miscweapon/64x_guns_right.dmi rename to modular_ss220/reverts/return_prs/icons/black_mesa/miscweapon/64x_guns_right.dmi diff --git a/modular_ss220/modules/return_prs/black_mesa/icons/miscweapon/glock.dmi b/modular_ss220/reverts/return_prs/icons/black_mesa/miscweapon/glock.dmi similarity index 100% rename from modular_ss220/modules/return_prs/black_mesa/icons/miscweapon/glock.dmi rename to modular_ss220/reverts/return_prs/icons/black_mesa/miscweapon/glock.dmi diff --git a/modular_ss220/modules/return_prs/black_mesa/icons/miscweapon/guns.dmi b/modular_ss220/reverts/return_prs/icons/black_mesa/miscweapon/guns.dmi similarity index 100% rename from modular_ss220/modules/return_prs/black_mesa/icons/miscweapon/guns.dmi rename to modular_ss220/reverts/return_prs/icons/black_mesa/miscweapon/guns.dmi diff --git a/modular_ss220/modules/return_prs/black_mesa/icons/miscweapon/guns_back.dmi b/modular_ss220/reverts/return_prs/icons/black_mesa/miscweapon/guns_back.dmi similarity index 100% rename from modular_ss220/modules/return_prs/black_mesa/icons/miscweapon/guns_back.dmi rename to modular_ss220/reverts/return_prs/icons/black_mesa/miscweapon/guns_back.dmi diff --git a/modular_ss220/modules/return_prs/black_mesa/icons/miscweapon/guns_lefthand.dmi b/modular_ss220/reverts/return_prs/icons/black_mesa/miscweapon/guns_lefthand.dmi similarity index 100% rename from modular_ss220/modules/return_prs/black_mesa/icons/miscweapon/guns_lefthand.dmi rename to modular_ss220/reverts/return_prs/icons/black_mesa/miscweapon/guns_lefthand.dmi diff --git a/modular_ss220/modules/return_prs/black_mesa/icons/miscweapon/guns_righthand.dmi b/modular_ss220/reverts/return_prs/icons/black_mesa/miscweapon/guns_righthand.dmi similarity index 100% rename from modular_ss220/modules/return_prs/black_mesa/icons/miscweapon/guns_righthand.dmi rename to modular_ss220/reverts/return_prs/icons/black_mesa/miscweapon/guns_righthand.dmi diff --git a/modular_ss220/modules/return_prs/black_mesa/icons/miscweapon/mags.dmi b/modular_ss220/reverts/return_prs/icons/black_mesa/miscweapon/mags.dmi similarity index 100% rename from modular_ss220/modules/return_prs/black_mesa/icons/miscweapon/mags.dmi rename to modular_ss220/reverts/return_prs/icons/black_mesa/miscweapon/mags.dmi diff --git a/modular_ss220/modules/return_prs/black_mesa/icons/mobs.dmi b/modular_ss220/reverts/return_prs/icons/black_mesa/mobs.dmi similarity index 100% rename from modular_ss220/modules/return_prs/black_mesa/icons/mobs.dmi rename to modular_ss220/reverts/return_prs/icons/black_mesa/mobs.dmi diff --git a/modular_ss220/modules/return_prs/black_mesa/icons/nihilanth.dmi b/modular_ss220/reverts/return_prs/icons/black_mesa/nihilanth.dmi similarity index 100% rename from modular_ss220/modules/return_prs/black_mesa/icons/nihilanth.dmi rename to modular_ss220/reverts/return_prs/icons/black_mesa/nihilanth.dmi diff --git a/modular_ss220/modules/return_prs/black_mesa/icons/plants.dmi b/modular_ss220/reverts/return_prs/icons/black_mesa/plants.dmi similarity index 100% rename from modular_ss220/modules/return_prs/black_mesa/icons/plants.dmi rename to modular_ss220/reverts/return_prs/icons/black_mesa/plants.dmi diff --git a/modular_ss220/modules/return_prs/black_mesa/icons/structures.dmi b/modular_ss220/reverts/return_prs/icons/black_mesa/structures.dmi similarity index 100% rename from modular_ss220/modules/return_prs/black_mesa/icons/structures.dmi rename to modular_ss220/reverts/return_prs/icons/black_mesa/structures.dmi diff --git a/modular_ss220/reverts/return_prs/icons/black_mesa/structures/dmi b/modular_ss220/reverts/return_prs/icons/black_mesa/structures/dmi new file mode 100644 index 00000000000000..e69de29bb2d1d6 diff --git a/modular_ss220/modules/return_prs/black_mesa/icons/xen_door.dmi b/modular_ss220/reverts/return_prs/icons/black_mesa/xen_door.dmi similarity index 100% rename from modular_ss220/modules/return_prs/black_mesa/icons/xen_door.dmi rename to modular_ss220/reverts/return_prs/icons/black_mesa/xen_door.dmi diff --git a/modular_ss220/modules/return_prs/black_mesa/icons/xen_turfs.dmi b/modular_ss220/reverts/return_prs/icons/black_mesa/xen_turfs.dmi similarity index 100% rename from modular_ss220/modules/return_prs/black_mesa/icons/xen_turfs.dmi rename to modular_ss220/reverts/return_prs/icons/black_mesa/xen_turfs.dmi diff --git a/modular_ss220/modules/return_prs/gunsgalore/icons/ammo/ammo.dmi b/modular_ss220/reverts/return_prs/icons/gunsgalore/ammo/ammo.dmi similarity index 100% rename from modular_ss220/modules/return_prs/gunsgalore/icons/ammo/ammo.dmi rename to modular_ss220/reverts/return_prs/icons/gunsgalore/ammo/ammo.dmi diff --git a/modular_ss220/modules/return_prs/gunsgalore/icons/guns/gunsgalore_back.dmi b/modular_ss220/reverts/return_prs/icons/gunsgalore/guns/gunsgalore_back.dmi similarity index 100% rename from modular_ss220/modules/return_prs/gunsgalore/icons/guns/gunsgalore_back.dmi rename to modular_ss220/reverts/return_prs/icons/gunsgalore/guns/gunsgalore_back.dmi diff --git a/modular_ss220/modules/return_prs/gunsgalore/icons/guns/gunsgalore_guns.dmi b/modular_ss220/reverts/return_prs/icons/gunsgalore/guns/gunsgalore_guns.dmi similarity index 100% rename from modular_ss220/modules/return_prs/gunsgalore/icons/guns/gunsgalore_guns.dmi rename to modular_ss220/reverts/return_prs/icons/gunsgalore/guns/gunsgalore_guns.dmi diff --git a/modular_ss220/modules/return_prs/gunsgalore/icons/guns/gunsgalore_guns40x32.dmi b/modular_ss220/reverts/return_prs/icons/gunsgalore/guns/gunsgalore_guns40x32.dmi similarity index 100% rename from modular_ss220/modules/return_prs/gunsgalore/icons/guns/gunsgalore_guns40x32.dmi rename to modular_ss220/reverts/return_prs/icons/gunsgalore/guns/gunsgalore_guns40x32.dmi diff --git a/modular_ss220/modules/return_prs/gunsgalore/icons/guns/gunsgalore_items.dmi b/modular_ss220/reverts/return_prs/icons/gunsgalore/guns/gunsgalore_items.dmi similarity index 100% rename from modular_ss220/modules/return_prs/gunsgalore/icons/guns/gunsgalore_items.dmi rename to modular_ss220/reverts/return_prs/icons/gunsgalore/guns/gunsgalore_items.dmi diff --git a/modular_ss220/modules/return_prs/gunsgalore/icons/guns/gunsgalore_lefthand.dmi b/modular_ss220/reverts/return_prs/icons/gunsgalore/guns/gunsgalore_lefthand.dmi similarity index 100% rename from modular_ss220/modules/return_prs/gunsgalore/icons/guns/gunsgalore_lefthand.dmi rename to modular_ss220/reverts/return_prs/icons/gunsgalore/guns/gunsgalore_lefthand.dmi diff --git a/modular_ss220/modules/return_prs/gunsgalore/icons/guns/gunsgalore_righthand.dmi b/modular_ss220/reverts/return_prs/icons/gunsgalore/guns/gunsgalore_righthand.dmi similarity index 100% rename from modular_ss220/modules/return_prs/gunsgalore/icons/guns/gunsgalore_righthand.dmi rename to modular_ss220/reverts/return_prs/icons/gunsgalore/guns/gunsgalore_righthand.dmi diff --git a/modular_ss220/modules/return_prs/black_mesa/hev_suit/icons/helmeq.dmi b/modular_ss220/reverts/return_prs/icons/hev_suit/helmeq.dmi similarity index 100% rename from modular_ss220/modules/return_prs/black_mesa/hev_suit/icons/helmeq.dmi rename to modular_ss220/reverts/return_prs/icons/hev_suit/helmeq.dmi diff --git a/modular_ss220/modules/return_prs/black_mesa/hev_suit/icons/helmet.dmi b/modular_ss220/reverts/return_prs/icons/hev_suit/helmet.dmi similarity index 100% rename from modular_ss220/modules/return_prs/black_mesa/hev_suit/icons/helmet.dmi rename to modular_ss220/reverts/return_prs/icons/hev_suit/helmet.dmi diff --git a/modular_ss220/modules/return_prs/black_mesa/hev_suit/icons/hevsuit.dmi b/modular_ss220/reverts/return_prs/icons/hev_suit/hevsuit.dmi similarity index 100% rename from modular_ss220/modules/return_prs/black_mesa/hev_suit/icons/hevsuit.dmi rename to modular_ss220/reverts/return_prs/icons/hev_suit/hevsuit.dmi diff --git a/modular_ss220/modules/return_prs/black_mesa/hev_suit/icons/hevsuit_digi.dmi b/modular_ss220/reverts/return_prs/icons/hev_suit/hevsuit_digi.dmi similarity index 100% rename from modular_ss220/modules/return_prs/black_mesa/hev_suit/icons/hevsuit_digi.dmi rename to modular_ss220/reverts/return_prs/icons/hev_suit/hevsuit_digi.dmi diff --git a/modular_ss220/modules/return_prs/black_mesa/hev_suit/icons/hevsuiteq.dmi b/modular_ss220/reverts/return_prs/icons/hev_suit/hevsuiteq.dmi similarity index 100% rename from modular_ss220/modules/return_prs/black_mesa/hev_suit/icons/hevsuiteq.dmi rename to modular_ss220/reverts/return_prs/icons/hev_suit/hevsuiteq.dmi diff --git a/modular_ss220/modules/return_prs/black_mesa/hev_suit/icons/toggles.dmi b/modular_ss220/reverts/return_prs/icons/hev_suit/toggles.dmi similarity index 100% rename from modular_ss220/modules/return_prs/black_mesa/hev_suit/icons/toggles.dmi rename to modular_ss220/reverts/return_prs/icons/hev_suit/toggles.dmi diff --git a/modular_ss220/modules/return_prs/novaya_ert/icons/ammo_boxes.dmi b/modular_ss220/reverts/return_prs/icons/novaya_ert/ammo_boxes.dmi similarity index 100% rename from modular_ss220/modules/return_prs/novaya_ert/icons/ammo_boxes.dmi rename to modular_ss220/reverts/return_prs/icons/novaya_ert/ammo_boxes.dmi diff --git a/modular_ss220/modules/return_prs/novaya_ert/icons/armor.dmi b/modular_ss220/reverts/return_prs/icons/novaya_ert/armor.dmi similarity index 100% rename from modular_ss220/modules/return_prs/novaya_ert/icons/armor.dmi rename to modular_ss220/reverts/return_prs/icons/novaya_ert/armor.dmi diff --git a/modular_ss220/modules/return_prs/novaya_ert/icons/mask.dmi b/modular_ss220/reverts/return_prs/icons/novaya_ert/mask.dmi similarity index 100% rename from modular_ss220/modules/return_prs/novaya_ert/icons/mask.dmi rename to modular_ss220/reverts/return_prs/icons/novaya_ert/mask.dmi diff --git a/modular_ss220/modules/return_prs/novaya_ert/icons/mod.dmi b/modular_ss220/reverts/return_prs/icons/novaya_ert/mod.dmi similarity index 100% rename from modular_ss220/modules/return_prs/novaya_ert/icons/mod.dmi rename to modular_ss220/reverts/return_prs/icons/novaya_ert/mod.dmi diff --git a/modular_ss220/modules/return_prs/novaya_ert/icons/riot.dmi b/modular_ss220/reverts/return_prs/icons/novaya_ert/riot.dmi similarity index 100% rename from modular_ss220/modules/return_prs/novaya_ert/icons/riot.dmi rename to modular_ss220/reverts/return_prs/icons/novaya_ert/riot.dmi diff --git a/modular_ss220/modules/return_prs/novaya_ert/icons/riot_left.dmi b/modular_ss220/reverts/return_prs/icons/novaya_ert/riot_left.dmi similarity index 100% rename from modular_ss220/modules/return_prs/novaya_ert/icons/riot_left.dmi rename to modular_ss220/reverts/return_prs/icons/novaya_ert/riot_left.dmi diff --git a/modular_ss220/modules/return_prs/novaya_ert/icons/riot_right.dmi b/modular_ss220/reverts/return_prs/icons/novaya_ert/riot_right.dmi similarity index 100% rename from modular_ss220/modules/return_prs/novaya_ert/icons/riot_right.dmi rename to modular_ss220/reverts/return_prs/icons/novaya_ert/riot_right.dmi diff --git a/modular_ss220/modules/return_prs/novaya_ert/icons/surplus_armor/surplus_armor.dmi b/modular_ss220/reverts/return_prs/icons/novaya_ert/surplus_armor/surplus_armor.dmi similarity index 100% rename from modular_ss220/modules/return_prs/novaya_ert/icons/surplus_armor/surplus_armor.dmi rename to modular_ss220/reverts/return_prs/icons/novaya_ert/surplus_armor/surplus_armor.dmi diff --git a/modular_ss220/modules/return_prs/novaya_ert/icons/surplus_armor/surplus_armor_digi.dmi b/modular_ss220/reverts/return_prs/icons/novaya_ert/surplus_armor/surplus_armor_digi.dmi similarity index 100% rename from modular_ss220/modules/return_prs/novaya_ert/icons/surplus_armor/surplus_armor_digi.dmi rename to modular_ss220/reverts/return_prs/icons/novaya_ert/surplus_armor/surplus_armor_digi.dmi diff --git a/modular_ss220/modules/return_prs/novaya_ert/icons/surplus_armor/surplus_armor_object.dmi b/modular_ss220/reverts/return_prs/icons/novaya_ert/surplus_armor/surplus_armor_object.dmi similarity index 100% rename from modular_ss220/modules/return_prs/novaya_ert/icons/surplus_armor/surplus_armor_object.dmi rename to modular_ss220/reverts/return_prs/icons/novaya_ert/surplus_armor/surplus_armor_object.dmi diff --git a/modular_ss220/modules/return_prs/novaya_ert/icons/survival_pack.dmi b/modular_ss220/reverts/return_prs/icons/novaya_ert/survival_pack.dmi similarity index 100% rename from modular_ss220/modules/return_prs/novaya_ert/icons/survival_pack.dmi rename to modular_ss220/reverts/return_prs/icons/novaya_ert/survival_pack.dmi diff --git a/modular_ss220/modules/return_prs/novaya_ert/icons/toggles.dmi b/modular_ss220/reverts/return_prs/icons/novaya_ert/toggles.dmi similarity index 100% rename from modular_ss220/modules/return_prs/novaya_ert/icons/toggles.dmi rename to modular_ss220/reverts/return_prs/icons/novaya_ert/toggles.dmi diff --git a/modular_ss220/modules/return_prs/novaya_ert/icons/turret_deployable.dmi b/modular_ss220/reverts/return_prs/icons/novaya_ert/turret_deployable.dmi similarity index 100% rename from modular_ss220/modules/return_prs/novaya_ert/icons/turret_deployable.dmi rename to modular_ss220/reverts/return_prs/icons/novaya_ert/turret_deployable.dmi diff --git a/modular_ss220/modules/return_prs/novaya_ert/icons/wornarmor.dmi b/modular_ss220/reverts/return_prs/icons/novaya_ert/wornarmor.dmi similarity index 100% rename from modular_ss220/modules/return_prs/novaya_ert/icons/wornarmor.dmi rename to modular_ss220/reverts/return_prs/icons/novaya_ert/wornarmor.dmi diff --git a/modular_ss220/modules/return_prs/novaya_ert/icons/wornmask.dmi b/modular_ss220/reverts/return_prs/icons/novaya_ert/wornmask.dmi similarity index 100% rename from modular_ss220/modules/return_prs/novaya_ert/icons/wornmask.dmi rename to modular_ss220/reverts/return_prs/icons/novaya_ert/wornmask.dmi diff --git a/modular_ss220/modules/return_prs/novaya_ert/icons/wornmask_digi.dmi b/modular_ss220/reverts/return_prs/icons/novaya_ert/wornmask_digi.dmi similarity index 100% rename from modular_ss220/modules/return_prs/novaya_ert/icons/wornmask_digi.dmi rename to modular_ss220/reverts/return_prs/icons/novaya_ert/wornmask_digi.dmi diff --git a/modular_ss220/modules/return_prs/novaya_ert/icons/wornmod.dmi b/modular_ss220/reverts/return_prs/icons/novaya_ert/wornmod.dmi similarity index 100% rename from modular_ss220/modules/return_prs/novaya_ert/icons/wornmod.dmi rename to modular_ss220/reverts/return_prs/icons/novaya_ert/wornmod.dmi diff --git a/modular_ss220/reverts/return_prs/return.dm b/modular_ss220/reverts/return_prs/return.dm new file mode 100644 index 00000000000000..a3ac04583c1094 --- /dev/null +++ b/modular_ss220/reverts/return_prs/return.dm @@ -0,0 +1,6 @@ +/datum/modpack/return_prs + id = "return_prs" + name = "Возвращяет блэк мезу" + group = "Reverts" + desc = "Возвращяет блэк мезу на станцию." + author = "Arceniu" diff --git a/modular_ss220/reverts/return_prs/return.dme b/modular_ss220/reverts/return_prs/return.dme new file mode 100644 index 00000000000000..87c0caa2b19644 --- /dev/null +++ b/modular_ss220/reverts/return_prs/return.dme @@ -0,0 +1,73 @@ +#ifndef RETURN_PRS +#define RETURN_PRS + +#include "return.dm" + +#include "code\_vars\vars.dm" +#include "code\ammogun\ammo_boxes.dm" +#include "code\ammogun\modular_projectiles.dm" +#include "code\ammogun\shotgunbox.dm" +#include "code\ammogun\shotgunbullets.dm" +#include "code\black_mesa\armor.dm" +#include "code\black_mesa\bump_teleporter.dm" +#include "code\black_mesa\drops.dm" +#include "code\black_mesa\factions.dm" +#include "code\black_mesa\flag.dm" +#include "code\black_mesa\fluff.dm" +#include "code\black_mesa\follow_component.dm" +#include "code\black_mesa\gateway.dm" +#include "code\black_mesa\ghost_spawners.dm" +#include "code\black_mesa\guns.dm" +#include "code\black_mesa\healing_puddle.dm" +#include "code\black_mesa\lambda_teleporter.dm" +#include "code\black_mesa\m16_variations.dm" +#include "code\black_mesa\mapping_fluff.dm" +#include "code\black_mesa\miscguns.dm" +#include "code\black_mesa\objects.dm" +#include "code\black_mesa\projectiles.dm" +#include "code\black_mesa\rationpacks.dm" +#include "code\black_mesa\resonance_cascade.dm" +#include "code\black_mesa\shield_pylon.dm" +#include "code\black_mesa\shockplant.dm" +#include "code\black_mesa\spawners.dm" +#include "code\black_mesa\turfs.dm" +#include "code\black_mesa\turrets.dm" +#include "code\black_mesa\uber_teleporter.dm" +#include "code\black_mesa\weapons.dm" +#include "code\black_mesa\xen_crystal.dm" +#include "code\black_mesa\armaments\__armament_bodyarmor.dm" +#include "code\black_mesa\armaments\_armament_primary.dm" +#include "code\black_mesa\armaments\_armaments_secondary.dm" +#include "code\black_mesa\armaments\armament_explosives.dm" +#include "code\black_mesa\armaments\armament_medical.dm" +#include "code\black_mesa\armaments\armament_melee.dm" +#include "code\black_mesa\armaments\armament_miscellaneous.dm" +#include "code\black_mesa\armaments\armament_utility.dm" +#include "code\black_mesa\armaments\hecu_armament_station.dm" +#include "code\black_mesa\mobs\bullsquid.dm" +#include "code\black_mesa\mobs\gordon_freeman.dm" +#include "code\black_mesa\mobs\headcrab.dm" +#include "code\black_mesa\mobs\headcrab_zombie.dm" +#include "code\black_mesa\mobs\houndeye.dm" +#include "code\black_mesa\mobs\human_mobs.dm" +#include "code\black_mesa\mobs\mob_spawners.dm" +#include "code\black_mesa\mobs\nihilanth.dm" +#include "code\black_mesa\mobs\vortigaunt.dm" +#include "code\hev_suit\hev_suit.dm" +#include "code\gunsgalore\ammo\ammo.dm" +#include "code\gunsgalore\ammo\misc_items.dm" +#include "code\gunsgalore\guns\akm.dm" +#include "code\gunsgalore\guns\energy.dm" +#include "code\gunsgalore\guns\fg42.dm" +#include "code\gunsgalore\guns\guncrate.dm" +#include "code\gunsgalore\guns\luger.dm" +#include "code\gunsgalore\guns\m16.dm" +#include "code\gunsgalore\guns\mg34.dm" +#include "code\gunsgalore\guns\mp40.dm" +#include "code\gunsgalore\guns\p90.dm" +#include "code\gunsgalore\guns\pps.dm" +#include "code\gunsgalore\guns\ppsh.dm" +#include "code\gunsgalore\guns\scar.dm" +#include "code\gunsgalore\guns\stg.dm" + +#endif diff --git a/modular_ss220/modules/return_prs/black_mesa/sound/downtoBLUE.ogg b/modular_ss220/reverts/return_prs/sound/black_mesa/downtoBLUE.ogg similarity index 100% rename from modular_ss220/modules/return_prs/black_mesa/sound/downtoBLUE.ogg rename to modular_ss220/reverts/return_prs/sound/black_mesa/downtoBLUE.ogg diff --git a/modular_ss220/modules/return_prs/black_mesa/sound/explosions/explode1.ogg b/modular_ss220/reverts/return_prs/sound/black_mesa/explosions/explode1.ogg similarity index 100% rename from modular_ss220/modules/return_prs/black_mesa/sound/explosions/explode1.ogg rename to modular_ss220/reverts/return_prs/sound/black_mesa/explosions/explode1.ogg diff --git a/modular_ss220/modules/return_prs/black_mesa/sound/explosions/explode2.ogg b/modular_ss220/reverts/return_prs/sound/black_mesa/explosions/explode2.ogg similarity index 100% rename from modular_ss220/modules/return_prs/black_mesa/sound/explosions/explode2.ogg rename to modular_ss220/reverts/return_prs/sound/black_mesa/explosions/explode2.ogg diff --git a/modular_ss220/modules/return_prs/black_mesa/sound/explosions/explode3.ogg b/modular_ss220/reverts/return_prs/sound/black_mesa/explosions/explode3.ogg similarity index 100% rename from modular_ss220/modules/return_prs/black_mesa/sound/explosions/explode3.ogg rename to modular_ss220/reverts/return_prs/sound/black_mesa/explosions/explode3.ogg diff --git a/modular_ss220/modules/return_prs/black_mesa/sound/explosions/explode4.ogg b/modular_ss220/reverts/return_prs/sound/black_mesa/explosions/explode4.ogg similarity index 100% rename from modular_ss220/modules/return_prs/black_mesa/sound/explosions/explode4.ogg rename to modular_ss220/reverts/return_prs/sound/black_mesa/explosions/explode4.ogg diff --git a/modular_ss220/modules/return_prs/black_mesa/sound/explosions/explode5.ogg b/modular_ss220/reverts/return_prs/sound/black_mesa/explosions/explode5.ogg similarity index 100% rename from modular_ss220/modules/return_prs/black_mesa/sound/explosions/explode5.ogg rename to modular_ss220/reverts/return_prs/sound/black_mesa/explosions/explode5.ogg diff --git a/modular_ss220/modules/return_prs/black_mesa/sound/explosions/explode6.ogg b/modular_ss220/reverts/return_prs/sound/black_mesa/explosions/explode6.ogg similarity index 100% rename from modular_ss220/modules/return_prs/black_mesa/sound/explosions/explode6.ogg rename to modular_ss220/reverts/return_prs/sound/black_mesa/explosions/explode6.ogg diff --git a/modular_ss220/modules/return_prs/black_mesa/sound/explosions/explode7.ogg b/modular_ss220/reverts/return_prs/sound/black_mesa/explosions/explode7.ogg similarity index 100% rename from modular_ss220/modules/return_prs/black_mesa/sound/explosions/explode7.ogg rename to modular_ss220/reverts/return_prs/sound/black_mesa/explosions/explode7.ogg diff --git a/modular_ss220/modules/return_prs/black_mesa/sound/lc_mainbeam.ogg b/modular_ss220/reverts/return_prs/sound/black_mesa/lc_mainbeam.ogg similarity index 100% rename from modular_ss220/modules/return_prs/black_mesa/sound/lc_mainbeam.ogg rename to modular_ss220/reverts/return_prs/sound/black_mesa/lc_mainbeam.ogg diff --git a/modular_ss220/modules/return_prs/black_mesa/sound/lc_teleport.ogg b/modular_ss220/reverts/return_prs/sound/black_mesa/lc_teleport.ogg similarity index 100% rename from modular_ss220/modules/return_prs/black_mesa/sound/lc_teleport.ogg rename to modular_ss220/reverts/return_prs/sound/black_mesa/lc_teleport.ogg diff --git a/modular_ss220/modules/return_prs/black_mesa/sound/mobs/blackops/bo_alert01.ogg b/modular_ss220/reverts/return_prs/sound/black_mesa/mobs/blackops/bo_alert01.ogg similarity index 100% rename from modular_ss220/modules/return_prs/black_mesa/sound/mobs/blackops/bo_alert01.ogg rename to modular_ss220/reverts/return_prs/sound/black_mesa/mobs/blackops/bo_alert01.ogg diff --git a/modular_ss220/modules/return_prs/black_mesa/sound/mobs/blackops/bo_alert02.ogg b/modular_ss220/reverts/return_prs/sound/black_mesa/mobs/blackops/bo_alert02.ogg similarity index 100% rename from modular_ss220/modules/return_prs/black_mesa/sound/mobs/blackops/bo_alert02.ogg rename to modular_ss220/reverts/return_prs/sound/black_mesa/mobs/blackops/bo_alert02.ogg diff --git a/modular_ss220/modules/return_prs/black_mesa/sound/mobs/blackops/bo_alert03.ogg b/modular_ss220/reverts/return_prs/sound/black_mesa/mobs/blackops/bo_alert03.ogg similarity index 100% rename from modular_ss220/modules/return_prs/black_mesa/sound/mobs/blackops/bo_alert03.ogg rename to modular_ss220/reverts/return_prs/sound/black_mesa/mobs/blackops/bo_alert03.ogg diff --git a/modular_ss220/modules/return_prs/black_mesa/sound/mobs/blackops/bo_alert04.ogg b/modular_ss220/reverts/return_prs/sound/black_mesa/mobs/blackops/bo_alert04.ogg similarity index 100% rename from modular_ss220/modules/return_prs/black_mesa/sound/mobs/blackops/bo_alert04.ogg rename to modular_ss220/reverts/return_prs/sound/black_mesa/mobs/blackops/bo_alert04.ogg diff --git a/modular_ss220/modules/return_prs/black_mesa/sound/mobs/blackops/bo_alert05.ogg b/modular_ss220/reverts/return_prs/sound/black_mesa/mobs/blackops/bo_alert05.ogg similarity index 100% rename from modular_ss220/modules/return_prs/black_mesa/sound/mobs/blackops/bo_alert05.ogg rename to modular_ss220/reverts/return_prs/sound/black_mesa/mobs/blackops/bo_alert05.ogg diff --git a/modular_ss220/modules/return_prs/black_mesa/sound/mobs/blackops/bo_alert06.ogg b/modular_ss220/reverts/return_prs/sound/black_mesa/mobs/blackops/bo_alert06.ogg similarity index 100% rename from modular_ss220/modules/return_prs/black_mesa/sound/mobs/blackops/bo_alert06.ogg rename to modular_ss220/reverts/return_prs/sound/black_mesa/mobs/blackops/bo_alert06.ogg diff --git a/modular_ss220/modules/return_prs/black_mesa/sound/mobs/blackops/bo_alert07.ogg b/modular_ss220/reverts/return_prs/sound/black_mesa/mobs/blackops/bo_alert07.ogg similarity index 100% rename from modular_ss220/modules/return_prs/black_mesa/sound/mobs/blackops/bo_alert07.ogg rename to modular_ss220/reverts/return_prs/sound/black_mesa/mobs/blackops/bo_alert07.ogg diff --git a/modular_ss220/modules/return_prs/black_mesa/sound/mobs/blackops/bo_alert08.ogg b/modular_ss220/reverts/return_prs/sound/black_mesa/mobs/blackops/bo_alert08.ogg similarity index 100% rename from modular_ss220/modules/return_prs/black_mesa/sound/mobs/blackops/bo_alert08.ogg rename to modular_ss220/reverts/return_prs/sound/black_mesa/mobs/blackops/bo_alert08.ogg diff --git a/modular_ss220/modules/return_prs/black_mesa/sound/mobs/bullsquid/attack1.ogg b/modular_ss220/reverts/return_prs/sound/black_mesa/mobs/bullsquid/attack1.ogg similarity index 100% rename from modular_ss220/modules/return_prs/black_mesa/sound/mobs/bullsquid/attack1.ogg rename to modular_ss220/reverts/return_prs/sound/black_mesa/mobs/bullsquid/attack1.ogg diff --git a/modular_ss220/modules/return_prs/black_mesa/sound/mobs/bullsquid/detect1.ogg b/modular_ss220/reverts/return_prs/sound/black_mesa/mobs/bullsquid/detect1.ogg similarity index 100% rename from modular_ss220/modules/return_prs/black_mesa/sound/mobs/bullsquid/detect1.ogg rename to modular_ss220/reverts/return_prs/sound/black_mesa/mobs/bullsquid/detect1.ogg diff --git a/modular_ss220/modules/return_prs/black_mesa/sound/mobs/bullsquid/detect2.ogg b/modular_ss220/reverts/return_prs/sound/black_mesa/mobs/bullsquid/detect2.ogg similarity index 100% rename from modular_ss220/modules/return_prs/black_mesa/sound/mobs/bullsquid/detect2.ogg rename to modular_ss220/reverts/return_prs/sound/black_mesa/mobs/bullsquid/detect2.ogg diff --git a/modular_ss220/modules/return_prs/black_mesa/sound/mobs/bullsquid/detect3.ogg b/modular_ss220/reverts/return_prs/sound/black_mesa/mobs/bullsquid/detect3.ogg similarity index 100% rename from modular_ss220/modules/return_prs/black_mesa/sound/mobs/bullsquid/detect3.ogg rename to modular_ss220/reverts/return_prs/sound/black_mesa/mobs/bullsquid/detect3.ogg diff --git a/modular_ss220/modules/return_prs/black_mesa/sound/mobs/bullsquid/goo_attack3.ogg b/modular_ss220/reverts/return_prs/sound/black_mesa/mobs/bullsquid/goo_attack3.ogg similarity index 100% rename from modular_ss220/modules/return_prs/black_mesa/sound/mobs/bullsquid/goo_attack3.ogg rename to modular_ss220/reverts/return_prs/sound/black_mesa/mobs/bullsquid/goo_attack3.ogg diff --git a/modular_ss220/modules/return_prs/black_mesa/sound/mobs/bullsquid/splat1.ogg b/modular_ss220/reverts/return_prs/sound/black_mesa/mobs/bullsquid/splat1.ogg similarity index 100% rename from modular_ss220/modules/return_prs/black_mesa/sound/mobs/bullsquid/splat1.ogg rename to modular_ss220/reverts/return_prs/sound/black_mesa/mobs/bullsquid/splat1.ogg diff --git a/modular_ss220/modules/return_prs/black_mesa/sound/mobs/headcrab/alert1.ogg b/modular_ss220/reverts/return_prs/sound/black_mesa/mobs/headcrab/alert1.ogg similarity index 100% rename from modular_ss220/modules/return_prs/black_mesa/sound/mobs/headcrab/alert1.ogg rename to modular_ss220/reverts/return_prs/sound/black_mesa/mobs/headcrab/alert1.ogg diff --git a/modular_ss220/modules/return_prs/black_mesa/sound/mobs/headcrab/attack1.ogg b/modular_ss220/reverts/return_prs/sound/black_mesa/mobs/headcrab/attack1.ogg similarity index 100% rename from modular_ss220/modules/return_prs/black_mesa/sound/mobs/headcrab/attack1.ogg rename to modular_ss220/reverts/return_prs/sound/black_mesa/mobs/headcrab/attack1.ogg diff --git a/modular_ss220/modules/return_prs/black_mesa/sound/mobs/headcrab/attack2.ogg b/modular_ss220/reverts/return_prs/sound/black_mesa/mobs/headcrab/attack2.ogg similarity index 100% rename from modular_ss220/modules/return_prs/black_mesa/sound/mobs/headcrab/attack2.ogg rename to modular_ss220/reverts/return_prs/sound/black_mesa/mobs/headcrab/attack2.ogg diff --git a/modular_ss220/modules/return_prs/black_mesa/sound/mobs/headcrab/attack3.ogg b/modular_ss220/reverts/return_prs/sound/black_mesa/mobs/headcrab/attack3.ogg similarity index 100% rename from modular_ss220/modules/return_prs/black_mesa/sound/mobs/headcrab/attack3.ogg rename to modular_ss220/reverts/return_prs/sound/black_mesa/mobs/headcrab/attack3.ogg diff --git a/modular_ss220/modules/return_prs/black_mesa/sound/mobs/headcrab/die1.ogg b/modular_ss220/reverts/return_prs/sound/black_mesa/mobs/headcrab/die1.ogg similarity index 100% rename from modular_ss220/modules/return_prs/black_mesa/sound/mobs/headcrab/die1.ogg rename to modular_ss220/reverts/return_prs/sound/black_mesa/mobs/headcrab/die1.ogg diff --git a/modular_ss220/modules/return_prs/black_mesa/sound/mobs/headcrab/die2.ogg b/modular_ss220/reverts/return_prs/sound/black_mesa/mobs/headcrab/die2.ogg similarity index 100% rename from modular_ss220/modules/return_prs/black_mesa/sound/mobs/headcrab/die2.ogg rename to modular_ss220/reverts/return_prs/sound/black_mesa/mobs/headcrab/die2.ogg diff --git a/modular_ss220/modules/return_prs/black_mesa/sound/mobs/headcrab/headbite.ogg b/modular_ss220/reverts/return_prs/sound/black_mesa/mobs/headcrab/headbite.ogg similarity index 100% rename from modular_ss220/modules/return_prs/black_mesa/sound/mobs/headcrab/headbite.ogg rename to modular_ss220/reverts/return_prs/sound/black_mesa/mobs/headcrab/headbite.ogg diff --git a/modular_ss220/modules/return_prs/black_mesa/sound/mobs/hecu/hg_alert01.ogg b/modular_ss220/reverts/return_prs/sound/black_mesa/mobs/hecu/hg_alert01.ogg similarity index 100% rename from modular_ss220/modules/return_prs/black_mesa/sound/mobs/hecu/hg_alert01.ogg rename to modular_ss220/reverts/return_prs/sound/black_mesa/mobs/hecu/hg_alert01.ogg diff --git a/modular_ss220/modules/return_prs/black_mesa/sound/mobs/hecu/hg_alert03.ogg b/modular_ss220/reverts/return_prs/sound/black_mesa/mobs/hecu/hg_alert03.ogg similarity index 100% rename from modular_ss220/modules/return_prs/black_mesa/sound/mobs/hecu/hg_alert03.ogg rename to modular_ss220/reverts/return_prs/sound/black_mesa/mobs/hecu/hg_alert03.ogg diff --git a/modular_ss220/modules/return_prs/black_mesa/sound/mobs/hecu/hg_alert04.ogg b/modular_ss220/reverts/return_prs/sound/black_mesa/mobs/hecu/hg_alert04.ogg similarity index 100% rename from modular_ss220/modules/return_prs/black_mesa/sound/mobs/hecu/hg_alert04.ogg rename to modular_ss220/reverts/return_prs/sound/black_mesa/mobs/hecu/hg_alert04.ogg diff --git a/modular_ss220/modules/return_prs/black_mesa/sound/mobs/hecu/hg_alert05.ogg b/modular_ss220/reverts/return_prs/sound/black_mesa/mobs/hecu/hg_alert05.ogg similarity index 100% rename from modular_ss220/modules/return_prs/black_mesa/sound/mobs/hecu/hg_alert05.ogg rename to modular_ss220/reverts/return_prs/sound/black_mesa/mobs/hecu/hg_alert05.ogg diff --git a/modular_ss220/modules/return_prs/black_mesa/sound/mobs/hecu/hg_alert06.ogg b/modular_ss220/reverts/return_prs/sound/black_mesa/mobs/hecu/hg_alert06.ogg similarity index 100% rename from modular_ss220/modules/return_prs/black_mesa/sound/mobs/hecu/hg_alert06.ogg rename to modular_ss220/reverts/return_prs/sound/black_mesa/mobs/hecu/hg_alert06.ogg diff --git a/modular_ss220/modules/return_prs/black_mesa/sound/mobs/hecu/hg_alert07.ogg b/modular_ss220/reverts/return_prs/sound/black_mesa/mobs/hecu/hg_alert07.ogg similarity index 100% rename from modular_ss220/modules/return_prs/black_mesa/sound/mobs/hecu/hg_alert07.ogg rename to modular_ss220/reverts/return_prs/sound/black_mesa/mobs/hecu/hg_alert07.ogg diff --git a/modular_ss220/modules/return_prs/black_mesa/sound/mobs/hecu/hg_alert08.ogg b/modular_ss220/reverts/return_prs/sound/black_mesa/mobs/hecu/hg_alert08.ogg similarity index 100% rename from modular_ss220/modules/return_prs/black_mesa/sound/mobs/hecu/hg_alert08.ogg rename to modular_ss220/reverts/return_prs/sound/black_mesa/mobs/hecu/hg_alert08.ogg diff --git a/modular_ss220/modules/return_prs/black_mesa/sound/mobs/hecu/hg_alert10.ogg b/modular_ss220/reverts/return_prs/sound/black_mesa/mobs/hecu/hg_alert10.ogg similarity index 100% rename from modular_ss220/modules/return_prs/black_mesa/sound/mobs/hecu/hg_alert10.ogg rename to modular_ss220/reverts/return_prs/sound/black_mesa/mobs/hecu/hg_alert10.ogg diff --git a/modular_ss220/modules/return_prs/black_mesa/sound/mobs/houndeye/charge1.ogg b/modular_ss220/reverts/return_prs/sound/black_mesa/mobs/houndeye/charge1.ogg similarity index 100% rename from modular_ss220/modules/return_prs/black_mesa/sound/mobs/houndeye/charge1.ogg rename to modular_ss220/reverts/return_prs/sound/black_mesa/mobs/houndeye/charge1.ogg diff --git a/modular_ss220/modules/return_prs/black_mesa/sound/mobs/houndeye/charge2.ogg b/modular_ss220/reverts/return_prs/sound/black_mesa/mobs/houndeye/charge2.ogg similarity index 100% rename from modular_ss220/modules/return_prs/black_mesa/sound/mobs/houndeye/charge2.ogg rename to modular_ss220/reverts/return_prs/sound/black_mesa/mobs/houndeye/charge2.ogg diff --git a/modular_ss220/modules/return_prs/black_mesa/sound/mobs/houndeye/charge3.ogg b/modular_ss220/reverts/return_prs/sound/black_mesa/mobs/houndeye/charge3.ogg similarity index 100% rename from modular_ss220/modules/return_prs/black_mesa/sound/mobs/houndeye/charge3.ogg rename to modular_ss220/reverts/return_prs/sound/black_mesa/mobs/houndeye/charge3.ogg diff --git a/modular_ss220/modules/return_prs/black_mesa/sound/mobs/houndeye/he_alert1.ogg b/modular_ss220/reverts/return_prs/sound/black_mesa/mobs/houndeye/he_alert1.ogg similarity index 100% rename from modular_ss220/modules/return_prs/black_mesa/sound/mobs/houndeye/he_alert1.ogg rename to modular_ss220/reverts/return_prs/sound/black_mesa/mobs/houndeye/he_alert1.ogg diff --git a/modular_ss220/modules/return_prs/black_mesa/sound/mobs/houndeye/he_alert2.ogg b/modular_ss220/reverts/return_prs/sound/black_mesa/mobs/houndeye/he_alert2.ogg similarity index 100% rename from modular_ss220/modules/return_prs/black_mesa/sound/mobs/houndeye/he_alert2.ogg rename to modular_ss220/reverts/return_prs/sound/black_mesa/mobs/houndeye/he_alert2.ogg diff --git a/modular_ss220/modules/return_prs/black_mesa/sound/mobs/houndeye/he_alert3.ogg b/modular_ss220/reverts/return_prs/sound/black_mesa/mobs/houndeye/he_alert3.ogg similarity index 100% rename from modular_ss220/modules/return_prs/black_mesa/sound/mobs/houndeye/he_alert3.ogg rename to modular_ss220/reverts/return_prs/sound/black_mesa/mobs/houndeye/he_alert3.ogg diff --git a/modular_ss220/modules/return_prs/black_mesa/sound/mobs/houndeye/he_alert4.ogg b/modular_ss220/reverts/return_prs/sound/black_mesa/mobs/houndeye/he_alert4.ogg similarity index 100% rename from modular_ss220/modules/return_prs/black_mesa/sound/mobs/houndeye/he_alert4.ogg rename to modular_ss220/reverts/return_prs/sound/black_mesa/mobs/houndeye/he_alert4.ogg diff --git a/modular_ss220/modules/return_prs/black_mesa/sound/mobs/houndeye/he_alert5.ogg b/modular_ss220/reverts/return_prs/sound/black_mesa/mobs/houndeye/he_alert5.ogg similarity index 100% rename from modular_ss220/modules/return_prs/black_mesa/sound/mobs/houndeye/he_alert5.ogg rename to modular_ss220/reverts/return_prs/sound/black_mesa/mobs/houndeye/he_alert5.ogg diff --git a/modular_ss220/modules/return_prs/black_mesa/sound/mobs/nihilanth/nihilanth_death01.ogg b/modular_ss220/reverts/return_prs/sound/black_mesa/mobs/nihilanth/nihilanth_death01.ogg similarity index 100% rename from modular_ss220/modules/return_prs/black_mesa/sound/mobs/nihilanth/nihilanth_death01.ogg rename to modular_ss220/reverts/return_prs/sound/black_mesa/mobs/nihilanth/nihilanth_death01.ogg diff --git a/modular_ss220/modules/return_prs/black_mesa/sound/mobs/nihilanth/nihilanth_deceiveyou01.ogg b/modular_ss220/reverts/return_prs/sound/black_mesa/mobs/nihilanth/nihilanth_deceiveyou01.ogg similarity index 100% rename from modular_ss220/modules/return_prs/black_mesa/sound/mobs/nihilanth/nihilanth_deceiveyou01.ogg rename to modular_ss220/reverts/return_prs/sound/black_mesa/mobs/nihilanth/nihilanth_deceiveyou01.ogg diff --git a/modular_ss220/modules/return_prs/black_mesa/sound/mobs/nihilanth/nihilanth_foryouhewaits01.ogg b/modular_ss220/reverts/return_prs/sound/black_mesa/mobs/nihilanth/nihilanth_foryouhewaits01.ogg similarity index 100% rename from modular_ss220/modules/return_prs/black_mesa/sound/mobs/nihilanth/nihilanth_foryouhewaits01.ogg rename to modular_ss220/reverts/return_prs/sound/black_mesa/mobs/nihilanth/nihilanth_foryouhewaits01.ogg diff --git a/modular_ss220/modules/return_prs/black_mesa/sound/mobs/nihilanth/nihilanth_freeeemmaan01.ogg b/modular_ss220/reverts/return_prs/sound/black_mesa/mobs/nihilanth/nihilanth_freeeemmaan01.ogg similarity index 100% rename from modular_ss220/modules/return_prs/black_mesa/sound/mobs/nihilanth/nihilanth_freeeemmaan01.ogg rename to modular_ss220/reverts/return_prs/sound/black_mesa/mobs/nihilanth/nihilanth_freeeemmaan01.ogg diff --git a/modular_ss220/modules/return_prs/black_mesa/sound/mobs/nihilanth/nihilanth_iamthelast01.ogg b/modular_ss220/reverts/return_prs/sound/black_mesa/mobs/nihilanth/nihilanth_iamthelast01.ogg similarity index 100% rename from modular_ss220/modules/return_prs/black_mesa/sound/mobs/nihilanth/nihilanth_iamthelast01.ogg rename to modular_ss220/reverts/return_prs/sound/black_mesa/mobs/nihilanth/nihilanth_iamthelast01.ogg diff --git a/modular_ss220/modules/return_prs/black_mesa/sound/mobs/nihilanth/nihilanth_pain01.ogg b/modular_ss220/reverts/return_prs/sound/black_mesa/mobs/nihilanth/nihilanth_pain01.ogg similarity index 100% rename from modular_ss220/modules/return_prs/black_mesa/sound/mobs/nihilanth/nihilanth_pain01.ogg rename to modular_ss220/reverts/return_prs/sound/black_mesa/mobs/nihilanth/nihilanth_pain01.ogg diff --git a/modular_ss220/modules/return_prs/black_mesa/sound/mobs/nihilanth/nihilanth_thetruth01.ogg b/modular_ss220/reverts/return_prs/sound/black_mesa/mobs/nihilanth/nihilanth_thetruth01.ogg similarity index 100% rename from modular_ss220/modules/return_prs/black_mesa/sound/mobs/nihilanth/nihilanth_thetruth01.ogg rename to modular_ss220/reverts/return_prs/sound/black_mesa/mobs/nihilanth/nihilanth_thetruth01.ogg diff --git a/modular_ss220/modules/return_prs/black_mesa/sound/mobs/nihilanth/nihilanth_whathavedone01.ogg b/modular_ss220/reverts/return_prs/sound/black_mesa/mobs/nihilanth/nihilanth_whathavedone01.ogg similarity index 100% rename from modular_ss220/modules/return_prs/black_mesa/sound/mobs/nihilanth/nihilanth_whathavedone01.ogg rename to modular_ss220/reverts/return_prs/sound/black_mesa/mobs/nihilanth/nihilanth_whathavedone01.ogg diff --git a/modular_ss220/modules/return_prs/black_mesa/sound/mobs/nihilanth/nihilanth_youalldie01.ogg b/modular_ss220/reverts/return_prs/sound/black_mesa/mobs/nihilanth/nihilanth_youalldie01.ogg similarity index 100% rename from modular_ss220/modules/return_prs/black_mesa/sound/mobs/nihilanth/nihilanth_youalldie01.ogg rename to modular_ss220/reverts/return_prs/sound/black_mesa/mobs/nihilanth/nihilanth_youalldie01.ogg diff --git a/modular_ss220/modules/return_prs/black_mesa/sound/mobs/security_guard/annoyance01.ogg b/modular_ss220/reverts/return_prs/sound/black_mesa/mobs/security_guard/annoyance01.ogg similarity index 100% rename from modular_ss220/modules/return_prs/black_mesa/sound/mobs/security_guard/annoyance01.ogg rename to modular_ss220/reverts/return_prs/sound/black_mesa/mobs/security_guard/annoyance01.ogg diff --git a/modular_ss220/modules/return_prs/black_mesa/sound/mobs/security_guard/annoyance02.ogg b/modular_ss220/reverts/return_prs/sound/black_mesa/mobs/security_guard/annoyance02.ogg similarity index 100% rename from modular_ss220/modules/return_prs/black_mesa/sound/mobs/security_guard/annoyance02.ogg rename to modular_ss220/reverts/return_prs/sound/black_mesa/mobs/security_guard/annoyance02.ogg diff --git a/modular_ss220/modules/return_prs/black_mesa/sound/mobs/security_guard/annoyance03.ogg b/modular_ss220/reverts/return_prs/sound/black_mesa/mobs/security_guard/annoyance03.ogg similarity index 100% rename from modular_ss220/modules/return_prs/black_mesa/sound/mobs/security_guard/annoyance03.ogg rename to modular_ss220/reverts/return_prs/sound/black_mesa/mobs/security_guard/annoyance03.ogg diff --git a/modular_ss220/modules/return_prs/black_mesa/sound/mobs/security_guard/annoyance04.ogg b/modular_ss220/reverts/return_prs/sound/black_mesa/mobs/security_guard/annoyance04.ogg similarity index 100% rename from modular_ss220/modules/return_prs/black_mesa/sound/mobs/security_guard/annoyance04.ogg rename to modular_ss220/reverts/return_prs/sound/black_mesa/mobs/security_guard/annoyance04.ogg diff --git a/modular_ss220/modules/return_prs/black_mesa/sound/mobs/security_guard/annoyance05.ogg b/modular_ss220/reverts/return_prs/sound/black_mesa/mobs/security_guard/annoyance05.ogg similarity index 100% rename from modular_ss220/modules/return_prs/black_mesa/sound/mobs/security_guard/annoyance05.ogg rename to modular_ss220/reverts/return_prs/sound/black_mesa/mobs/security_guard/annoyance05.ogg diff --git a/modular_ss220/modules/return_prs/black_mesa/sound/mobs/security_guard/annoyance06.ogg b/modular_ss220/reverts/return_prs/sound/black_mesa/mobs/security_guard/annoyance06.ogg similarity index 100% rename from modular_ss220/modules/return_prs/black_mesa/sound/mobs/security_guard/annoyance06.ogg rename to modular_ss220/reverts/return_prs/sound/black_mesa/mobs/security_guard/annoyance06.ogg diff --git a/modular_ss220/modules/return_prs/black_mesa/sound/mobs/security_guard/annoyance07.ogg b/modular_ss220/reverts/return_prs/sound/black_mesa/mobs/security_guard/annoyance07.ogg similarity index 100% rename from modular_ss220/modules/return_prs/black_mesa/sound/mobs/security_guard/annoyance07.ogg rename to modular_ss220/reverts/return_prs/sound/black_mesa/mobs/security_guard/annoyance07.ogg diff --git a/modular_ss220/modules/return_prs/black_mesa/sound/mobs/security_guard/annoyance08.ogg b/modular_ss220/reverts/return_prs/sound/black_mesa/mobs/security_guard/annoyance08.ogg similarity index 100% rename from modular_ss220/modules/return_prs/black_mesa/sound/mobs/security_guard/annoyance08.ogg rename to modular_ss220/reverts/return_prs/sound/black_mesa/mobs/security_guard/annoyance08.ogg diff --git a/modular_ss220/modules/return_prs/black_mesa/sound/mobs/security_guard/annoyance09.ogg b/modular_ss220/reverts/return_prs/sound/black_mesa/mobs/security_guard/annoyance09.ogg similarity index 100% rename from modular_ss220/modules/return_prs/black_mesa/sound/mobs/security_guard/annoyance09.ogg rename to modular_ss220/reverts/return_prs/sound/black_mesa/mobs/security_guard/annoyance09.ogg diff --git a/modular_ss220/modules/return_prs/black_mesa/sound/mobs/security_guard/annoyance10.ogg b/modular_ss220/reverts/return_prs/sound/black_mesa/mobs/security_guard/annoyance10.ogg similarity index 100% rename from modular_ss220/modules/return_prs/black_mesa/sound/mobs/security_guard/annoyance10.ogg rename to modular_ss220/reverts/return_prs/sound/black_mesa/mobs/security_guard/annoyance10.ogg diff --git a/modular_ss220/modules/return_prs/black_mesa/sound/mobs/security_guard/holddownspot01.ogg b/modular_ss220/reverts/return_prs/sound/black_mesa/mobs/security_guard/holddownspot01.ogg similarity index 100% rename from modular_ss220/modules/return_prs/black_mesa/sound/mobs/security_guard/holddownspot01.ogg rename to modular_ss220/reverts/return_prs/sound/black_mesa/mobs/security_guard/holddownspot01.ogg diff --git a/modular_ss220/modules/return_prs/black_mesa/sound/mobs/security_guard/holddownspot02.ogg b/modular_ss220/reverts/return_prs/sound/black_mesa/mobs/security_guard/holddownspot02.ogg similarity index 100% rename from modular_ss220/modules/return_prs/black_mesa/sound/mobs/security_guard/holddownspot02.ogg rename to modular_ss220/reverts/return_prs/sound/black_mesa/mobs/security_guard/holddownspot02.ogg diff --git a/modular_ss220/modules/return_prs/black_mesa/sound/mobs/security_guard/holddownspot03.ogg b/modular_ss220/reverts/return_prs/sound/black_mesa/mobs/security_guard/holddownspot03.ogg similarity index 100% rename from modular_ss220/modules/return_prs/black_mesa/sound/mobs/security_guard/holddownspot03.ogg rename to modular_ss220/reverts/return_prs/sound/black_mesa/mobs/security_guard/holddownspot03.ogg diff --git a/modular_ss220/modules/return_prs/black_mesa/sound/mobs/security_guard/holddownspot04.ogg b/modular_ss220/reverts/return_prs/sound/black_mesa/mobs/security_guard/holddownspot04.ogg similarity index 100% rename from modular_ss220/modules/return_prs/black_mesa/sound/mobs/security_guard/holddownspot04.ogg rename to modular_ss220/reverts/return_prs/sound/black_mesa/mobs/security_guard/holddownspot04.ogg diff --git a/modular_ss220/modules/return_prs/black_mesa/sound/mobs/security_guard/holddownspot05.ogg b/modular_ss220/reverts/return_prs/sound/black_mesa/mobs/security_guard/holddownspot05.ogg similarity index 100% rename from modular_ss220/modules/return_prs/black_mesa/sound/mobs/security_guard/holddownspot05.ogg rename to modular_ss220/reverts/return_prs/sound/black_mesa/mobs/security_guard/holddownspot05.ogg diff --git a/modular_ss220/modules/return_prs/black_mesa/sound/mobs/security_guard/illstayhere01.ogg b/modular_ss220/reverts/return_prs/sound/black_mesa/mobs/security_guard/illstayhere01.ogg similarity index 100% rename from modular_ss220/modules/return_prs/black_mesa/sound/mobs/security_guard/illstayhere01.ogg rename to modular_ss220/reverts/return_prs/sound/black_mesa/mobs/security_guard/illstayhere01.ogg diff --git a/modular_ss220/modules/return_prs/black_mesa/sound/mobs/security_guard/illstayhere02.ogg b/modular_ss220/reverts/return_prs/sound/black_mesa/mobs/security_guard/illstayhere02.ogg similarity index 100% rename from modular_ss220/modules/return_prs/black_mesa/sound/mobs/security_guard/illstayhere02.ogg rename to modular_ss220/reverts/return_prs/sound/black_mesa/mobs/security_guard/illstayhere02.ogg diff --git a/modular_ss220/modules/return_prs/black_mesa/sound/mobs/security_guard/illstayhere03.ogg b/modular_ss220/reverts/return_prs/sound/black_mesa/mobs/security_guard/illstayhere03.ogg similarity index 100% rename from modular_ss220/modules/return_prs/black_mesa/sound/mobs/security_guard/illstayhere03.ogg rename to modular_ss220/reverts/return_prs/sound/black_mesa/mobs/security_guard/illstayhere03.ogg diff --git a/modular_ss220/modules/return_prs/black_mesa/sound/mobs/security_guard/imstickinghere01.ogg b/modular_ss220/reverts/return_prs/sound/black_mesa/mobs/security_guard/imstickinghere01.ogg similarity index 100% rename from modular_ss220/modules/return_prs/black_mesa/sound/mobs/security_guard/imstickinghere01.ogg rename to modular_ss220/reverts/return_prs/sound/black_mesa/mobs/security_guard/imstickinghere01.ogg diff --git a/modular_ss220/modules/return_prs/black_mesa/sound/mobs/security_guard/imstickinghere02.ogg b/modular_ss220/reverts/return_prs/sound/black_mesa/mobs/security_guard/imstickinghere02.ogg similarity index 100% rename from modular_ss220/modules/return_prs/black_mesa/sound/mobs/security_guard/imstickinghere02.ogg rename to modular_ss220/reverts/return_prs/sound/black_mesa/mobs/security_guard/imstickinghere02.ogg diff --git a/modular_ss220/modules/return_prs/black_mesa/sound/mobs/security_guard/imstickinghere03.ogg b/modular_ss220/reverts/return_prs/sound/black_mesa/mobs/security_guard/imstickinghere03.ogg similarity index 100% rename from modular_ss220/modules/return_prs/black_mesa/sound/mobs/security_guard/imstickinghere03.ogg rename to modular_ss220/reverts/return_prs/sound/black_mesa/mobs/security_guard/imstickinghere03.ogg diff --git a/modular_ss220/modules/return_prs/black_mesa/sound/mobs/security_guard/imstickinghere04.ogg b/modular_ss220/reverts/return_prs/sound/black_mesa/mobs/security_guard/imstickinghere04.ogg similarity index 100% rename from modular_ss220/modules/return_prs/black_mesa/sound/mobs/security_guard/imstickinghere04.ogg rename to modular_ss220/reverts/return_prs/sound/black_mesa/mobs/security_guard/imstickinghere04.ogg diff --git a/modular_ss220/modules/return_prs/black_mesa/sound/mobs/security_guard/imstickinghere05.ogg b/modular_ss220/reverts/return_prs/sound/black_mesa/mobs/security_guard/imstickinghere05.ogg similarity index 100% rename from modular_ss220/modules/return_prs/black_mesa/sound/mobs/security_guard/imstickinghere05.ogg rename to modular_ss220/reverts/return_prs/sound/black_mesa/mobs/security_guard/imstickinghere05.ogg diff --git a/modular_ss220/modules/return_prs/black_mesa/sound/mobs/security_guard/leadon01.ogg b/modular_ss220/reverts/return_prs/sound/black_mesa/mobs/security_guard/leadon01.ogg similarity index 100% rename from modular_ss220/modules/return_prs/black_mesa/sound/mobs/security_guard/leadon01.ogg rename to modular_ss220/reverts/return_prs/sound/black_mesa/mobs/security_guard/leadon01.ogg diff --git a/modular_ss220/modules/return_prs/black_mesa/sound/mobs/security_guard/leadon02.ogg b/modular_ss220/reverts/return_prs/sound/black_mesa/mobs/security_guard/leadon02.ogg similarity index 100% rename from modular_ss220/modules/return_prs/black_mesa/sound/mobs/security_guard/leadon02.ogg rename to modular_ss220/reverts/return_prs/sound/black_mesa/mobs/security_guard/leadon02.ogg diff --git a/modular_ss220/modules/return_prs/black_mesa/sound/mobs/security_guard/leadon03.ogg b/modular_ss220/reverts/return_prs/sound/black_mesa/mobs/security_guard/leadon03.ogg similarity index 100% rename from modular_ss220/modules/return_prs/black_mesa/sound/mobs/security_guard/leadon03.ogg rename to modular_ss220/reverts/return_prs/sound/black_mesa/mobs/security_guard/leadon03.ogg diff --git a/modular_ss220/modules/return_prs/black_mesa/sound/mobs/security_guard/leadtheway01.ogg b/modular_ss220/reverts/return_prs/sound/black_mesa/mobs/security_guard/leadtheway01.ogg similarity index 100% rename from modular_ss220/modules/return_prs/black_mesa/sound/mobs/security_guard/leadtheway01.ogg rename to modular_ss220/reverts/return_prs/sound/black_mesa/mobs/security_guard/leadtheway01.ogg diff --git a/modular_ss220/modules/return_prs/black_mesa/sound/mobs/security_guard/leadtheway02.ogg b/modular_ss220/reverts/return_prs/sound/black_mesa/mobs/security_guard/leadtheway02.ogg similarity index 100% rename from modular_ss220/modules/return_prs/black_mesa/sound/mobs/security_guard/leadtheway02.ogg rename to modular_ss220/reverts/return_prs/sound/black_mesa/mobs/security_guard/leadtheway02.ogg diff --git a/modular_ss220/modules/return_prs/black_mesa/sound/mobs/security_guard/leadtheway03.ogg b/modular_ss220/reverts/return_prs/sound/black_mesa/mobs/security_guard/leadtheway03.ogg similarity index 100% rename from modular_ss220/modules/return_prs/black_mesa/sound/mobs/security_guard/leadtheway03.ogg rename to modular_ss220/reverts/return_prs/sound/black_mesa/mobs/security_guard/leadtheway03.ogg diff --git a/modular_ss220/modules/return_prs/black_mesa/sound/mobs/security_guard/leadtheway04.ogg b/modular_ss220/reverts/return_prs/sound/black_mesa/mobs/security_guard/leadtheway04.ogg similarity index 100% rename from modular_ss220/modules/return_prs/black_mesa/sound/mobs/security_guard/leadtheway04.ogg rename to modular_ss220/reverts/return_prs/sound/black_mesa/mobs/security_guard/leadtheway04.ogg diff --git a/modular_ss220/modules/return_prs/black_mesa/sound/mobs/security_guard/leadtheway05.ogg b/modular_ss220/reverts/return_prs/sound/black_mesa/mobs/security_guard/leadtheway05.ogg similarity index 100% rename from modular_ss220/modules/return_prs/black_mesa/sound/mobs/security_guard/leadtheway05.ogg rename to modular_ss220/reverts/return_prs/sound/black_mesa/mobs/security_guard/leadtheway05.ogg diff --git a/modular_ss220/modules/return_prs/black_mesa/sound/mobs/security_guard/leadtheway06.ogg b/modular_ss220/reverts/return_prs/sound/black_mesa/mobs/security_guard/leadtheway06.ogg similarity index 100% rename from modular_ss220/modules/return_prs/black_mesa/sound/mobs/security_guard/leadtheway06.ogg rename to modular_ss220/reverts/return_prs/sound/black_mesa/mobs/security_guard/leadtheway06.ogg diff --git a/modular_ss220/modules/return_prs/black_mesa/sound/mobs/security_guard/leadtheway07.ogg b/modular_ss220/reverts/return_prs/sound/black_mesa/mobs/security_guard/leadtheway07.ogg similarity index 100% rename from modular_ss220/modules/return_prs/black_mesa/sound/mobs/security_guard/leadtheway07.ogg rename to modular_ss220/reverts/return_prs/sound/black_mesa/mobs/security_guard/leadtheway07.ogg diff --git a/modular_ss220/modules/return_prs/black_mesa/sound/mobs/security_guard/leadtheway08.ogg b/modular_ss220/reverts/return_prs/sound/black_mesa/mobs/security_guard/leadtheway08.ogg similarity index 100% rename from modular_ss220/modules/return_prs/black_mesa/sound/mobs/security_guard/leadtheway08.ogg rename to modular_ss220/reverts/return_prs/sound/black_mesa/mobs/security_guard/leadtheway08.ogg diff --git a/modular_ss220/modules/return_prs/black_mesa/sound/mobs/security_guard/letsgo01.ogg b/modular_ss220/reverts/return_prs/sound/black_mesa/mobs/security_guard/letsgo01.ogg similarity index 100% rename from modular_ss220/modules/return_prs/black_mesa/sound/mobs/security_guard/letsgo01.ogg rename to modular_ss220/reverts/return_prs/sound/black_mesa/mobs/security_guard/letsgo01.ogg diff --git a/modular_ss220/modules/return_prs/black_mesa/sound/mobs/security_guard/letsgo02.ogg b/modular_ss220/reverts/return_prs/sound/black_mesa/mobs/security_guard/letsgo02.ogg similarity index 100% rename from modular_ss220/modules/return_prs/black_mesa/sound/mobs/security_guard/letsgo02.ogg rename to modular_ss220/reverts/return_prs/sound/black_mesa/mobs/security_guard/letsgo02.ogg diff --git a/modular_ss220/modules/return_prs/black_mesa/sound/mobs/security_guard/letsgo03.ogg b/modular_ss220/reverts/return_prs/sound/black_mesa/mobs/security_guard/letsgo03.ogg similarity index 100% rename from modular_ss220/modules/return_prs/black_mesa/sound/mobs/security_guard/letsgo03.ogg rename to modular_ss220/reverts/return_prs/sound/black_mesa/mobs/security_guard/letsgo03.ogg diff --git a/modular_ss220/modules/return_prs/black_mesa/sound/mobs/vortigaunt/alert01.ogg b/modular_ss220/reverts/return_prs/sound/black_mesa/mobs/vortigaunt/alert01.ogg similarity index 100% rename from modular_ss220/modules/return_prs/black_mesa/sound/mobs/vortigaunt/alert01.ogg rename to modular_ss220/reverts/return_prs/sound/black_mesa/mobs/vortigaunt/alert01.ogg diff --git a/modular_ss220/modules/return_prs/black_mesa/sound/mobs/vortigaunt/alert01b.ogg b/modular_ss220/reverts/return_prs/sound/black_mesa/mobs/vortigaunt/alert01b.ogg similarity index 100% rename from modular_ss220/modules/return_prs/black_mesa/sound/mobs/vortigaunt/alert01b.ogg rename to modular_ss220/reverts/return_prs/sound/black_mesa/mobs/vortigaunt/alert01b.ogg diff --git a/modular_ss220/modules/return_prs/black_mesa/sound/mobs/vortigaunt/alert02.ogg b/modular_ss220/reverts/return_prs/sound/black_mesa/mobs/vortigaunt/alert02.ogg similarity index 100% rename from modular_ss220/modules/return_prs/black_mesa/sound/mobs/vortigaunt/alert02.ogg rename to modular_ss220/reverts/return_prs/sound/black_mesa/mobs/vortigaunt/alert02.ogg diff --git a/modular_ss220/modules/return_prs/black_mesa/sound/mobs/vortigaunt/alert03.ogg b/modular_ss220/reverts/return_prs/sound/black_mesa/mobs/vortigaunt/alert03.ogg similarity index 100% rename from modular_ss220/modules/return_prs/black_mesa/sound/mobs/vortigaunt/alert03.ogg rename to modular_ss220/reverts/return_prs/sound/black_mesa/mobs/vortigaunt/alert03.ogg diff --git a/modular_ss220/modules/return_prs/black_mesa/sound/mobs/vortigaunt/alert04.ogg b/modular_ss220/reverts/return_prs/sound/black_mesa/mobs/vortigaunt/alert04.ogg similarity index 100% rename from modular_ss220/modules/return_prs/black_mesa/sound/mobs/vortigaunt/alert04.ogg rename to modular_ss220/reverts/return_prs/sound/black_mesa/mobs/vortigaunt/alert04.ogg diff --git a/modular_ss220/modules/return_prs/black_mesa/sound/mobs/vortigaunt/alert05.ogg b/modular_ss220/reverts/return_prs/sound/black_mesa/mobs/vortigaunt/alert05.ogg similarity index 100% rename from modular_ss220/modules/return_prs/black_mesa/sound/mobs/vortigaunt/alert05.ogg rename to modular_ss220/reverts/return_prs/sound/black_mesa/mobs/vortigaunt/alert05.ogg diff --git a/modular_ss220/modules/return_prs/black_mesa/sound/mobs/vortigaunt/alert06.ogg b/modular_ss220/reverts/return_prs/sound/black_mesa/mobs/vortigaunt/alert06.ogg similarity index 100% rename from modular_ss220/modules/return_prs/black_mesa/sound/mobs/vortigaunt/alert06.ogg rename to modular_ss220/reverts/return_prs/sound/black_mesa/mobs/vortigaunt/alert06.ogg diff --git a/modular_ss220/modules/return_prs/black_mesa/sound/mobs/vortigaunt/attack_shoot1.ogg b/modular_ss220/reverts/return_prs/sound/black_mesa/mobs/vortigaunt/attack_shoot1.ogg similarity index 100% rename from modular_ss220/modules/return_prs/black_mesa/sound/mobs/vortigaunt/attack_shoot1.ogg rename to modular_ss220/reverts/return_prs/sound/black_mesa/mobs/vortigaunt/attack_shoot1.ogg diff --git a/modular_ss220/modules/return_prs/black_mesa/sound/mobs/vortigaunt/attack_shoot2.ogg b/modular_ss220/reverts/return_prs/sound/black_mesa/mobs/vortigaunt/attack_shoot2.ogg similarity index 100% rename from modular_ss220/modules/return_prs/black_mesa/sound/mobs/vortigaunt/attack_shoot2.ogg rename to modular_ss220/reverts/return_prs/sound/black_mesa/mobs/vortigaunt/attack_shoot2.ogg diff --git a/modular_ss220/modules/return_prs/black_mesa/sound/mobs/vortigaunt/attack_shoot3.ogg b/modular_ss220/reverts/return_prs/sound/black_mesa/mobs/vortigaunt/attack_shoot3.ogg similarity index 100% rename from modular_ss220/modules/return_prs/black_mesa/sound/mobs/vortigaunt/attack_shoot3.ogg rename to modular_ss220/reverts/return_prs/sound/black_mesa/mobs/vortigaunt/attack_shoot3.ogg diff --git a/modular_ss220/modules/return_prs/black_mesa/sound/mobs/vortigaunt/attack_shoot4.ogg b/modular_ss220/reverts/return_prs/sound/black_mesa/mobs/vortigaunt/attack_shoot4.ogg similarity index 100% rename from modular_ss220/modules/return_prs/black_mesa/sound/mobs/vortigaunt/attack_shoot4.ogg rename to modular_ss220/reverts/return_prs/sound/black_mesa/mobs/vortigaunt/attack_shoot4.ogg diff --git a/modular_ss220/modules/return_prs/black_mesa/sound/mobs/vortigaunt/attack_shoot5.ogg b/modular_ss220/reverts/return_prs/sound/black_mesa/mobs/vortigaunt/attack_shoot5.ogg similarity index 100% rename from modular_ss220/modules/return_prs/black_mesa/sound/mobs/vortigaunt/attack_shoot5.ogg rename to modular_ss220/reverts/return_prs/sound/black_mesa/mobs/vortigaunt/attack_shoot5.ogg diff --git a/modular_ss220/modules/return_prs/black_mesa/sound/mobs/vortigaunt/death01.ogg b/modular_ss220/reverts/return_prs/sound/black_mesa/mobs/vortigaunt/death01.ogg similarity index 100% rename from modular_ss220/modules/return_prs/black_mesa/sound/mobs/vortigaunt/death01.ogg rename to modular_ss220/reverts/return_prs/sound/black_mesa/mobs/vortigaunt/death01.ogg diff --git a/modular_ss220/modules/return_prs/black_mesa/sound/mobs/vortigaunt/death02.ogg b/modular_ss220/reverts/return_prs/sound/black_mesa/mobs/vortigaunt/death02.ogg similarity index 100% rename from modular_ss220/modules/return_prs/black_mesa/sound/mobs/vortigaunt/death02.ogg rename to modular_ss220/reverts/return_prs/sound/black_mesa/mobs/vortigaunt/death02.ogg diff --git a/modular_ss220/modules/return_prs/black_mesa/sound/mobs/vortigaunt/death03.ogg b/modular_ss220/reverts/return_prs/sound/black_mesa/mobs/vortigaunt/death03.ogg similarity index 100% rename from modular_ss220/modules/return_prs/black_mesa/sound/mobs/vortigaunt/death03.ogg rename to modular_ss220/reverts/return_prs/sound/black_mesa/mobs/vortigaunt/death03.ogg diff --git a/modular_ss220/modules/return_prs/black_mesa/sound/mobs/vortigaunt/death04.ogg b/modular_ss220/reverts/return_prs/sound/black_mesa/mobs/vortigaunt/death04.ogg similarity index 100% rename from modular_ss220/modules/return_prs/black_mesa/sound/mobs/vortigaunt/death04.ogg rename to modular_ss220/reverts/return_prs/sound/black_mesa/mobs/vortigaunt/death04.ogg diff --git a/modular_ss220/modules/return_prs/black_mesa/sound/mobs/vortigaunt/death05.ogg b/modular_ss220/reverts/return_prs/sound/black_mesa/mobs/vortigaunt/death05.ogg similarity index 100% rename from modular_ss220/modules/return_prs/black_mesa/sound/mobs/vortigaunt/death05.ogg rename to modular_ss220/reverts/return_prs/sound/black_mesa/mobs/vortigaunt/death05.ogg diff --git a/modular_ss220/modules/return_prs/black_mesa/sound/mobs/vortigaunt/dispell.ogg b/modular_ss220/reverts/return_prs/sound/black_mesa/mobs/vortigaunt/dispell.ogg similarity index 100% rename from modular_ss220/modules/return_prs/black_mesa/sound/mobs/vortigaunt/dispell.ogg rename to modular_ss220/reverts/return_prs/sound/black_mesa/mobs/vortigaunt/dispell.ogg diff --git a/modular_ss220/modules/return_prs/black_mesa/sound/mobs/vortigaunt/explode1.ogg b/modular_ss220/reverts/return_prs/sound/black_mesa/mobs/vortigaunt/explode1.ogg similarity index 100% rename from modular_ss220/modules/return_prs/black_mesa/sound/mobs/vortigaunt/explode1.ogg rename to modular_ss220/reverts/return_prs/sound/black_mesa/mobs/vortigaunt/explode1.ogg diff --git a/modular_ss220/modules/return_prs/black_mesa/sound/mobs/vortigaunt/explode2.ogg b/modular_ss220/reverts/return_prs/sound/black_mesa/mobs/vortigaunt/explode2.ogg similarity index 100% rename from modular_ss220/modules/return_prs/black_mesa/sound/mobs/vortigaunt/explode2.ogg rename to modular_ss220/reverts/return_prs/sound/black_mesa/mobs/vortigaunt/explode2.ogg diff --git a/modular_ss220/modules/return_prs/black_mesa/sound/mobs/vortigaunt/foot1.ogg b/modular_ss220/reverts/return_prs/sound/black_mesa/mobs/vortigaunt/foot1.ogg similarity index 100% rename from modular_ss220/modules/return_prs/black_mesa/sound/mobs/vortigaunt/foot1.ogg rename to modular_ss220/reverts/return_prs/sound/black_mesa/mobs/vortigaunt/foot1.ogg diff --git a/modular_ss220/modules/return_prs/black_mesa/sound/mobs/vortigaunt/foot2.ogg b/modular_ss220/reverts/return_prs/sound/black_mesa/mobs/vortigaunt/foot2.ogg similarity index 100% rename from modular_ss220/modules/return_prs/black_mesa/sound/mobs/vortigaunt/foot2.ogg rename to modular_ss220/reverts/return_prs/sound/black_mesa/mobs/vortigaunt/foot2.ogg diff --git a/modular_ss220/modules/return_prs/black_mesa/sound/mobs/vortigaunt/foot3.ogg b/modular_ss220/reverts/return_prs/sound/black_mesa/mobs/vortigaunt/foot3.ogg similarity index 100% rename from modular_ss220/modules/return_prs/black_mesa/sound/mobs/vortigaunt/foot3.ogg rename to modular_ss220/reverts/return_prs/sound/black_mesa/mobs/vortigaunt/foot3.ogg diff --git a/modular_ss220/modules/return_prs/black_mesa/sound/mobs/vortigaunt/foot4.ogg b/modular_ss220/reverts/return_prs/sound/black_mesa/mobs/vortigaunt/foot4.ogg similarity index 100% rename from modular_ss220/modules/return_prs/black_mesa/sound/mobs/vortigaunt/foot4.ogg rename to modular_ss220/reverts/return_prs/sound/black_mesa/mobs/vortigaunt/foot4.ogg diff --git a/modular_ss220/modules/return_prs/black_mesa/sound/mobs/vortigaunt/idle01.ogg b/modular_ss220/reverts/return_prs/sound/black_mesa/mobs/vortigaunt/idle01.ogg similarity index 100% rename from modular_ss220/modules/return_prs/black_mesa/sound/mobs/vortigaunt/idle01.ogg rename to modular_ss220/reverts/return_prs/sound/black_mesa/mobs/vortigaunt/idle01.ogg diff --git a/modular_ss220/modules/return_prs/black_mesa/sound/mobs/vortigaunt/idle02.ogg b/modular_ss220/reverts/return_prs/sound/black_mesa/mobs/vortigaunt/idle02.ogg similarity index 100% rename from modular_ss220/modules/return_prs/black_mesa/sound/mobs/vortigaunt/idle02.ogg rename to modular_ss220/reverts/return_prs/sound/black_mesa/mobs/vortigaunt/idle02.ogg diff --git a/modular_ss220/modules/return_prs/black_mesa/sound/mobs/vortigaunt/idle03.ogg b/modular_ss220/reverts/return_prs/sound/black_mesa/mobs/vortigaunt/idle03.ogg similarity index 100% rename from modular_ss220/modules/return_prs/black_mesa/sound/mobs/vortigaunt/idle03.ogg rename to modular_ss220/reverts/return_prs/sound/black_mesa/mobs/vortigaunt/idle03.ogg diff --git a/modular_ss220/modules/return_prs/black_mesa/sound/mobs/vortigaunt/idle04.ogg b/modular_ss220/reverts/return_prs/sound/black_mesa/mobs/vortigaunt/idle04.ogg similarity index 100% rename from modular_ss220/modules/return_prs/black_mesa/sound/mobs/vortigaunt/idle04.ogg rename to modular_ss220/reverts/return_prs/sound/black_mesa/mobs/vortigaunt/idle04.ogg diff --git a/modular_ss220/modules/return_prs/black_mesa/sound/mobs/vortigaunt/idle05.ogg b/modular_ss220/reverts/return_prs/sound/black_mesa/mobs/vortigaunt/idle05.ogg similarity index 100% rename from modular_ss220/modules/return_prs/black_mesa/sound/mobs/vortigaunt/idle05.ogg rename to modular_ss220/reverts/return_prs/sound/black_mesa/mobs/vortigaunt/idle05.ogg diff --git a/modular_ss220/modules/return_prs/black_mesa/sound/mobs/vortigaunt/idle06.ogg b/modular_ss220/reverts/return_prs/sound/black_mesa/mobs/vortigaunt/idle06.ogg similarity index 100% rename from modular_ss220/modules/return_prs/black_mesa/sound/mobs/vortigaunt/idle06.ogg rename to modular_ss220/reverts/return_prs/sound/black_mesa/mobs/vortigaunt/idle06.ogg diff --git a/modular_ss220/modules/return_prs/black_mesa/sound/mobs/vortigaunt/idle07.ogg b/modular_ss220/reverts/return_prs/sound/black_mesa/mobs/vortigaunt/idle07.ogg similarity index 100% rename from modular_ss220/modules/return_prs/black_mesa/sound/mobs/vortigaunt/idle07.ogg rename to modular_ss220/reverts/return_prs/sound/black_mesa/mobs/vortigaunt/idle07.ogg diff --git a/modular_ss220/modules/return_prs/black_mesa/sound/mobs/vortigaunt/idle08.ogg b/modular_ss220/reverts/return_prs/sound/black_mesa/mobs/vortigaunt/idle08.ogg similarity index 100% rename from modular_ss220/modules/return_prs/black_mesa/sound/mobs/vortigaunt/idle08.ogg rename to modular_ss220/reverts/return_prs/sound/black_mesa/mobs/vortigaunt/idle08.ogg diff --git a/modular_ss220/modules/return_prs/black_mesa/sound/mobs/vortigaunt/idle09.ogg b/modular_ss220/reverts/return_prs/sound/black_mesa/mobs/vortigaunt/idle09.ogg similarity index 100% rename from modular_ss220/modules/return_prs/black_mesa/sound/mobs/vortigaunt/idle09.ogg rename to modular_ss220/reverts/return_prs/sound/black_mesa/mobs/vortigaunt/idle09.ogg diff --git a/modular_ss220/modules/return_prs/black_mesa/sound/mobs/vortigaunt/laboured_cough01.ogg b/modular_ss220/reverts/return_prs/sound/black_mesa/mobs/vortigaunt/laboured_cough01.ogg similarity index 100% rename from modular_ss220/modules/return_prs/black_mesa/sound/mobs/vortigaunt/laboured_cough01.ogg rename to modular_ss220/reverts/return_prs/sound/black_mesa/mobs/vortigaunt/laboured_cough01.ogg diff --git a/modular_ss220/modules/return_prs/black_mesa/sound/mobs/vortigaunt/laboured_cough02.ogg b/modular_ss220/reverts/return_prs/sound/black_mesa/mobs/vortigaunt/laboured_cough02.ogg similarity index 100% rename from modular_ss220/modules/return_prs/black_mesa/sound/mobs/vortigaunt/laboured_cough02.ogg rename to modular_ss220/reverts/return_prs/sound/black_mesa/mobs/vortigaunt/laboured_cough02.ogg diff --git a/modular_ss220/modules/return_prs/black_mesa/sound/mobs/vortigaunt/laboured_cough03.ogg b/modular_ss220/reverts/return_prs/sound/black_mesa/mobs/vortigaunt/laboured_cough03.ogg similarity index 100% rename from modular_ss220/modules/return_prs/black_mesa/sound/mobs/vortigaunt/laboured_cough03.ogg rename to modular_ss220/reverts/return_prs/sound/black_mesa/mobs/vortigaunt/laboured_cough03.ogg diff --git a/modular_ss220/modules/return_prs/black_mesa/sound/mobs/vortigaunt/laboured_cough04.ogg b/modular_ss220/reverts/return_prs/sound/black_mesa/mobs/vortigaunt/laboured_cough04.ogg similarity index 100% rename from modular_ss220/modules/return_prs/black_mesa/sound/mobs/vortigaunt/laboured_cough04.ogg rename to modular_ss220/reverts/return_prs/sound/black_mesa/mobs/vortigaunt/laboured_cough04.ogg diff --git a/modular_ss220/modules/return_prs/black_mesa/sound/mobs/vortigaunt/laboured_cough05.ogg b/modular_ss220/reverts/return_prs/sound/black_mesa/mobs/vortigaunt/laboured_cough05.ogg similarity index 100% rename from modular_ss220/modules/return_prs/black_mesa/sound/mobs/vortigaunt/laboured_cough05.ogg rename to modular_ss220/reverts/return_prs/sound/black_mesa/mobs/vortigaunt/laboured_cough05.ogg diff --git a/modular_ss220/modules/return_prs/black_mesa/sound/mobs/vortigaunt/laboured_coughidle01.ogg b/modular_ss220/reverts/return_prs/sound/black_mesa/mobs/vortigaunt/laboured_coughidle01.ogg similarity index 100% rename from modular_ss220/modules/return_prs/black_mesa/sound/mobs/vortigaunt/laboured_coughidle01.ogg rename to modular_ss220/reverts/return_prs/sound/black_mesa/mobs/vortigaunt/laboured_coughidle01.ogg diff --git a/modular_ss220/modules/return_prs/black_mesa/sound/mobs/vortigaunt/laboured_coughidle02.ogg b/modular_ss220/reverts/return_prs/sound/black_mesa/mobs/vortigaunt/laboured_coughidle02.ogg similarity index 100% rename from modular_ss220/modules/return_prs/black_mesa/sound/mobs/vortigaunt/laboured_coughidle02.ogg rename to modular_ss220/reverts/return_prs/sound/black_mesa/mobs/vortigaunt/laboured_coughidle02.ogg diff --git a/modular_ss220/modules/return_prs/black_mesa/sound/mobs/vortigaunt/laboured_coughidle03.ogg b/modular_ss220/reverts/return_prs/sound/black_mesa/mobs/vortigaunt/laboured_coughidle03.ogg similarity index 100% rename from modular_ss220/modules/return_prs/black_mesa/sound/mobs/vortigaunt/laboured_coughidle03.ogg rename to modular_ss220/reverts/return_prs/sound/black_mesa/mobs/vortigaunt/laboured_coughidle03.ogg diff --git a/modular_ss220/modules/return_prs/black_mesa/sound/mobs/vortigaunt/laboured_coughidle04.ogg b/modular_ss220/reverts/return_prs/sound/black_mesa/mobs/vortigaunt/laboured_coughidle04.ogg similarity index 100% rename from modular_ss220/modules/return_prs/black_mesa/sound/mobs/vortigaunt/laboured_coughidle04.ogg rename to modular_ss220/reverts/return_prs/sound/black_mesa/mobs/vortigaunt/laboured_coughidle04.ogg diff --git a/modular_ss220/modules/return_prs/black_mesa/sound/mobs/vortigaunt/laboured_coughidle05.ogg b/modular_ss220/reverts/return_prs/sound/black_mesa/mobs/vortigaunt/laboured_coughidle05.ogg similarity index 100% rename from modular_ss220/modules/return_prs/black_mesa/sound/mobs/vortigaunt/laboured_coughidle05.ogg rename to modular_ss220/reverts/return_prs/sound/black_mesa/mobs/vortigaunt/laboured_coughidle05.ogg diff --git a/modular_ss220/modules/return_prs/black_mesa/sound/mobs/vortigaunt/laboured_idle01.ogg b/modular_ss220/reverts/return_prs/sound/black_mesa/mobs/vortigaunt/laboured_idle01.ogg similarity index 100% rename from modular_ss220/modules/return_prs/black_mesa/sound/mobs/vortigaunt/laboured_idle01.ogg rename to modular_ss220/reverts/return_prs/sound/black_mesa/mobs/vortigaunt/laboured_idle01.ogg diff --git a/modular_ss220/modules/return_prs/black_mesa/sound/mobs/vortigaunt/laboured_idle02.ogg b/modular_ss220/reverts/return_prs/sound/black_mesa/mobs/vortigaunt/laboured_idle02.ogg similarity index 100% rename from modular_ss220/modules/return_prs/black_mesa/sound/mobs/vortigaunt/laboured_idle02.ogg rename to modular_ss220/reverts/return_prs/sound/black_mesa/mobs/vortigaunt/laboured_idle02.ogg diff --git a/modular_ss220/modules/return_prs/black_mesa/sound/mobs/vortigaunt/laboured_idle03.ogg b/modular_ss220/reverts/return_prs/sound/black_mesa/mobs/vortigaunt/laboured_idle03.ogg similarity index 100% rename from modular_ss220/modules/return_prs/black_mesa/sound/mobs/vortigaunt/laboured_idle03.ogg rename to modular_ss220/reverts/return_prs/sound/black_mesa/mobs/vortigaunt/laboured_idle03.ogg diff --git a/modular_ss220/modules/return_prs/black_mesa/sound/mobs/vortigaunt/laboured_idle04.ogg b/modular_ss220/reverts/return_prs/sound/black_mesa/mobs/vortigaunt/laboured_idle04.ogg similarity index 100% rename from modular_ss220/modules/return_prs/black_mesa/sound/mobs/vortigaunt/laboured_idle04.ogg rename to modular_ss220/reverts/return_prs/sound/black_mesa/mobs/vortigaunt/laboured_idle04.ogg diff --git a/modular_ss220/modules/return_prs/black_mesa/sound/mobs/vortigaunt/laboured_idle05.ogg b/modular_ss220/reverts/return_prs/sound/black_mesa/mobs/vortigaunt/laboured_idle05.ogg similarity index 100% rename from modular_ss220/modules/return_prs/black_mesa/sound/mobs/vortigaunt/laboured_idle05.ogg rename to modular_ss220/reverts/return_prs/sound/black_mesa/mobs/vortigaunt/laboured_idle05.ogg diff --git a/modular_ss220/modules/return_prs/black_mesa/sound/mobs/vortigaunt/mindcontrol_end1.ogg b/modular_ss220/reverts/return_prs/sound/black_mesa/mobs/vortigaunt/mindcontrol_end1.ogg similarity index 100% rename from modular_ss220/modules/return_prs/black_mesa/sound/mobs/vortigaunt/mindcontrol_end1.ogg rename to modular_ss220/reverts/return_prs/sound/black_mesa/mobs/vortigaunt/mindcontrol_end1.ogg diff --git a/modular_ss220/modules/return_prs/black_mesa/sound/mobs/vortigaunt/mindcontrol_end2.ogg b/modular_ss220/reverts/return_prs/sound/black_mesa/mobs/vortigaunt/mindcontrol_end2.ogg similarity index 100% rename from modular_ss220/modules/return_prs/black_mesa/sound/mobs/vortigaunt/mindcontrol_end2.ogg rename to modular_ss220/reverts/return_prs/sound/black_mesa/mobs/vortigaunt/mindcontrol_end2.ogg diff --git a/modular_ss220/modules/return_prs/black_mesa/sound/mobs/vortigaunt/mindcontrol_end3.ogg b/modular_ss220/reverts/return_prs/sound/black_mesa/mobs/vortigaunt/mindcontrol_end3.ogg similarity index 100% rename from modular_ss220/modules/return_prs/black_mesa/sound/mobs/vortigaunt/mindcontrol_end3.ogg rename to modular_ss220/reverts/return_prs/sound/black_mesa/mobs/vortigaunt/mindcontrol_end3.ogg diff --git a/modular_ss220/modules/return_prs/black_mesa/sound/mobs/vortigaunt/mindcontrol_end4.ogg b/modular_ss220/reverts/return_prs/sound/black_mesa/mobs/vortigaunt/mindcontrol_end4.ogg similarity index 100% rename from modular_ss220/modules/return_prs/black_mesa/sound/mobs/vortigaunt/mindcontrol_end4.ogg rename to modular_ss220/reverts/return_prs/sound/black_mesa/mobs/vortigaunt/mindcontrol_end4.ogg diff --git a/modular_ss220/modules/return_prs/black_mesa/sound/mobs/vortigaunt/mindcontrol_end5.ogg b/modular_ss220/reverts/return_prs/sound/black_mesa/mobs/vortigaunt/mindcontrol_end5.ogg similarity index 100% rename from modular_ss220/modules/return_prs/black_mesa/sound/mobs/vortigaunt/mindcontrol_end5.ogg rename to modular_ss220/reverts/return_prs/sound/black_mesa/mobs/vortigaunt/mindcontrol_end5.ogg diff --git a/modular_ss220/modules/return_prs/black_mesa/sound/mobs/vortigaunt/mindcontrol_end6.ogg b/modular_ss220/reverts/return_prs/sound/black_mesa/mobs/vortigaunt/mindcontrol_end6.ogg similarity index 100% rename from modular_ss220/modules/return_prs/black_mesa/sound/mobs/vortigaunt/mindcontrol_end6.ogg rename to modular_ss220/reverts/return_prs/sound/black_mesa/mobs/vortigaunt/mindcontrol_end6.ogg diff --git a/modular_ss220/modules/return_prs/black_mesa/sound/mobs/vortigaunt/mindcontrol_start1.ogg b/modular_ss220/reverts/return_prs/sound/black_mesa/mobs/vortigaunt/mindcontrol_start1.ogg similarity index 100% rename from modular_ss220/modules/return_prs/black_mesa/sound/mobs/vortigaunt/mindcontrol_start1.ogg rename to modular_ss220/reverts/return_prs/sound/black_mesa/mobs/vortigaunt/mindcontrol_start1.ogg diff --git a/modular_ss220/modules/return_prs/black_mesa/sound/mobs/vortigaunt/mindcontrol_start2.ogg b/modular_ss220/reverts/return_prs/sound/black_mesa/mobs/vortigaunt/mindcontrol_start2.ogg similarity index 100% rename from modular_ss220/modules/return_prs/black_mesa/sound/mobs/vortigaunt/mindcontrol_start2.ogg rename to modular_ss220/reverts/return_prs/sound/black_mesa/mobs/vortigaunt/mindcontrol_start2.ogg diff --git a/modular_ss220/modules/return_prs/black_mesa/sound/mobs/vortigaunt/mindcontrol_start3.ogg b/modular_ss220/reverts/return_prs/sound/black_mesa/mobs/vortigaunt/mindcontrol_start3.ogg similarity index 100% rename from modular_ss220/modules/return_prs/black_mesa/sound/mobs/vortigaunt/mindcontrol_start3.ogg rename to modular_ss220/reverts/return_prs/sound/black_mesa/mobs/vortigaunt/mindcontrol_start3.ogg diff --git a/modular_ss220/modules/return_prs/black_mesa/sound/mobs/vortigaunt/mindcontrol_start4.ogg b/modular_ss220/reverts/return_prs/sound/black_mesa/mobs/vortigaunt/mindcontrol_start4.ogg similarity index 100% rename from modular_ss220/modules/return_prs/black_mesa/sound/mobs/vortigaunt/mindcontrol_start4.ogg rename to modular_ss220/reverts/return_prs/sound/black_mesa/mobs/vortigaunt/mindcontrol_start4.ogg diff --git a/modular_ss220/modules/return_prs/black_mesa/sound/mobs/vortigaunt/mindcontrol_start5.ogg b/modular_ss220/reverts/return_prs/sound/black_mesa/mobs/vortigaunt/mindcontrol_start5.ogg similarity index 100% rename from modular_ss220/modules/return_prs/black_mesa/sound/mobs/vortigaunt/mindcontrol_start5.ogg rename to modular_ss220/reverts/return_prs/sound/black_mesa/mobs/vortigaunt/mindcontrol_start5.ogg diff --git a/modular_ss220/modules/return_prs/black_mesa/sound/mobs/vortigaunt/mourn01.ogg b/modular_ss220/reverts/return_prs/sound/black_mesa/mobs/vortigaunt/mourn01.ogg similarity index 100% rename from modular_ss220/modules/return_prs/black_mesa/sound/mobs/vortigaunt/mourn01.ogg rename to modular_ss220/reverts/return_prs/sound/black_mesa/mobs/vortigaunt/mourn01.ogg diff --git a/modular_ss220/modules/return_prs/black_mesa/sound/mobs/vortigaunt/mourn02.ogg b/modular_ss220/reverts/return_prs/sound/black_mesa/mobs/vortigaunt/mourn02.ogg similarity index 100% rename from modular_ss220/modules/return_prs/black_mesa/sound/mobs/vortigaunt/mourn02.ogg rename to modular_ss220/reverts/return_prs/sound/black_mesa/mobs/vortigaunt/mourn02.ogg diff --git a/modular_ss220/modules/return_prs/black_mesa/sound/mobs/vortigaunt/mourn03.ogg b/modular_ss220/reverts/return_prs/sound/black_mesa/mobs/vortigaunt/mourn03.ogg similarity index 100% rename from modular_ss220/modules/return_prs/black_mesa/sound/mobs/vortigaunt/mourn03.ogg rename to modular_ss220/reverts/return_prs/sound/black_mesa/mobs/vortigaunt/mourn03.ogg diff --git a/modular_ss220/modules/return_prs/black_mesa/sound/mobs/vortigaunt/mourn04.ogg b/modular_ss220/reverts/return_prs/sound/black_mesa/mobs/vortigaunt/mourn04.ogg similarity index 100% rename from modular_ss220/modules/return_prs/black_mesa/sound/mobs/vortigaunt/mourn04.ogg rename to modular_ss220/reverts/return_prs/sound/black_mesa/mobs/vortigaunt/mourn04.ogg diff --git a/modular_ss220/modules/return_prs/black_mesa/sound/mobs/vortigaunt/mourn05.ogg b/modular_ss220/reverts/return_prs/sound/black_mesa/mobs/vortigaunt/mourn05.ogg similarity index 100% rename from modular_ss220/modules/return_prs/black_mesa/sound/mobs/vortigaunt/mourn05.ogg rename to modular_ss220/reverts/return_prs/sound/black_mesa/mobs/vortigaunt/mourn05.ogg diff --git a/modular_ss220/modules/return_prs/black_mesa/sound/mobs/vortigaunt/pain01.ogg b/modular_ss220/reverts/return_prs/sound/black_mesa/mobs/vortigaunt/pain01.ogg similarity index 100% rename from modular_ss220/modules/return_prs/black_mesa/sound/mobs/vortigaunt/pain01.ogg rename to modular_ss220/reverts/return_prs/sound/black_mesa/mobs/vortigaunt/pain01.ogg diff --git a/modular_ss220/modules/return_prs/black_mesa/sound/mobs/vortigaunt/pain02.ogg b/modular_ss220/reverts/return_prs/sound/black_mesa/mobs/vortigaunt/pain02.ogg similarity index 100% rename from modular_ss220/modules/return_prs/black_mesa/sound/mobs/vortigaunt/pain02.ogg rename to modular_ss220/reverts/return_prs/sound/black_mesa/mobs/vortigaunt/pain02.ogg diff --git a/modular_ss220/modules/return_prs/black_mesa/sound/mobs/vortigaunt/pain03.ogg b/modular_ss220/reverts/return_prs/sound/black_mesa/mobs/vortigaunt/pain03.ogg similarity index 100% rename from modular_ss220/modules/return_prs/black_mesa/sound/mobs/vortigaunt/pain03.ogg rename to modular_ss220/reverts/return_prs/sound/black_mesa/mobs/vortigaunt/pain03.ogg diff --git a/modular_ss220/modules/return_prs/black_mesa/sound/mobs/vortigaunt/pain04.ogg b/modular_ss220/reverts/return_prs/sound/black_mesa/mobs/vortigaunt/pain04.ogg similarity index 100% rename from modular_ss220/modules/return_prs/black_mesa/sound/mobs/vortigaunt/pain04.ogg rename to modular_ss220/reverts/return_prs/sound/black_mesa/mobs/vortigaunt/pain04.ogg diff --git a/modular_ss220/modules/return_prs/black_mesa/sound/mobs/vortigaunt/painedprotest01.ogg b/modular_ss220/reverts/return_prs/sound/black_mesa/mobs/vortigaunt/painedprotest01.ogg similarity index 100% rename from modular_ss220/modules/return_prs/black_mesa/sound/mobs/vortigaunt/painedprotest01.ogg rename to modular_ss220/reverts/return_prs/sound/black_mesa/mobs/vortigaunt/painedprotest01.ogg diff --git a/modular_ss220/modules/return_prs/black_mesa/sound/mobs/vortigaunt/protest02.ogg b/modular_ss220/reverts/return_prs/sound/black_mesa/mobs/vortigaunt/protest02.ogg similarity index 100% rename from modular_ss220/modules/return_prs/black_mesa/sound/mobs/vortigaunt/protest02.ogg rename to modular_ss220/reverts/return_prs/sound/black_mesa/mobs/vortigaunt/protest02.ogg diff --git a/modular_ss220/modules/return_prs/black_mesa/sound/mobs/vortigaunt/protest03.ogg b/modular_ss220/reverts/return_prs/sound/black_mesa/mobs/vortigaunt/protest03.ogg similarity index 100% rename from modular_ss220/modules/return_prs/black_mesa/sound/mobs/vortigaunt/protest03.ogg rename to modular_ss220/reverts/return_prs/sound/black_mesa/mobs/vortigaunt/protest03.ogg diff --git a/modular_ss220/modules/return_prs/black_mesa/sound/mobs/vortigaunt/scared_cower_plead01.ogg b/modular_ss220/reverts/return_prs/sound/black_mesa/mobs/vortigaunt/scared_cower_plead01.ogg similarity index 100% rename from modular_ss220/modules/return_prs/black_mesa/sound/mobs/vortigaunt/scared_cower_plead01.ogg rename to modular_ss220/reverts/return_prs/sound/black_mesa/mobs/vortigaunt/scared_cower_plead01.ogg diff --git a/modular_ss220/modules/return_prs/black_mesa/sound/mobs/vortigaunt/scared_cower_plead02.ogg b/modular_ss220/reverts/return_prs/sound/black_mesa/mobs/vortigaunt/scared_cower_plead02.ogg similarity index 100% rename from modular_ss220/modules/return_prs/black_mesa/sound/mobs/vortigaunt/scared_cower_plead02.ogg rename to modular_ss220/reverts/return_prs/sound/black_mesa/mobs/vortigaunt/scared_cower_plead02.ogg diff --git a/modular_ss220/modules/return_prs/black_mesa/sound/mobs/vortigaunt/scared_cower_plead03.ogg b/modular_ss220/reverts/return_prs/sound/black_mesa/mobs/vortigaunt/scared_cower_plead03.ogg similarity index 100% rename from modular_ss220/modules/return_prs/black_mesa/sound/mobs/vortigaunt/scared_cower_plead03.ogg rename to modular_ss220/reverts/return_prs/sound/black_mesa/mobs/vortigaunt/scared_cower_plead03.ogg diff --git a/modular_ss220/modules/return_prs/black_mesa/sound/mobs/vortigaunt/scared_cower_plead2.ogg b/modular_ss220/reverts/return_prs/sound/black_mesa/mobs/vortigaunt/scared_cower_plead2.ogg similarity index 100% rename from modular_ss220/modules/return_prs/black_mesa/sound/mobs/vortigaunt/scared_cower_plead2.ogg rename to modular_ss220/reverts/return_prs/sound/black_mesa/mobs/vortigaunt/scared_cower_plead2.ogg diff --git a/modular_ss220/modules/return_prs/black_mesa/sound/mobs/vortigaunt/scared_cowering01.ogg b/modular_ss220/reverts/return_prs/sound/black_mesa/mobs/vortigaunt/scared_cowering01.ogg similarity index 100% rename from modular_ss220/modules/return_prs/black_mesa/sound/mobs/vortigaunt/scared_cowering01.ogg rename to modular_ss220/reverts/return_prs/sound/black_mesa/mobs/vortigaunt/scared_cowering01.ogg diff --git a/modular_ss220/modules/return_prs/black_mesa/sound/mobs/vortigaunt/scared_cowering02.ogg b/modular_ss220/reverts/return_prs/sound/black_mesa/mobs/vortigaunt/scared_cowering02.ogg similarity index 100% rename from modular_ss220/modules/return_prs/black_mesa/sound/mobs/vortigaunt/scared_cowering02.ogg rename to modular_ss220/reverts/return_prs/sound/black_mesa/mobs/vortigaunt/scared_cowering02.ogg diff --git a/modular_ss220/modules/return_prs/black_mesa/sound/mobs/vortigaunt/scared_cowering03.ogg b/modular_ss220/reverts/return_prs/sound/black_mesa/mobs/vortigaunt/scared_cowering03.ogg similarity index 100% rename from modular_ss220/modules/return_prs/black_mesa/sound/mobs/vortigaunt/scared_cowering03.ogg rename to modular_ss220/reverts/return_prs/sound/black_mesa/mobs/vortigaunt/scared_cowering03.ogg diff --git a/modular_ss220/modules/return_prs/black_mesa/sound/mobs/vortigaunt/scared_cowering04.ogg b/modular_ss220/reverts/return_prs/sound/black_mesa/mobs/vortigaunt/scared_cowering04.ogg similarity index 100% rename from modular_ss220/modules/return_prs/black_mesa/sound/mobs/vortigaunt/scared_cowering04.ogg rename to modular_ss220/reverts/return_prs/sound/black_mesa/mobs/vortigaunt/scared_cowering04.ogg diff --git a/modular_ss220/modules/return_prs/black_mesa/sound/mobs/vortigaunt/scared_cowering05.ogg b/modular_ss220/reverts/return_prs/sound/black_mesa/mobs/vortigaunt/scared_cowering05.ogg similarity index 100% rename from modular_ss220/modules/return_prs/black_mesa/sound/mobs/vortigaunt/scared_cowering05.ogg rename to modular_ss220/reverts/return_prs/sound/black_mesa/mobs/vortigaunt/scared_cowering05.ogg diff --git a/modular_ss220/modules/return_prs/black_mesa/sound/mobs/vortigaunt/scared_retreat01.ogg b/modular_ss220/reverts/return_prs/sound/black_mesa/mobs/vortigaunt/scared_retreat01.ogg similarity index 100% rename from modular_ss220/modules/return_prs/black_mesa/sound/mobs/vortigaunt/scared_retreat01.ogg rename to modular_ss220/reverts/return_prs/sound/black_mesa/mobs/vortigaunt/scared_retreat01.ogg diff --git a/modular_ss220/modules/return_prs/black_mesa/sound/mobs/vortigaunt/scared_retreat02.ogg b/modular_ss220/reverts/return_prs/sound/black_mesa/mobs/vortigaunt/scared_retreat02.ogg similarity index 100% rename from modular_ss220/modules/return_prs/black_mesa/sound/mobs/vortigaunt/scared_retreat02.ogg rename to modular_ss220/reverts/return_prs/sound/black_mesa/mobs/vortigaunt/scared_retreat02.ogg diff --git a/modular_ss220/modules/return_prs/black_mesa/sound/mobs/vortigaunt/scared_retreat03.ogg b/modular_ss220/reverts/return_prs/sound/black_mesa/mobs/vortigaunt/scared_retreat03.ogg similarity index 100% rename from modular_ss220/modules/return_prs/black_mesa/sound/mobs/vortigaunt/scared_retreat03.ogg rename to modular_ss220/reverts/return_prs/sound/black_mesa/mobs/vortigaunt/scared_retreat03.ogg diff --git a/modular_ss220/modules/return_prs/black_mesa/sound/mobs/vortigaunt/scared_startled01.ogg b/modular_ss220/reverts/return_prs/sound/black_mesa/mobs/vortigaunt/scared_startled01.ogg similarity index 100% rename from modular_ss220/modules/return_prs/black_mesa/sound/mobs/vortigaunt/scared_startled01.ogg rename to modular_ss220/reverts/return_prs/sound/black_mesa/mobs/vortigaunt/scared_startled01.ogg diff --git a/modular_ss220/modules/return_prs/black_mesa/sound/mobs/vortigaunt/scared_startled02.ogg b/modular_ss220/reverts/return_prs/sound/black_mesa/mobs/vortigaunt/scared_startled02.ogg similarity index 100% rename from modular_ss220/modules/return_prs/black_mesa/sound/mobs/vortigaunt/scared_startled02.ogg rename to modular_ss220/reverts/return_prs/sound/black_mesa/mobs/vortigaunt/scared_startled02.ogg diff --git a/modular_ss220/modules/return_prs/black_mesa/sound/mobs/vortigaunt/scared_startled03.ogg b/modular_ss220/reverts/return_prs/sound/black_mesa/mobs/vortigaunt/scared_startled03.ogg similarity index 100% rename from modular_ss220/modules/return_prs/black_mesa/sound/mobs/vortigaunt/scared_startled03.ogg rename to modular_ss220/reverts/return_prs/sound/black_mesa/mobs/vortigaunt/scared_startled03.ogg diff --git a/modular_ss220/modules/return_prs/black_mesa/sound/mobs/vortigaunt/scared_startled04.ogg b/modular_ss220/reverts/return_prs/sound/black_mesa/mobs/vortigaunt/scared_startled04.ogg similarity index 100% rename from modular_ss220/modules/return_prs/black_mesa/sound/mobs/vortigaunt/scared_startled04.ogg rename to modular_ss220/reverts/return_prs/sound/black_mesa/mobs/vortigaunt/scared_startled04.ogg diff --git a/modular_ss220/modules/return_prs/black_mesa/sound/mobs/vortigaunt/tortured_cry01.ogg b/modular_ss220/reverts/return_prs/sound/black_mesa/mobs/vortigaunt/tortured_cry01.ogg similarity index 100% rename from modular_ss220/modules/return_prs/black_mesa/sound/mobs/vortigaunt/tortured_cry01.ogg rename to modular_ss220/reverts/return_prs/sound/black_mesa/mobs/vortigaunt/tortured_cry01.ogg diff --git a/modular_ss220/modules/return_prs/black_mesa/sound/mobs/vortigaunt/tortured_cry02.ogg b/modular_ss220/reverts/return_prs/sound/black_mesa/mobs/vortigaunt/tortured_cry02.ogg similarity index 100% rename from modular_ss220/modules/return_prs/black_mesa/sound/mobs/vortigaunt/tortured_cry02.ogg rename to modular_ss220/reverts/return_prs/sound/black_mesa/mobs/vortigaunt/tortured_cry02.ogg diff --git a/modular_ss220/modules/return_prs/black_mesa/sound/mobs/vortigaunt/tortured_pain01.ogg b/modular_ss220/reverts/return_prs/sound/black_mesa/mobs/vortigaunt/tortured_pain01.ogg similarity index 100% rename from modular_ss220/modules/return_prs/black_mesa/sound/mobs/vortigaunt/tortured_pain01.ogg rename to modular_ss220/reverts/return_prs/sound/black_mesa/mobs/vortigaunt/tortured_pain01.ogg diff --git a/modular_ss220/modules/return_prs/black_mesa/sound/mobs/vortigaunt/tortured_pain02.ogg b/modular_ss220/reverts/return_prs/sound/black_mesa/mobs/vortigaunt/tortured_pain02.ogg similarity index 100% rename from modular_ss220/modules/return_prs/black_mesa/sound/mobs/vortigaunt/tortured_pain02.ogg rename to modular_ss220/reverts/return_prs/sound/black_mesa/mobs/vortigaunt/tortured_pain02.ogg diff --git a/modular_ss220/modules/return_prs/black_mesa/sound/mobs/vortigaunt/tortured_pain03.ogg b/modular_ss220/reverts/return_prs/sound/black_mesa/mobs/vortigaunt/tortured_pain03.ogg similarity index 100% rename from modular_ss220/modules/return_prs/black_mesa/sound/mobs/vortigaunt/tortured_pain03.ogg rename to modular_ss220/reverts/return_prs/sound/black_mesa/mobs/vortigaunt/tortured_pain03.ogg diff --git a/modular_ss220/modules/return_prs/black_mesa/sound/mobs/vortigaunt/tortured_pain04.ogg b/modular_ss220/reverts/return_prs/sound/black_mesa/mobs/vortigaunt/tortured_pain04.ogg similarity index 100% rename from modular_ss220/modules/return_prs/black_mesa/sound/mobs/vortigaunt/tortured_pain04.ogg rename to modular_ss220/reverts/return_prs/sound/black_mesa/mobs/vortigaunt/tortured_pain04.ogg diff --git a/modular_ss220/modules/return_prs/black_mesa/sound/mobs/vortigaunt/tortured_plead01.ogg b/modular_ss220/reverts/return_prs/sound/black_mesa/mobs/vortigaunt/tortured_plead01.ogg similarity index 100% rename from modular_ss220/modules/return_prs/black_mesa/sound/mobs/vortigaunt/tortured_plead01.ogg rename to modular_ss220/reverts/return_prs/sound/black_mesa/mobs/vortigaunt/tortured_plead01.ogg diff --git a/modular_ss220/modules/return_prs/black_mesa/sound/mobs/vortigaunt/tortured_plead02.ogg b/modular_ss220/reverts/return_prs/sound/black_mesa/mobs/vortigaunt/tortured_plead02.ogg similarity index 100% rename from modular_ss220/modules/return_prs/black_mesa/sound/mobs/vortigaunt/tortured_plead02.ogg rename to modular_ss220/reverts/return_prs/sound/black_mesa/mobs/vortigaunt/tortured_plead02.ogg diff --git a/modular_ss220/modules/return_prs/black_mesa/sound/mobs/vortigaunt/tortured_plead03.ogg b/modular_ss220/reverts/return_prs/sound/black_mesa/mobs/vortigaunt/tortured_plead03.ogg similarity index 100% rename from modular_ss220/modules/return_prs/black_mesa/sound/mobs/vortigaunt/tortured_plead03.ogg rename to modular_ss220/reverts/return_prs/sound/black_mesa/mobs/vortigaunt/tortured_plead03.ogg diff --git a/modular_ss220/modules/return_prs/black_mesa/sound/mobs/vortigaunt/village_argue01.ogg b/modular_ss220/reverts/return_prs/sound/black_mesa/mobs/vortigaunt/village_argue01.ogg similarity index 100% rename from modular_ss220/modules/return_prs/black_mesa/sound/mobs/vortigaunt/village_argue01.ogg rename to modular_ss220/reverts/return_prs/sound/black_mesa/mobs/vortigaunt/village_argue01.ogg diff --git a/modular_ss220/modules/return_prs/black_mesa/sound/mobs/vortigaunt/village_argue02.ogg b/modular_ss220/reverts/return_prs/sound/black_mesa/mobs/vortigaunt/village_argue02.ogg similarity index 100% rename from modular_ss220/modules/return_prs/black_mesa/sound/mobs/vortigaunt/village_argue02.ogg rename to modular_ss220/reverts/return_prs/sound/black_mesa/mobs/vortigaunt/village_argue02.ogg diff --git a/modular_ss220/modules/return_prs/black_mesa/sound/mobs/vortigaunt/village_argue03.ogg b/modular_ss220/reverts/return_prs/sound/black_mesa/mobs/vortigaunt/village_argue03.ogg similarity index 100% rename from modular_ss220/modules/return_prs/black_mesa/sound/mobs/vortigaunt/village_argue03.ogg rename to modular_ss220/reverts/return_prs/sound/black_mesa/mobs/vortigaunt/village_argue03.ogg diff --git a/modular_ss220/modules/return_prs/black_mesa/sound/mobs/vortigaunt/village_argue04.ogg b/modular_ss220/reverts/return_prs/sound/black_mesa/mobs/vortigaunt/village_argue04.ogg similarity index 100% rename from modular_ss220/modules/return_prs/black_mesa/sound/mobs/vortigaunt/village_argue04.ogg rename to modular_ss220/reverts/return_prs/sound/black_mesa/mobs/vortigaunt/village_argue04.ogg diff --git a/modular_ss220/modules/return_prs/black_mesa/sound/mobs/vortigaunt/village_argue05.ogg b/modular_ss220/reverts/return_prs/sound/black_mesa/mobs/vortigaunt/village_argue05.ogg similarity index 100% rename from modular_ss220/modules/return_prs/black_mesa/sound/mobs/vortigaunt/village_argue05.ogg rename to modular_ss220/reverts/return_prs/sound/black_mesa/mobs/vortigaunt/village_argue05.ogg diff --git a/modular_ss220/modules/return_prs/black_mesa/sound/mobs/vortigaunt/village_argue05a.ogg b/modular_ss220/reverts/return_prs/sound/black_mesa/mobs/vortigaunt/village_argue05a.ogg similarity index 100% rename from modular_ss220/modules/return_prs/black_mesa/sound/mobs/vortigaunt/village_argue05a.ogg rename to modular_ss220/reverts/return_prs/sound/black_mesa/mobs/vortigaunt/village_argue05a.ogg diff --git a/modular_ss220/modules/return_prs/black_mesa/sound/mobs/vortigaunt/village_argue_sigh01.ogg b/modular_ss220/reverts/return_prs/sound/black_mesa/mobs/vortigaunt/village_argue_sigh01.ogg similarity index 100% rename from modular_ss220/modules/return_prs/black_mesa/sound/mobs/vortigaunt/village_argue_sigh01.ogg rename to modular_ss220/reverts/return_prs/sound/black_mesa/mobs/vortigaunt/village_argue_sigh01.ogg diff --git a/modular_ss220/modules/return_prs/black_mesa/sound/mobs/vortigaunt/village_call01.ogg b/modular_ss220/reverts/return_prs/sound/black_mesa/mobs/vortigaunt/village_call01.ogg similarity index 100% rename from modular_ss220/modules/return_prs/black_mesa/sound/mobs/vortigaunt/village_call01.ogg rename to modular_ss220/reverts/return_prs/sound/black_mesa/mobs/vortigaunt/village_call01.ogg diff --git a/modular_ss220/modules/return_prs/black_mesa/sound/mobs/vortigaunt/village_concern.ogg b/modular_ss220/reverts/return_prs/sound/black_mesa/mobs/vortigaunt/village_concern.ogg similarity index 100% rename from modular_ss220/modules/return_prs/black_mesa/sound/mobs/vortigaunt/village_concern.ogg rename to modular_ss220/reverts/return_prs/sound/black_mesa/mobs/vortigaunt/village_concern.ogg diff --git a/modular_ss220/modules/return_prs/black_mesa/sound/mobs/vortigaunt/village_confused01.ogg b/modular_ss220/reverts/return_prs/sound/black_mesa/mobs/vortigaunt/village_confused01.ogg similarity index 100% rename from modular_ss220/modules/return_prs/black_mesa/sound/mobs/vortigaunt/village_confused01.ogg rename to modular_ss220/reverts/return_prs/sound/black_mesa/mobs/vortigaunt/village_confused01.ogg diff --git a/modular_ss220/modules/return_prs/black_mesa/sound/mobs/vortigaunt/village_confused02.ogg b/modular_ss220/reverts/return_prs/sound/black_mesa/mobs/vortigaunt/village_confused02.ogg similarity index 100% rename from modular_ss220/modules/return_prs/black_mesa/sound/mobs/vortigaunt/village_confused02.ogg rename to modular_ss220/reverts/return_prs/sound/black_mesa/mobs/vortigaunt/village_confused02.ogg diff --git a/modular_ss220/modules/return_prs/black_mesa/sound/mobs/vortigaunt/village_cough1.ogg b/modular_ss220/reverts/return_prs/sound/black_mesa/mobs/vortigaunt/village_cough1.ogg similarity index 100% rename from modular_ss220/modules/return_prs/black_mesa/sound/mobs/vortigaunt/village_cough1.ogg rename to modular_ss220/reverts/return_prs/sound/black_mesa/mobs/vortigaunt/village_cough1.ogg diff --git a/modular_ss220/modules/return_prs/black_mesa/sound/mobs/vortigaunt/village_cough1a.ogg b/modular_ss220/reverts/return_prs/sound/black_mesa/mobs/vortigaunt/village_cough1a.ogg similarity index 100% rename from modular_ss220/modules/return_prs/black_mesa/sound/mobs/vortigaunt/village_cough1a.ogg rename to modular_ss220/reverts/return_prs/sound/black_mesa/mobs/vortigaunt/village_cough1a.ogg diff --git a/modular_ss220/modules/return_prs/black_mesa/sound/mobs/vortigaunt/village_goeat01.ogg b/modular_ss220/reverts/return_prs/sound/black_mesa/mobs/vortigaunt/village_goeat01.ogg similarity index 100% rename from modular_ss220/modules/return_prs/black_mesa/sound/mobs/vortigaunt/village_goeat01.ogg rename to modular_ss220/reverts/return_prs/sound/black_mesa/mobs/vortigaunt/village_goeat01.ogg diff --git a/modular_ss220/modules/return_prs/black_mesa/sound/mobs/vortigaunt/village_goeat02.ogg b/modular_ss220/reverts/return_prs/sound/black_mesa/mobs/vortigaunt/village_goeat02.ogg similarity index 100% rename from modular_ss220/modules/return_prs/black_mesa/sound/mobs/vortigaunt/village_goeat02.ogg rename to modular_ss220/reverts/return_prs/sound/black_mesa/mobs/vortigaunt/village_goeat02.ogg diff --git a/modular_ss220/modules/return_prs/black_mesa/sound/mobs/vortigaunt/village_ignore01.ogg b/modular_ss220/reverts/return_prs/sound/black_mesa/mobs/vortigaunt/village_ignore01.ogg similarity index 100% rename from modular_ss220/modules/return_prs/black_mesa/sound/mobs/vortigaunt/village_ignore01.ogg rename to modular_ss220/reverts/return_prs/sound/black_mesa/mobs/vortigaunt/village_ignore01.ogg diff --git a/modular_ss220/modules/return_prs/black_mesa/sound/mobs/vortigaunt/village_ignore02.ogg b/modular_ss220/reverts/return_prs/sound/black_mesa/mobs/vortigaunt/village_ignore02.ogg similarity index 100% rename from modular_ss220/modules/return_prs/black_mesa/sound/mobs/vortigaunt/village_ignore02.ogg rename to modular_ss220/reverts/return_prs/sound/black_mesa/mobs/vortigaunt/village_ignore02.ogg diff --git a/modular_ss220/modules/return_prs/black_mesa/sound/mobs/vortigaunt/village_invite01.ogg b/modular_ss220/reverts/return_prs/sound/black_mesa/mobs/vortigaunt/village_invite01.ogg similarity index 100% rename from modular_ss220/modules/return_prs/black_mesa/sound/mobs/vortigaunt/village_invite01.ogg rename to modular_ss220/reverts/return_prs/sound/black_mesa/mobs/vortigaunt/village_invite01.ogg diff --git a/modular_ss220/modules/return_prs/black_mesa/sound/mobs/vortigaunt/village_nodebate01.ogg b/modular_ss220/reverts/return_prs/sound/black_mesa/mobs/vortigaunt/village_nodebate01.ogg similarity index 100% rename from modular_ss220/modules/return_prs/black_mesa/sound/mobs/vortigaunt/village_nodebate01.ogg rename to modular_ss220/reverts/return_prs/sound/black_mesa/mobs/vortigaunt/village_nodebate01.ogg diff --git a/modular_ss220/modules/return_prs/black_mesa/sound/mobs/vortigaunt/village_nodebate02.ogg b/modular_ss220/reverts/return_prs/sound/black_mesa/mobs/vortigaunt/village_nodebate02.ogg similarity index 100% rename from modular_ss220/modules/return_prs/black_mesa/sound/mobs/vortigaunt/village_nodebate02.ogg rename to modular_ss220/reverts/return_prs/sound/black_mesa/mobs/vortigaunt/village_nodebate02.ogg diff --git a/modular_ss220/modules/return_prs/black_mesa/sound/mobs/vortigaunt/weeping01.ogg b/modular_ss220/reverts/return_prs/sound/black_mesa/mobs/vortigaunt/weeping01.ogg similarity index 100% rename from modular_ss220/modules/return_prs/black_mesa/sound/mobs/vortigaunt/weeping01.ogg rename to modular_ss220/reverts/return_prs/sound/black_mesa/mobs/vortigaunt/weeping01.ogg diff --git a/modular_ss220/modules/return_prs/black_mesa/sound/mobs/vortigaunt/weeping02.ogg b/modular_ss220/reverts/return_prs/sound/black_mesa/mobs/vortigaunt/weeping02.ogg similarity index 100% rename from modular_ss220/modules/return_prs/black_mesa/sound/mobs/vortigaunt/weeping02.ogg rename to modular_ss220/reverts/return_prs/sound/black_mesa/mobs/vortigaunt/weeping02.ogg diff --git a/modular_ss220/modules/return_prs/black_mesa/sound/mobs/vortigaunt/weeping03.ogg b/modular_ss220/reverts/return_prs/sound/black_mesa/mobs/vortigaunt/weeping03.ogg similarity index 100% rename from modular_ss220/modules/return_prs/black_mesa/sound/mobs/vortigaunt/weeping03.ogg rename to modular_ss220/reverts/return_prs/sound/black_mesa/mobs/vortigaunt/weeping03.ogg diff --git a/modular_ss220/modules/return_prs/black_mesa/sound/mobs/vortigaunt/weeping04.ogg b/modular_ss220/reverts/return_prs/sound/black_mesa/mobs/vortigaunt/weeping04.ogg similarity index 100% rename from modular_ss220/modules/return_prs/black_mesa/sound/mobs/vortigaunt/weeping04.ogg rename to modular_ss220/reverts/return_prs/sound/black_mesa/mobs/vortigaunt/weeping04.ogg diff --git a/modular_ss220/modules/return_prs/black_mesa/sound/mobs/vortigaunt/weeping05.ogg b/modular_ss220/reverts/return_prs/sound/black_mesa/mobs/vortigaunt/weeping05.ogg similarity index 100% rename from modular_ss220/modules/return_prs/black_mesa/sound/mobs/vortigaunt/weeping05.ogg rename to modular_ss220/reverts/return_prs/sound/black_mesa/mobs/vortigaunt/weeping05.ogg diff --git a/modular_ss220/modules/return_prs/black_mesa/sound/mobs/vortigaunt/weeping06.ogg b/modular_ss220/reverts/return_prs/sound/black_mesa/mobs/vortigaunt/weeping06.ogg similarity index 100% rename from modular_ss220/modules/return_prs/black_mesa/sound/mobs/vortigaunt/weeping06.ogg rename to modular_ss220/reverts/return_prs/sound/black_mesa/mobs/vortigaunt/weeping06.ogg diff --git a/modular_ss220/modules/return_prs/black_mesa/sound/mobs/vortigaunt/weeping07.ogg b/modular_ss220/reverts/return_prs/sound/black_mesa/mobs/vortigaunt/weeping07.ogg similarity index 100% rename from modular_ss220/modules/return_prs/black_mesa/sound/mobs/vortigaunt/weeping07.ogg rename to modular_ss220/reverts/return_prs/sound/black_mesa/mobs/vortigaunt/weeping07.ogg diff --git a/modular_ss220/modules/return_prs/black_mesa/sound/mobs/zombies/alert1.ogg b/modular_ss220/reverts/return_prs/sound/black_mesa/mobs/zombies/alert1.ogg similarity index 100% rename from modular_ss220/modules/return_prs/black_mesa/sound/mobs/zombies/alert1.ogg rename to modular_ss220/reverts/return_prs/sound/black_mesa/mobs/zombies/alert1.ogg diff --git a/modular_ss220/modules/return_prs/black_mesa/sound/mobs/zombies/alert2.ogg b/modular_ss220/reverts/return_prs/sound/black_mesa/mobs/zombies/alert2.ogg similarity index 100% rename from modular_ss220/modules/return_prs/black_mesa/sound/mobs/zombies/alert2.ogg rename to modular_ss220/reverts/return_prs/sound/black_mesa/mobs/zombies/alert2.ogg diff --git a/modular_ss220/modules/return_prs/black_mesa/sound/mobs/zombies/alert3.ogg b/modular_ss220/reverts/return_prs/sound/black_mesa/mobs/zombies/alert3.ogg similarity index 100% rename from modular_ss220/modules/return_prs/black_mesa/sound/mobs/zombies/alert3.ogg rename to modular_ss220/reverts/return_prs/sound/black_mesa/mobs/zombies/alert3.ogg diff --git a/modular_ss220/modules/return_prs/black_mesa/sound/mobs/zombies/alert4.ogg b/modular_ss220/reverts/return_prs/sound/black_mesa/mobs/zombies/alert4.ogg similarity index 100% rename from modular_ss220/modules/return_prs/black_mesa/sound/mobs/zombies/alert4.ogg rename to modular_ss220/reverts/return_prs/sound/black_mesa/mobs/zombies/alert4.ogg diff --git a/modular_ss220/modules/return_prs/black_mesa/sound/mobs/zombies/alert5.ogg b/modular_ss220/reverts/return_prs/sound/black_mesa/mobs/zombies/alert5.ogg similarity index 100% rename from modular_ss220/modules/return_prs/black_mesa/sound/mobs/zombies/alert5.ogg rename to modular_ss220/reverts/return_prs/sound/black_mesa/mobs/zombies/alert5.ogg diff --git a/modular_ss220/modules/return_prs/black_mesa/sound/mobs/zombies/alert6.ogg b/modular_ss220/reverts/return_prs/sound/black_mesa/mobs/zombies/alert6.ogg similarity index 100% rename from modular_ss220/modules/return_prs/black_mesa/sound/mobs/zombies/alert6.ogg rename to modular_ss220/reverts/return_prs/sound/black_mesa/mobs/zombies/alert6.ogg diff --git a/modular_ss220/modules/return_prs/black_mesa/sound/mobs/zombies/claw_strike.ogg b/modular_ss220/reverts/return_prs/sound/black_mesa/mobs/zombies/claw_strike.ogg similarity index 100% rename from modular_ss220/modules/return_prs/black_mesa/sound/mobs/zombies/claw_strike.ogg rename to modular_ss220/reverts/return_prs/sound/black_mesa/mobs/zombies/claw_strike.ogg diff --git a/modular_ss220/modules/return_prs/black_mesa/sound/mobs/zombies/hzv1.ogg b/modular_ss220/reverts/return_prs/sound/black_mesa/mobs/zombies/hzv1.ogg similarity index 100% rename from modular_ss220/modules/return_prs/black_mesa/sound/mobs/zombies/hzv1.ogg rename to modular_ss220/reverts/return_prs/sound/black_mesa/mobs/zombies/hzv1.ogg diff --git a/modular_ss220/modules/return_prs/black_mesa/sound/mobs/zombies/hzv10.ogg b/modular_ss220/reverts/return_prs/sound/black_mesa/mobs/zombies/hzv10.ogg similarity index 100% rename from modular_ss220/modules/return_prs/black_mesa/sound/mobs/zombies/hzv10.ogg rename to modular_ss220/reverts/return_prs/sound/black_mesa/mobs/zombies/hzv10.ogg diff --git a/modular_ss220/modules/return_prs/black_mesa/sound/mobs/zombies/hzv11.ogg b/modular_ss220/reverts/return_prs/sound/black_mesa/mobs/zombies/hzv11.ogg similarity index 100% rename from modular_ss220/modules/return_prs/black_mesa/sound/mobs/zombies/hzv11.ogg rename to modular_ss220/reverts/return_prs/sound/black_mesa/mobs/zombies/hzv11.ogg diff --git a/modular_ss220/modules/return_prs/black_mesa/sound/mobs/zombies/hzv12.ogg b/modular_ss220/reverts/return_prs/sound/black_mesa/mobs/zombies/hzv12.ogg similarity index 100% rename from modular_ss220/modules/return_prs/black_mesa/sound/mobs/zombies/hzv12.ogg rename to modular_ss220/reverts/return_prs/sound/black_mesa/mobs/zombies/hzv12.ogg diff --git a/modular_ss220/modules/return_prs/black_mesa/sound/mobs/zombies/hzv13.ogg b/modular_ss220/reverts/return_prs/sound/black_mesa/mobs/zombies/hzv13.ogg similarity index 100% rename from modular_ss220/modules/return_prs/black_mesa/sound/mobs/zombies/hzv13.ogg rename to modular_ss220/reverts/return_prs/sound/black_mesa/mobs/zombies/hzv13.ogg diff --git a/modular_ss220/modules/return_prs/black_mesa/sound/mobs/zombies/hzv14.ogg b/modular_ss220/reverts/return_prs/sound/black_mesa/mobs/zombies/hzv14.ogg similarity index 100% rename from modular_ss220/modules/return_prs/black_mesa/sound/mobs/zombies/hzv14.ogg rename to modular_ss220/reverts/return_prs/sound/black_mesa/mobs/zombies/hzv14.ogg diff --git a/modular_ss220/modules/return_prs/black_mesa/sound/mobs/zombies/hzv2.ogg b/modular_ss220/reverts/return_prs/sound/black_mesa/mobs/zombies/hzv2.ogg similarity index 100% rename from modular_ss220/modules/return_prs/black_mesa/sound/mobs/zombies/hzv2.ogg rename to modular_ss220/reverts/return_prs/sound/black_mesa/mobs/zombies/hzv2.ogg diff --git a/modular_ss220/modules/return_prs/black_mesa/sound/mobs/zombies/hzv3.ogg b/modular_ss220/reverts/return_prs/sound/black_mesa/mobs/zombies/hzv3.ogg similarity index 100% rename from modular_ss220/modules/return_prs/black_mesa/sound/mobs/zombies/hzv3.ogg rename to modular_ss220/reverts/return_prs/sound/black_mesa/mobs/zombies/hzv3.ogg diff --git a/modular_ss220/modules/return_prs/black_mesa/sound/mobs/zombies/hzv4.ogg b/modular_ss220/reverts/return_prs/sound/black_mesa/mobs/zombies/hzv4.ogg similarity index 100% rename from modular_ss220/modules/return_prs/black_mesa/sound/mobs/zombies/hzv4.ogg rename to modular_ss220/reverts/return_prs/sound/black_mesa/mobs/zombies/hzv4.ogg diff --git a/modular_ss220/modules/return_prs/black_mesa/sound/mobs/zombies/hzv5.ogg b/modular_ss220/reverts/return_prs/sound/black_mesa/mobs/zombies/hzv5.ogg similarity index 100% rename from modular_ss220/modules/return_prs/black_mesa/sound/mobs/zombies/hzv5.ogg rename to modular_ss220/reverts/return_prs/sound/black_mesa/mobs/zombies/hzv5.ogg diff --git a/modular_ss220/modules/return_prs/black_mesa/sound/mobs/zombies/hzv6.ogg b/modular_ss220/reverts/return_prs/sound/black_mesa/mobs/zombies/hzv6.ogg similarity index 100% rename from modular_ss220/modules/return_prs/black_mesa/sound/mobs/zombies/hzv6.ogg rename to modular_ss220/reverts/return_prs/sound/black_mesa/mobs/zombies/hzv6.ogg diff --git a/modular_ss220/modules/return_prs/black_mesa/sound/mobs/zombies/hzv7.ogg b/modular_ss220/reverts/return_prs/sound/black_mesa/mobs/zombies/hzv7.ogg similarity index 100% rename from modular_ss220/modules/return_prs/black_mesa/sound/mobs/zombies/hzv7.ogg rename to modular_ss220/reverts/return_prs/sound/black_mesa/mobs/zombies/hzv7.ogg diff --git a/modular_ss220/modules/return_prs/black_mesa/sound/mobs/zombies/hzv8.ogg b/modular_ss220/reverts/return_prs/sound/black_mesa/mobs/zombies/hzv8.ogg similarity index 100% rename from modular_ss220/modules/return_prs/black_mesa/sound/mobs/zombies/hzv8.ogg rename to modular_ss220/reverts/return_prs/sound/black_mesa/mobs/zombies/hzv8.ogg diff --git a/modular_ss220/modules/return_prs/black_mesa/sound/mobs/zombies/hzv9.ogg b/modular_ss220/reverts/return_prs/sound/black_mesa/mobs/zombies/hzv9.ogg similarity index 100% rename from modular_ss220/modules/return_prs/black_mesa/sound/mobs/zombies/hzv9.ogg rename to modular_ss220/reverts/return_prs/sound/black_mesa/mobs/zombies/hzv9.ogg diff --git a/modular_ss220/modules/return_prs/black_mesa/sound/siren1.ogg b/modular_ss220/reverts/return_prs/sound/black_mesa/siren1.ogg similarity index 100% rename from modular_ss220/modules/return_prs/black_mesa/sound/siren1.ogg rename to modular_ss220/reverts/return_prs/sound/black_mesa/siren1.ogg diff --git a/modular_ss220/modules/return_prs/black_mesa/sound/siren1_long.ogg b/modular_ss220/reverts/return_prs/sound/black_mesa/siren1_long.ogg similarity index 100% rename from modular_ss220/modules/return_prs/black_mesa/sound/siren1_long.ogg rename to modular_ss220/reverts/return_prs/sound/black_mesa/siren1_long.ogg diff --git a/modular_ss220/modules/return_prs/black_mesa/sound/tc_12_portalsuck.ogg b/modular_ss220/reverts/return_prs/sound/black_mesa/tc_12_portalsuck.ogg similarity index 100% rename from modular_ss220/modules/return_prs/black_mesa/sound/tc_12_portalsuck.ogg rename to modular_ss220/reverts/return_prs/sound/black_mesa/tc_12_portalsuck.ogg diff --git a/modular_ss220/modules/return_prs/black_mesa/sound/tc_13_teleport.ogg b/modular_ss220/reverts/return_prs/sound/black_mesa/tc_13_teleport.ogg similarity index 100% rename from modular_ss220/modules/return_prs/black_mesa/sound/tc_13_teleport.ogg rename to modular_ss220/reverts/return_prs/sound/black_mesa/tc_13_teleport.ogg diff --git a/modular_ss220/modules/return_prs/black_mesa/sound/xen-credits.ogg b/modular_ss220/reverts/return_prs/sound/black_mesa/xen-credits.ogg similarity index 100% rename from modular_ss220/modules/return_prs/black_mesa/sound/xen-credits.ogg rename to modular_ss220/reverts/return_prs/sound/black_mesa/xen-credits.ogg diff --git a/modular_ss220/modules/return_prs/black_mesa/sound/xen_door.ogg b/modular_ss220/reverts/return_prs/sound/black_mesa/xen_door.ogg similarity index 100% rename from modular_ss220/modules/return_prs/black_mesa/sound/xen_door.ogg rename to modular_ss220/reverts/return_prs/sound/black_mesa/xen_door.ogg diff --git a/modular_ss220/modules/return_prs/gunsgalore/sound/guns/fire/akm_fire.ogg b/modular_ss220/reverts/return_prs/sound/gunsgalore/guns/fire/akm_fire.ogg similarity index 100% rename from modular_ss220/modules/return_prs/gunsgalore/sound/guns/fire/akm_fire.ogg rename to modular_ss220/reverts/return_prs/sound/gunsgalore/guns/fire/akm_fire.ogg diff --git a/modular_ss220/modules/return_prs/gunsgalore/sound/guns/fire/fg42_fire.ogg b/modular_ss220/reverts/return_prs/sound/gunsgalore/guns/fire/fg42_fire.ogg similarity index 100% rename from modular_ss220/modules/return_prs/gunsgalore/sound/guns/fire/fg42_fire.ogg rename to modular_ss220/reverts/return_prs/sound/gunsgalore/guns/fire/fg42_fire.ogg diff --git a/modular_ss220/modules/return_prs/gunsgalore/sound/guns/fire/laser_cannon_charge.ogg b/modular_ss220/reverts/return_prs/sound/gunsgalore/guns/fire/laser_cannon_charge.ogg similarity index 100% rename from modular_ss220/modules/return_prs/gunsgalore/sound/guns/fire/laser_cannon_charge.ogg rename to modular_ss220/reverts/return_prs/sound/gunsgalore/guns/fire/laser_cannon_charge.ogg diff --git a/modular_ss220/modules/return_prs/gunsgalore/sound/guns/fire/luger_fire.ogg b/modular_ss220/reverts/return_prs/sound/gunsgalore/guns/fire/luger_fire.ogg similarity index 100% rename from modular_ss220/modules/return_prs/gunsgalore/sound/guns/fire/luger_fire.ogg rename to modular_ss220/reverts/return_prs/sound/gunsgalore/guns/fire/luger_fire.ogg diff --git a/modular_ss220/modules/return_prs/gunsgalore/sound/guns/fire/luger_mag_insert.ogg b/modular_ss220/reverts/return_prs/sound/gunsgalore/guns/fire/luger_mag_insert.ogg similarity index 100% rename from modular_ss220/modules/return_prs/gunsgalore/sound/guns/fire/luger_mag_insert.ogg rename to modular_ss220/reverts/return_prs/sound/gunsgalore/guns/fire/luger_mag_insert.ogg diff --git a/modular_ss220/modules/return_prs/gunsgalore/sound/guns/fire/luger_mag_release.ogg b/modular_ss220/reverts/return_prs/sound/gunsgalore/guns/fire/luger_mag_release.ogg similarity index 100% rename from modular_ss220/modules/return_prs/gunsgalore/sound/guns/fire/luger_mag_release.ogg rename to modular_ss220/reverts/return_prs/sound/gunsgalore/guns/fire/luger_mag_release.ogg diff --git a/modular_ss220/modules/return_prs/gunsgalore/sound/guns/fire/luger_rack.ogg b/modular_ss220/reverts/return_prs/sound/gunsgalore/guns/fire/luger_rack.ogg similarity index 100% rename from modular_ss220/modules/return_prs/gunsgalore/sound/guns/fire/luger_rack.ogg rename to modular_ss220/reverts/return_prs/sound/gunsgalore/guns/fire/luger_rack.ogg diff --git a/modular_ss220/modules/return_prs/gunsgalore/sound/guns/fire/m16_fire.ogg b/modular_ss220/reverts/return_prs/sound/gunsgalore/guns/fire/m16_fire.ogg similarity index 100% rename from modular_ss220/modules/return_prs/gunsgalore/sound/guns/fire/m16_fire.ogg rename to modular_ss220/reverts/return_prs/sound/gunsgalore/guns/fire/m16_fire.ogg diff --git a/modular_ss220/modules/return_prs/gunsgalore/sound/guns/fire/mg34_fire.ogg b/modular_ss220/reverts/return_prs/sound/gunsgalore/guns/fire/mg34_fire.ogg similarity index 100% rename from modular_ss220/modules/return_prs/gunsgalore/sound/guns/fire/mg34_fire.ogg rename to modular_ss220/reverts/return_prs/sound/gunsgalore/guns/fire/mg34_fire.ogg diff --git a/modular_ss220/modules/return_prs/gunsgalore/sound/guns/fire/mg42_bipod.ogg b/modular_ss220/reverts/return_prs/sound/gunsgalore/guns/fire/mg42_bipod.ogg similarity index 100% rename from modular_ss220/modules/return_prs/gunsgalore/sound/guns/fire/mg42_bipod.ogg rename to modular_ss220/reverts/return_prs/sound/gunsgalore/guns/fire/mg42_bipod.ogg diff --git a/modular_ss220/modules/return_prs/gunsgalore/sound/guns/fire/mg42_fire.ogg b/modular_ss220/reverts/return_prs/sound/gunsgalore/guns/fire/mg42_fire.ogg similarity index 100% rename from modular_ss220/modules/return_prs/gunsgalore/sound/guns/fire/mg42_fire.ogg rename to modular_ss220/reverts/return_prs/sound/gunsgalore/guns/fire/mg42_fire.ogg diff --git a/modular_ss220/modules/return_prs/gunsgalore/sound/guns/fire/mg42_fire_overheat.ogg b/modular_ss220/reverts/return_prs/sound/gunsgalore/guns/fire/mg42_fire_overheat.ogg similarity index 100% rename from modular_ss220/modules/return_prs/gunsgalore/sound/guns/fire/mg42_fire_overheat.ogg rename to modular_ss220/reverts/return_prs/sound/gunsgalore/guns/fire/mg42_fire_overheat.ogg diff --git a/modular_ss220/modules/return_prs/gunsgalore/sound/guns/fire/mg_overheat.ogg b/modular_ss220/reverts/return_prs/sound/gunsgalore/guns/fire/mg_overheat.ogg similarity index 100% rename from modular_ss220/modules/return_prs/gunsgalore/sound/guns/fire/mg_overheat.ogg rename to modular_ss220/reverts/return_prs/sound/gunsgalore/guns/fire/mg_overheat.ogg diff --git a/modular_ss220/modules/return_prs/gunsgalore/sound/guns/fire/mp40_fire.ogg b/modular_ss220/reverts/return_prs/sound/gunsgalore/guns/fire/mp40_fire.ogg similarity index 100% rename from modular_ss220/modules/return_prs/gunsgalore/sound/guns/fire/mp40_fire.ogg rename to modular_ss220/reverts/return_prs/sound/gunsgalore/guns/fire/mp40_fire.ogg diff --git a/modular_ss220/modules/return_prs/gunsgalore/sound/guns/fire/mp5_empty.ogg b/modular_ss220/reverts/return_prs/sound/gunsgalore/guns/fire/mp5_empty.ogg similarity index 100% rename from modular_ss220/modules/return_prs/gunsgalore/sound/guns/fire/mp5_empty.ogg rename to modular_ss220/reverts/return_prs/sound/gunsgalore/guns/fire/mp5_empty.ogg diff --git a/modular_ss220/modules/return_prs/gunsgalore/sound/guns/fire/mp5_fire.ogg b/modular_ss220/reverts/return_prs/sound/gunsgalore/guns/fire/mp5_fire.ogg similarity index 100% rename from modular_ss220/modules/return_prs/gunsgalore/sound/guns/fire/mp5_fire.ogg rename to modular_ss220/reverts/return_prs/sound/gunsgalore/guns/fire/mp5_fire.ogg diff --git a/modular_ss220/modules/return_prs/gunsgalore/sound/guns/fire/mp5_fire_suppressed.ogg b/modular_ss220/reverts/return_prs/sound/gunsgalore/guns/fire/mp5_fire_suppressed.ogg similarity index 100% rename from modular_ss220/modules/return_prs/gunsgalore/sound/guns/fire/mp5_fire_suppressed.ogg rename to modular_ss220/reverts/return_prs/sound/gunsgalore/guns/fire/mp5_fire_suppressed.ogg diff --git a/modular_ss220/modules/return_prs/gunsgalore/sound/guns/fire/p90_fire.ogg b/modular_ss220/reverts/return_prs/sound/gunsgalore/guns/fire/p90_fire.ogg similarity index 100% rename from modular_ss220/modules/return_prs/gunsgalore/sound/guns/fire/p90_fire.ogg rename to modular_ss220/reverts/return_prs/sound/gunsgalore/guns/fire/p90_fire.ogg diff --git a/modular_ss220/modules/return_prs/gunsgalore/sound/guns/fire/pps_fire.ogg b/modular_ss220/reverts/return_prs/sound/gunsgalore/guns/fire/pps_fire.ogg similarity index 100% rename from modular_ss220/modules/return_prs/gunsgalore/sound/guns/fire/pps_fire.ogg rename to modular_ss220/reverts/return_prs/sound/gunsgalore/guns/fire/pps_fire.ogg diff --git a/modular_ss220/modules/return_prs/gunsgalore/sound/guns/fire/ppsh_fire.ogg b/modular_ss220/reverts/return_prs/sound/gunsgalore/guns/fire/ppsh_fire.ogg similarity index 100% rename from modular_ss220/modules/return_prs/gunsgalore/sound/guns/fire/ppsh_fire.ogg rename to modular_ss220/reverts/return_prs/sound/gunsgalore/guns/fire/ppsh_fire.ogg diff --git a/modular_ss220/modules/return_prs/gunsgalore/sound/guns/fire/scar_fire.ogg b/modular_ss220/reverts/return_prs/sound/gunsgalore/guns/fire/scar_fire.ogg similarity index 100% rename from modular_ss220/modules/return_prs/gunsgalore/sound/guns/fire/scar_fire.ogg rename to modular_ss220/reverts/return_prs/sound/gunsgalore/guns/fire/scar_fire.ogg diff --git a/modular_ss220/modules/return_prs/gunsgalore/sound/guns/fire/stg_fire.ogg b/modular_ss220/reverts/return_prs/sound/gunsgalore/guns/fire/stg_fire.ogg similarity index 100% rename from modular_ss220/modules/return_prs/gunsgalore/sound/guns/fire/stg_fire.ogg rename to modular_ss220/reverts/return_prs/sound/gunsgalore/guns/fire/stg_fire.ogg diff --git a/modular_ss220/modules/return_prs/gunsgalore/sound/guns/interact/batrifle_cock.ogg b/modular_ss220/reverts/return_prs/sound/gunsgalore/guns/interact/batrifle_cock.ogg similarity index 100% rename from modular_ss220/modules/return_prs/gunsgalore/sound/guns/interact/batrifle_cock.ogg rename to modular_ss220/reverts/return_prs/sound/gunsgalore/guns/interact/batrifle_cock.ogg diff --git a/modular_ss220/modules/return_prs/gunsgalore/sound/guns/interact/batrifle_magin.ogg b/modular_ss220/reverts/return_prs/sound/gunsgalore/guns/interact/batrifle_magin.ogg similarity index 100% rename from modular_ss220/modules/return_prs/gunsgalore/sound/guns/interact/batrifle_magin.ogg rename to modular_ss220/reverts/return_prs/sound/gunsgalore/guns/interact/batrifle_magin.ogg diff --git a/modular_ss220/modules/return_prs/gunsgalore/sound/guns/interact/batrifle_magout.ogg b/modular_ss220/reverts/return_prs/sound/gunsgalore/guns/interact/batrifle_magout.ogg similarity index 100% rename from modular_ss220/modules/return_prs/gunsgalore/sound/guns/interact/batrifle_magout.ogg rename to modular_ss220/reverts/return_prs/sound/gunsgalore/guns/interact/batrifle_magout.ogg diff --git a/modular_ss220/modules/return_prs/gunsgalore/sound/guns/interact/bullet_insert.ogg b/modular_ss220/reverts/return_prs/sound/gunsgalore/guns/interact/bullet_insert.ogg similarity index 100% rename from modular_ss220/modules/return_prs/gunsgalore/sound/guns/interact/bullet_insert.ogg rename to modular_ss220/reverts/return_prs/sound/gunsgalore/guns/interact/bullet_insert.ogg diff --git a/modular_ss220/modules/return_prs/gunsgalore/sound/guns/interact/bullet_insert2.ogg b/modular_ss220/reverts/return_prs/sound/gunsgalore/guns/interact/bullet_insert2.ogg similarity index 100% rename from modular_ss220/modules/return_prs/gunsgalore/sound/guns/interact/bullet_insert2.ogg rename to modular_ss220/reverts/return_prs/sound/gunsgalore/guns/interact/bullet_insert2.ogg diff --git a/modular_ss220/modules/return_prs/gunsgalore/sound/guns/interact/hpistol_cock.ogg b/modular_ss220/reverts/return_prs/sound/gunsgalore/guns/interact/hpistol_cock.ogg similarity index 100% rename from modular_ss220/modules/return_prs/gunsgalore/sound/guns/interact/hpistol_cock.ogg rename to modular_ss220/reverts/return_prs/sound/gunsgalore/guns/interact/hpistol_cock.ogg diff --git a/modular_ss220/modules/return_prs/gunsgalore/sound/guns/interact/hpistol_magin.ogg b/modular_ss220/reverts/return_prs/sound/gunsgalore/guns/interact/hpistol_magin.ogg similarity index 100% rename from modular_ss220/modules/return_prs/gunsgalore/sound/guns/interact/hpistol_magin.ogg rename to modular_ss220/reverts/return_prs/sound/gunsgalore/guns/interact/hpistol_magin.ogg diff --git a/modular_ss220/modules/return_prs/gunsgalore/sound/guns/interact/hpistol_magout.ogg b/modular_ss220/reverts/return_prs/sound/gunsgalore/guns/interact/hpistol_magout.ogg similarity index 100% rename from modular_ss220/modules/return_prs/gunsgalore/sound/guns/interact/hpistol_magout.ogg rename to modular_ss220/reverts/return_prs/sound/gunsgalore/guns/interact/hpistol_magout.ogg diff --git a/modular_ss220/modules/return_prs/gunsgalore/sound/guns/interact/lmg_close.ogg b/modular_ss220/reverts/return_prs/sound/gunsgalore/guns/interact/lmg_close.ogg similarity index 100% rename from modular_ss220/modules/return_prs/gunsgalore/sound/guns/interact/lmg_close.ogg rename to modular_ss220/reverts/return_prs/sound/gunsgalore/guns/interact/lmg_close.ogg diff --git a/modular_ss220/modules/return_prs/gunsgalore/sound/guns/interact/lmg_cock.ogg b/modular_ss220/reverts/return_prs/sound/gunsgalore/guns/interact/lmg_cock.ogg similarity index 100% rename from modular_ss220/modules/return_prs/gunsgalore/sound/guns/interact/lmg_cock.ogg rename to modular_ss220/reverts/return_prs/sound/gunsgalore/guns/interact/lmg_cock.ogg diff --git a/modular_ss220/modules/return_prs/gunsgalore/sound/guns/interact/lmg_magin.ogg b/modular_ss220/reverts/return_prs/sound/gunsgalore/guns/interact/lmg_magin.ogg similarity index 100% rename from modular_ss220/modules/return_prs/gunsgalore/sound/guns/interact/lmg_magin.ogg rename to modular_ss220/reverts/return_prs/sound/gunsgalore/guns/interact/lmg_magin.ogg diff --git a/modular_ss220/modules/return_prs/gunsgalore/sound/guns/interact/lmg_magout.ogg b/modular_ss220/reverts/return_prs/sound/gunsgalore/guns/interact/lmg_magout.ogg similarity index 100% rename from modular_ss220/modules/return_prs/gunsgalore/sound/guns/interact/lmg_magout.ogg rename to modular_ss220/reverts/return_prs/sound/gunsgalore/guns/interact/lmg_magout.ogg diff --git a/modular_ss220/modules/return_prs/gunsgalore/sound/guns/interact/lmg_open.ogg b/modular_ss220/reverts/return_prs/sound/gunsgalore/guns/interact/lmg_open.ogg similarity index 100% rename from modular_ss220/modules/return_prs/gunsgalore/sound/guns/interact/lmg_open.ogg rename to modular_ss220/reverts/return_prs/sound/gunsgalore/guns/interact/lmg_open.ogg diff --git a/modular_ss220/modules/return_prs/gunsgalore/sound/guns/interact/ltrifle_cock.ogg b/modular_ss220/reverts/return_prs/sound/gunsgalore/guns/interact/ltrifle_cock.ogg similarity index 100% rename from modular_ss220/modules/return_prs/gunsgalore/sound/guns/interact/ltrifle_cock.ogg rename to modular_ss220/reverts/return_prs/sound/gunsgalore/guns/interact/ltrifle_cock.ogg diff --git a/modular_ss220/modules/return_prs/gunsgalore/sound/guns/interact/ltrifle_magin.ogg b/modular_ss220/reverts/return_prs/sound/gunsgalore/guns/interact/ltrifle_magin.ogg similarity index 100% rename from modular_ss220/modules/return_prs/gunsgalore/sound/guns/interact/ltrifle_magin.ogg rename to modular_ss220/reverts/return_prs/sound/gunsgalore/guns/interact/ltrifle_magin.ogg diff --git a/modular_ss220/modules/return_prs/gunsgalore/sound/guns/interact/ltrifle_magout.ogg b/modular_ss220/reverts/return_prs/sound/gunsgalore/guns/interact/ltrifle_magout.ogg similarity index 100% rename from modular_ss220/modules/return_prs/gunsgalore/sound/guns/interact/ltrifle_magout.ogg rename to modular_ss220/reverts/return_prs/sound/gunsgalore/guns/interact/ltrifle_magout.ogg diff --git a/modular_ss220/modules/return_prs/gunsgalore/sound/guns/interact/mp5_boltback.ogg b/modular_ss220/reverts/return_prs/sound/gunsgalore/guns/interact/mp5_boltback.ogg similarity index 100% rename from modular_ss220/modules/return_prs/gunsgalore/sound/guns/interact/mp5_boltback.ogg rename to modular_ss220/reverts/return_prs/sound/gunsgalore/guns/interact/mp5_boltback.ogg diff --git a/modular_ss220/modules/return_prs/gunsgalore/sound/guns/interact/mp5_boltforward.ogg b/modular_ss220/reverts/return_prs/sound/gunsgalore/guns/interact/mp5_boltforward.ogg similarity index 100% rename from modular_ss220/modules/return_prs/gunsgalore/sound/guns/interact/mp5_boltforward.ogg rename to modular_ss220/reverts/return_prs/sound/gunsgalore/guns/interact/mp5_boltforward.ogg diff --git a/modular_ss220/modules/return_prs/gunsgalore/sound/guns/interact/mp5_cock.ogg b/modular_ss220/reverts/return_prs/sound/gunsgalore/guns/interact/mp5_cock.ogg similarity index 100% rename from modular_ss220/modules/return_prs/gunsgalore/sound/guns/interact/mp5_cock.ogg rename to modular_ss220/reverts/return_prs/sound/gunsgalore/guns/interact/mp5_cock.ogg diff --git a/modular_ss220/modules/return_prs/gunsgalore/sound/guns/interact/mp5_magin.ogg b/modular_ss220/reverts/return_prs/sound/gunsgalore/guns/interact/mp5_magin.ogg similarity index 100% rename from modular_ss220/modules/return_prs/gunsgalore/sound/guns/interact/mp5_magin.ogg rename to modular_ss220/reverts/return_prs/sound/gunsgalore/guns/interact/mp5_magin.ogg diff --git a/modular_ss220/modules/return_prs/gunsgalore/sound/guns/interact/mp5_magout.ogg b/modular_ss220/reverts/return_prs/sound/gunsgalore/guns/interact/mp5_magout.ogg similarity index 100% rename from modular_ss220/modules/return_prs/gunsgalore/sound/guns/interact/mp5_magout.ogg rename to modular_ss220/reverts/return_prs/sound/gunsgalore/guns/interact/mp5_magout.ogg diff --git a/modular_ss220/modules/return_prs/gunsgalore/sound/guns/interact/p90_cock.ogg b/modular_ss220/reverts/return_prs/sound/gunsgalore/guns/interact/p90_cock.ogg similarity index 100% rename from modular_ss220/modules/return_prs/gunsgalore/sound/guns/interact/p90_cock.ogg rename to modular_ss220/reverts/return_prs/sound/gunsgalore/guns/interact/p90_cock.ogg diff --git a/modular_ss220/modules/return_prs/gunsgalore/sound/guns/interact/p90_magin.ogg b/modular_ss220/reverts/return_prs/sound/gunsgalore/guns/interact/p90_magin.ogg similarity index 100% rename from modular_ss220/modules/return_prs/gunsgalore/sound/guns/interact/p90_magin.ogg rename to modular_ss220/reverts/return_prs/sound/gunsgalore/guns/interact/p90_magin.ogg diff --git a/modular_ss220/modules/return_prs/gunsgalore/sound/guns/interact/p90_magout.ogg b/modular_ss220/reverts/return_prs/sound/gunsgalore/guns/interact/p90_magout.ogg similarity index 100% rename from modular_ss220/modules/return_prs/gunsgalore/sound/guns/interact/p90_magout.ogg rename to modular_ss220/reverts/return_prs/sound/gunsgalore/guns/interact/p90_magout.ogg diff --git a/modular_ss220/modules/return_prs/gunsgalore/sound/guns/interact/pistol_cock.ogg b/modular_ss220/reverts/return_prs/sound/gunsgalore/guns/interact/pistol_cock.ogg similarity index 100% rename from modular_ss220/modules/return_prs/gunsgalore/sound/guns/interact/pistol_cock.ogg rename to modular_ss220/reverts/return_prs/sound/gunsgalore/guns/interact/pistol_cock.ogg diff --git a/modular_ss220/modules/return_prs/gunsgalore/sound/guns/interact/pistol_magin.ogg b/modular_ss220/reverts/return_prs/sound/gunsgalore/guns/interact/pistol_magin.ogg similarity index 100% rename from modular_ss220/modules/return_prs/gunsgalore/sound/guns/interact/pistol_magin.ogg rename to modular_ss220/reverts/return_prs/sound/gunsgalore/guns/interact/pistol_magin.ogg diff --git a/modular_ss220/modules/return_prs/gunsgalore/sound/guns/interact/pistol_magout.ogg b/modular_ss220/reverts/return_prs/sound/gunsgalore/guns/interact/pistol_magout.ogg similarity index 100% rename from modular_ss220/modules/return_prs/gunsgalore/sound/guns/interact/pistol_magout.ogg rename to modular_ss220/reverts/return_prs/sound/gunsgalore/guns/interact/pistol_magout.ogg diff --git a/modular_ss220/modules/return_prs/gunsgalore/sound/guns/interact/rev_cock.ogg b/modular_ss220/reverts/return_prs/sound/gunsgalore/guns/interact/rev_cock.ogg similarity index 100% rename from modular_ss220/modules/return_prs/gunsgalore/sound/guns/interact/rev_cock.ogg rename to modular_ss220/reverts/return_prs/sound/gunsgalore/guns/interact/rev_cock.ogg diff --git a/modular_ss220/modules/return_prs/gunsgalore/sound/guns/interact/rev_magin.ogg b/modular_ss220/reverts/return_prs/sound/gunsgalore/guns/interact/rev_magin.ogg similarity index 100% rename from modular_ss220/modules/return_prs/gunsgalore/sound/guns/interact/rev_magin.ogg rename to modular_ss220/reverts/return_prs/sound/gunsgalore/guns/interact/rev_magin.ogg diff --git a/modular_ss220/modules/return_prs/gunsgalore/sound/guns/interact/rev_magout.ogg b/modular_ss220/reverts/return_prs/sound/gunsgalore/guns/interact/rev_magout.ogg similarity index 100% rename from modular_ss220/modules/return_prs/gunsgalore/sound/guns/interact/rev_magout.ogg rename to modular_ss220/reverts/return_prs/sound/gunsgalore/guns/interact/rev_magout.ogg diff --git a/modular_ss220/modules/return_prs/gunsgalore/sound/guns/interact/rifle_boltback.ogg b/modular_ss220/reverts/return_prs/sound/gunsgalore/guns/interact/rifle_boltback.ogg similarity index 100% rename from modular_ss220/modules/return_prs/gunsgalore/sound/guns/interact/rifle_boltback.ogg rename to modular_ss220/reverts/return_prs/sound/gunsgalore/guns/interact/rifle_boltback.ogg diff --git a/modular_ss220/modules/return_prs/gunsgalore/sound/guns/interact/rifle_boltforward.ogg b/modular_ss220/reverts/return_prs/sound/gunsgalore/guns/interact/rifle_boltforward.ogg similarity index 100% rename from modular_ss220/modules/return_prs/gunsgalore/sound/guns/interact/rifle_boltforward.ogg rename to modular_ss220/reverts/return_prs/sound/gunsgalore/guns/interact/rifle_boltforward.ogg diff --git a/modular_ss220/modules/return_prs/gunsgalore/sound/guns/interact/rifle_load.ogg b/modular_ss220/reverts/return_prs/sound/gunsgalore/guns/interact/rifle_load.ogg similarity index 100% rename from modular_ss220/modules/return_prs/gunsgalore/sound/guns/interact/rifle_load.ogg rename to modular_ss220/reverts/return_prs/sound/gunsgalore/guns/interact/rifle_load.ogg diff --git a/modular_ss220/modules/return_prs/gunsgalore/sound/guns/interact/scar_cock.ogg b/modular_ss220/reverts/return_prs/sound/gunsgalore/guns/interact/scar_cock.ogg similarity index 100% rename from modular_ss220/modules/return_prs/gunsgalore/sound/guns/interact/scar_cock.ogg rename to modular_ss220/reverts/return_prs/sound/gunsgalore/guns/interact/scar_cock.ogg diff --git a/modular_ss220/modules/return_prs/gunsgalore/sound/guns/interact/scar_mag_in.ogg b/modular_ss220/reverts/return_prs/sound/gunsgalore/guns/interact/scar_mag_in.ogg similarity index 100% rename from modular_ss220/modules/return_prs/gunsgalore/sound/guns/interact/scar_mag_in.ogg rename to modular_ss220/reverts/return_prs/sound/gunsgalore/guns/interact/scar_mag_in.ogg diff --git a/modular_ss220/modules/return_prs/gunsgalore/sound/guns/interact/scar_mag_out.ogg b/modular_ss220/reverts/return_prs/sound/gunsgalore/guns/interact/scar_mag_out.ogg similarity index 100% rename from modular_ss220/modules/return_prs/gunsgalore/sound/guns/interact/scar_mag_out.ogg rename to modular_ss220/reverts/return_prs/sound/gunsgalore/guns/interact/scar_mag_out.ogg diff --git a/modular_ss220/modules/return_prs/gunsgalore/sound/guns/interact/selector.ogg b/modular_ss220/reverts/return_prs/sound/gunsgalore/guns/interact/selector.ogg similarity index 100% rename from modular_ss220/modules/return_prs/gunsgalore/sound/guns/interact/selector.ogg rename to modular_ss220/reverts/return_prs/sound/gunsgalore/guns/interact/selector.ogg diff --git a/modular_ss220/modules/return_prs/gunsgalore/sound/guns/interact/sfrifle_cock.ogg b/modular_ss220/reverts/return_prs/sound/gunsgalore/guns/interact/sfrifle_cock.ogg similarity index 100% rename from modular_ss220/modules/return_prs/gunsgalore/sound/guns/interact/sfrifle_cock.ogg rename to modular_ss220/reverts/return_prs/sound/gunsgalore/guns/interact/sfrifle_cock.ogg diff --git a/modular_ss220/modules/return_prs/gunsgalore/sound/guns/interact/sfrifle_magin.ogg b/modular_ss220/reverts/return_prs/sound/gunsgalore/guns/interact/sfrifle_magin.ogg similarity index 100% rename from modular_ss220/modules/return_prs/gunsgalore/sound/guns/interact/sfrifle_magin.ogg rename to modular_ss220/reverts/return_prs/sound/gunsgalore/guns/interact/sfrifle_magin.ogg diff --git a/modular_ss220/modules/return_prs/gunsgalore/sound/guns/interact/sfrifle_magout.ogg b/modular_ss220/reverts/return_prs/sound/gunsgalore/guns/interact/sfrifle_magout.ogg similarity index 100% rename from modular_ss220/modules/return_prs/gunsgalore/sound/guns/interact/sfrifle_magout.ogg rename to modular_ss220/reverts/return_prs/sound/gunsgalore/guns/interact/sfrifle_magout.ogg diff --git a/modular_ss220/modules/return_prs/gunsgalore/sound/guns/interact/shotgun_instert.ogg b/modular_ss220/reverts/return_prs/sound/gunsgalore/guns/interact/shotgun_instert.ogg similarity index 100% rename from modular_ss220/modules/return_prs/gunsgalore/sound/guns/interact/shotgun_instert.ogg rename to modular_ss220/reverts/return_prs/sound/gunsgalore/guns/interact/shotgun_instert.ogg diff --git a/modular_ss220/modules/return_prs/gunsgalore/sound/guns/interact/smg_cock.ogg b/modular_ss220/reverts/return_prs/sound/gunsgalore/guns/interact/smg_cock.ogg similarity index 100% rename from modular_ss220/modules/return_prs/gunsgalore/sound/guns/interact/smg_cock.ogg rename to modular_ss220/reverts/return_prs/sound/gunsgalore/guns/interact/smg_cock.ogg diff --git a/modular_ss220/modules/return_prs/gunsgalore/sound/guns/interact/smg_magin.ogg b/modular_ss220/reverts/return_prs/sound/gunsgalore/guns/interact/smg_magin.ogg similarity index 100% rename from modular_ss220/modules/return_prs/gunsgalore/sound/guns/interact/smg_magin.ogg rename to modular_ss220/reverts/return_prs/sound/gunsgalore/guns/interact/smg_magin.ogg diff --git a/modular_ss220/modules/return_prs/gunsgalore/sound/guns/interact/smg_magout.ogg b/modular_ss220/reverts/return_prs/sound/gunsgalore/guns/interact/smg_magout.ogg similarity index 100% rename from modular_ss220/modules/return_prs/gunsgalore/sound/guns/interact/smg_magout.ogg rename to modular_ss220/reverts/return_prs/sound/gunsgalore/guns/interact/smg_magout.ogg diff --git a/modular_ss220/modules/return_prs/gunsgalore/sound/impact/impact_flesh_01.ogg b/modular_ss220/reverts/return_prs/sound/gunsgalore/impact/impact_flesh_01.ogg similarity index 100% rename from modular_ss220/modules/return_prs/gunsgalore/sound/impact/impact_flesh_01.ogg rename to modular_ss220/reverts/return_prs/sound/gunsgalore/impact/impact_flesh_01.ogg diff --git a/modular_ss220/modules/return_prs/gunsgalore/sound/impact/impact_flesh_02.ogg b/modular_ss220/reverts/return_prs/sound/gunsgalore/impact/impact_flesh_02.ogg similarity index 100% rename from modular_ss220/modules/return_prs/gunsgalore/sound/impact/impact_flesh_02.ogg rename to modular_ss220/reverts/return_prs/sound/gunsgalore/impact/impact_flesh_02.ogg diff --git a/modular_ss220/modules/return_prs/gunsgalore/sound/impact/impact_flesh_03.ogg b/modular_ss220/reverts/return_prs/sound/gunsgalore/impact/impact_flesh_03.ogg similarity index 100% rename from modular_ss220/modules/return_prs/gunsgalore/sound/impact/impact_flesh_03.ogg rename to modular_ss220/reverts/return_prs/sound/gunsgalore/impact/impact_flesh_03.ogg diff --git a/modular_ss220/modules/return_prs/gunsgalore/sound/impact/impact_flesh_04.ogg b/modular_ss220/reverts/return_prs/sound/gunsgalore/impact/impact_flesh_04.ogg similarity index 100% rename from modular_ss220/modules/return_prs/gunsgalore/sound/impact/impact_flesh_04.ogg rename to modular_ss220/reverts/return_prs/sound/gunsgalore/impact/impact_flesh_04.ogg diff --git a/modular_ss220/modules/return_prs/gunsgalore/sound/impact/impact_flesh_05.ogg b/modular_ss220/reverts/return_prs/sound/gunsgalore/impact/impact_flesh_05.ogg similarity index 100% rename from modular_ss220/modules/return_prs/gunsgalore/sound/impact/impact_flesh_05.ogg rename to modular_ss220/reverts/return_prs/sound/gunsgalore/impact/impact_flesh_05.ogg diff --git a/modular_ss220/modules/return_prs/gunsgalore/sound/impact/impact_flesh_06.ogg b/modular_ss220/reverts/return_prs/sound/gunsgalore/impact/impact_flesh_06.ogg similarity index 100% rename from modular_ss220/modules/return_prs/gunsgalore/sound/impact/impact_flesh_06.ogg rename to modular_ss220/reverts/return_prs/sound/gunsgalore/impact/impact_flesh_06.ogg diff --git a/modular_ss220/modules/return_prs/gunsgalore/sound/impact/impact_flesh_07.ogg b/modular_ss220/reverts/return_prs/sound/gunsgalore/impact/impact_flesh_07.ogg similarity index 100% rename from modular_ss220/modules/return_prs/gunsgalore/sound/impact/impact_flesh_07.ogg rename to modular_ss220/reverts/return_prs/sound/gunsgalore/impact/impact_flesh_07.ogg diff --git a/modular_ss220/modules/return_prs/gunsgalore/sound/impact/impact_flesh_08.ogg b/modular_ss220/reverts/return_prs/sound/gunsgalore/impact/impact_flesh_08.ogg similarity index 100% rename from modular_ss220/modules/return_prs/gunsgalore/sound/impact/impact_flesh_08.ogg rename to modular_ss220/reverts/return_prs/sound/gunsgalore/impact/impact_flesh_08.ogg diff --git a/modular_ss220/modules/return_prs/gunsgalore/sound/impact/impact_flesh_09.ogg b/modular_ss220/reverts/return_prs/sound/gunsgalore/impact/impact_flesh_09.ogg similarity index 100% rename from modular_ss220/modules/return_prs/gunsgalore/sound/impact/impact_flesh_09.ogg rename to modular_ss220/reverts/return_prs/sound/gunsgalore/impact/impact_flesh_09.ogg diff --git a/modular_ss220/modules/return_prs/gunsgalore/sound/impact/impact_glass_01.ogg b/modular_ss220/reverts/return_prs/sound/gunsgalore/impact/impact_glass_01.ogg similarity index 100% rename from modular_ss220/modules/return_prs/gunsgalore/sound/impact/impact_glass_01.ogg rename to modular_ss220/reverts/return_prs/sound/gunsgalore/impact/impact_glass_01.ogg diff --git a/modular_ss220/modules/return_prs/gunsgalore/sound/impact/impact_glass_02.ogg b/modular_ss220/reverts/return_prs/sound/gunsgalore/impact/impact_glass_02.ogg similarity index 100% rename from modular_ss220/modules/return_prs/gunsgalore/sound/impact/impact_glass_02.ogg rename to modular_ss220/reverts/return_prs/sound/gunsgalore/impact/impact_glass_02.ogg diff --git a/modular_ss220/modules/return_prs/gunsgalore/sound/impact/impact_glass_03.ogg b/modular_ss220/reverts/return_prs/sound/gunsgalore/impact/impact_glass_03.ogg similarity index 100% rename from modular_ss220/modules/return_prs/gunsgalore/sound/impact/impact_glass_03.ogg rename to modular_ss220/reverts/return_prs/sound/gunsgalore/impact/impact_glass_03.ogg diff --git a/modular_ss220/modules/return_prs/gunsgalore/sound/impact/impact_glass_04.ogg b/modular_ss220/reverts/return_prs/sound/gunsgalore/impact/impact_glass_04.ogg similarity index 100% rename from modular_ss220/modules/return_prs/gunsgalore/sound/impact/impact_glass_04.ogg rename to modular_ss220/reverts/return_prs/sound/gunsgalore/impact/impact_glass_04.ogg diff --git a/modular_ss220/modules/return_prs/gunsgalore/sound/impact/impact_glass_05.ogg b/modular_ss220/reverts/return_prs/sound/gunsgalore/impact/impact_glass_05.ogg similarity index 100% rename from modular_ss220/modules/return_prs/gunsgalore/sound/impact/impact_glass_05.ogg rename to modular_ss220/reverts/return_prs/sound/gunsgalore/impact/impact_glass_05.ogg diff --git a/modular_ss220/modules/return_prs/gunsgalore/sound/impact/impact_glass_06.ogg b/modular_ss220/reverts/return_prs/sound/gunsgalore/impact/impact_glass_06.ogg similarity index 100% rename from modular_ss220/modules/return_prs/gunsgalore/sound/impact/impact_glass_06.ogg rename to modular_ss220/reverts/return_prs/sound/gunsgalore/impact/impact_glass_06.ogg diff --git a/modular_ss220/modules/return_prs/gunsgalore/sound/impact/impact_glass_07.ogg b/modular_ss220/reverts/return_prs/sound/gunsgalore/impact/impact_glass_07.ogg similarity index 100% rename from modular_ss220/modules/return_prs/gunsgalore/sound/impact/impact_glass_07.ogg rename to modular_ss220/reverts/return_prs/sound/gunsgalore/impact/impact_glass_07.ogg diff --git a/modular_ss220/modules/return_prs/gunsgalore/sound/impact/impact_glass_08.ogg b/modular_ss220/reverts/return_prs/sound/gunsgalore/impact/impact_glass_08.ogg similarity index 100% rename from modular_ss220/modules/return_prs/gunsgalore/sound/impact/impact_glass_08.ogg rename to modular_ss220/reverts/return_prs/sound/gunsgalore/impact/impact_glass_08.ogg diff --git a/modular_ss220/modules/return_prs/gunsgalore/sound/impact/impact_glass_09.ogg b/modular_ss220/reverts/return_prs/sound/gunsgalore/impact/impact_glass_09.ogg similarity index 100% rename from modular_ss220/modules/return_prs/gunsgalore/sound/impact/impact_glass_09.ogg rename to modular_ss220/reverts/return_prs/sound/gunsgalore/impact/impact_glass_09.ogg diff --git a/modular_ss220/modules/return_prs/gunsgalore/sound/impact/impact_glass_10.ogg b/modular_ss220/reverts/return_prs/sound/gunsgalore/impact/impact_glass_10.ogg similarity index 100% rename from modular_ss220/modules/return_prs/gunsgalore/sound/impact/impact_glass_10.ogg rename to modular_ss220/reverts/return_prs/sound/gunsgalore/impact/impact_glass_10.ogg diff --git a/modular_ss220/modules/return_prs/gunsgalore/sound/impact/impact_masonry_01.ogg b/modular_ss220/reverts/return_prs/sound/gunsgalore/impact/impact_masonry_01.ogg similarity index 100% rename from modular_ss220/modules/return_prs/gunsgalore/sound/impact/impact_masonry_01.ogg rename to modular_ss220/reverts/return_prs/sound/gunsgalore/impact/impact_masonry_01.ogg diff --git a/modular_ss220/modules/return_prs/gunsgalore/sound/impact/impact_masonry_02.ogg b/modular_ss220/reverts/return_prs/sound/gunsgalore/impact/impact_masonry_02.ogg similarity index 100% rename from modular_ss220/modules/return_prs/gunsgalore/sound/impact/impact_masonry_02.ogg rename to modular_ss220/reverts/return_prs/sound/gunsgalore/impact/impact_masonry_02.ogg diff --git a/modular_ss220/modules/return_prs/gunsgalore/sound/impact/impact_masonry_03.ogg b/modular_ss220/reverts/return_prs/sound/gunsgalore/impact/impact_masonry_03.ogg similarity index 100% rename from modular_ss220/modules/return_prs/gunsgalore/sound/impact/impact_masonry_03.ogg rename to modular_ss220/reverts/return_prs/sound/gunsgalore/impact/impact_masonry_03.ogg diff --git a/modular_ss220/modules/return_prs/gunsgalore/sound/impact/impact_masonry_04.ogg b/modular_ss220/reverts/return_prs/sound/gunsgalore/impact/impact_masonry_04.ogg similarity index 100% rename from modular_ss220/modules/return_prs/gunsgalore/sound/impact/impact_masonry_04.ogg rename to modular_ss220/reverts/return_prs/sound/gunsgalore/impact/impact_masonry_04.ogg diff --git a/modular_ss220/modules/return_prs/gunsgalore/sound/impact/impact_masonry_05.ogg b/modular_ss220/reverts/return_prs/sound/gunsgalore/impact/impact_masonry_05.ogg similarity index 100% rename from modular_ss220/modules/return_prs/gunsgalore/sound/impact/impact_masonry_05.ogg rename to modular_ss220/reverts/return_prs/sound/gunsgalore/impact/impact_masonry_05.ogg diff --git a/modular_ss220/modules/return_prs/gunsgalore/sound/impact/impact_masonry_06.ogg b/modular_ss220/reverts/return_prs/sound/gunsgalore/impact/impact_masonry_06.ogg similarity index 100% rename from modular_ss220/modules/return_prs/gunsgalore/sound/impact/impact_masonry_06.ogg rename to modular_ss220/reverts/return_prs/sound/gunsgalore/impact/impact_masonry_06.ogg diff --git a/modular_ss220/modules/return_prs/gunsgalore/sound/impact/impact_masonry_07.ogg b/modular_ss220/reverts/return_prs/sound/gunsgalore/impact/impact_masonry_07.ogg similarity index 100% rename from modular_ss220/modules/return_prs/gunsgalore/sound/impact/impact_masonry_07.ogg rename to modular_ss220/reverts/return_prs/sound/gunsgalore/impact/impact_masonry_07.ogg diff --git a/modular_ss220/modules/return_prs/gunsgalore/sound/impact/impact_masonry_08.ogg b/modular_ss220/reverts/return_prs/sound/gunsgalore/impact/impact_masonry_08.ogg similarity index 100% rename from modular_ss220/modules/return_prs/gunsgalore/sound/impact/impact_masonry_08.ogg rename to modular_ss220/reverts/return_prs/sound/gunsgalore/impact/impact_masonry_08.ogg diff --git a/modular_ss220/modules/return_prs/gunsgalore/sound/impact/impact_masonry_09.ogg b/modular_ss220/reverts/return_prs/sound/gunsgalore/impact/impact_masonry_09.ogg similarity index 100% rename from modular_ss220/modules/return_prs/gunsgalore/sound/impact/impact_masonry_09.ogg rename to modular_ss220/reverts/return_prs/sound/gunsgalore/impact/impact_masonry_09.ogg diff --git a/modular_ss220/modules/return_prs/gunsgalore/sound/impact/impact_masonry_10.ogg b/modular_ss220/reverts/return_prs/sound/gunsgalore/impact/impact_masonry_10.ogg similarity index 100% rename from modular_ss220/modules/return_prs/gunsgalore/sound/impact/impact_masonry_10.ogg rename to modular_ss220/reverts/return_prs/sound/gunsgalore/impact/impact_masonry_10.ogg diff --git a/modular_ss220/modules/return_prs/gunsgalore/sound/impact/impact_metal_01.ogg b/modular_ss220/reverts/return_prs/sound/gunsgalore/impact/impact_metal_01.ogg similarity index 100% rename from modular_ss220/modules/return_prs/gunsgalore/sound/impact/impact_metal_01.ogg rename to modular_ss220/reverts/return_prs/sound/gunsgalore/impact/impact_metal_01.ogg diff --git a/modular_ss220/modules/return_prs/gunsgalore/sound/impact/impact_metal_02.ogg b/modular_ss220/reverts/return_prs/sound/gunsgalore/impact/impact_metal_02.ogg similarity index 100% rename from modular_ss220/modules/return_prs/gunsgalore/sound/impact/impact_metal_02.ogg rename to modular_ss220/reverts/return_prs/sound/gunsgalore/impact/impact_metal_02.ogg diff --git a/modular_ss220/modules/return_prs/gunsgalore/sound/impact/impact_metal_03.ogg b/modular_ss220/reverts/return_prs/sound/gunsgalore/impact/impact_metal_03.ogg similarity index 100% rename from modular_ss220/modules/return_prs/gunsgalore/sound/impact/impact_metal_03.ogg rename to modular_ss220/reverts/return_prs/sound/gunsgalore/impact/impact_metal_03.ogg diff --git a/modular_ss220/modules/return_prs/gunsgalore/sound/impact/impact_metal_04.ogg b/modular_ss220/reverts/return_prs/sound/gunsgalore/impact/impact_metal_04.ogg similarity index 100% rename from modular_ss220/modules/return_prs/gunsgalore/sound/impact/impact_metal_04.ogg rename to modular_ss220/reverts/return_prs/sound/gunsgalore/impact/impact_metal_04.ogg diff --git a/modular_ss220/modules/return_prs/gunsgalore/sound/impact/impact_metal_05.ogg b/modular_ss220/reverts/return_prs/sound/gunsgalore/impact/impact_metal_05.ogg similarity index 100% rename from modular_ss220/modules/return_prs/gunsgalore/sound/impact/impact_metal_05.ogg rename to modular_ss220/reverts/return_prs/sound/gunsgalore/impact/impact_metal_05.ogg diff --git a/modular_ss220/modules/return_prs/gunsgalore/sound/impact/impact_metal_06.ogg b/modular_ss220/reverts/return_prs/sound/gunsgalore/impact/impact_metal_06.ogg similarity index 100% rename from modular_ss220/modules/return_prs/gunsgalore/sound/impact/impact_metal_06.ogg rename to modular_ss220/reverts/return_prs/sound/gunsgalore/impact/impact_metal_06.ogg diff --git a/modular_ss220/modules/return_prs/gunsgalore/sound/impact/impact_metal_07.ogg b/modular_ss220/reverts/return_prs/sound/gunsgalore/impact/impact_metal_07.ogg similarity index 100% rename from modular_ss220/modules/return_prs/gunsgalore/sound/impact/impact_metal_07.ogg rename to modular_ss220/reverts/return_prs/sound/gunsgalore/impact/impact_metal_07.ogg diff --git a/modular_ss220/modules/return_prs/gunsgalore/sound/impact/impact_metal_08.ogg b/modular_ss220/reverts/return_prs/sound/gunsgalore/impact/impact_metal_08.ogg similarity index 100% rename from modular_ss220/modules/return_prs/gunsgalore/sound/impact/impact_metal_08.ogg rename to modular_ss220/reverts/return_prs/sound/gunsgalore/impact/impact_metal_08.ogg diff --git a/modular_ss220/modules/return_prs/gunsgalore/sound/impact/impact_metal_09.ogg b/modular_ss220/reverts/return_prs/sound/gunsgalore/impact/impact_metal_09.ogg similarity index 100% rename from modular_ss220/modules/return_prs/gunsgalore/sound/impact/impact_metal_09.ogg rename to modular_ss220/reverts/return_prs/sound/gunsgalore/impact/impact_metal_09.ogg diff --git a/modular_ss220/modules/return_prs/gunsgalore/sound/impact/impact_metal_10.ogg b/modular_ss220/reverts/return_prs/sound/gunsgalore/impact/impact_metal_10.ogg similarity index 100% rename from modular_ss220/modules/return_prs/gunsgalore/sound/impact/impact_metal_10.ogg rename to modular_ss220/reverts/return_prs/sound/gunsgalore/impact/impact_metal_10.ogg diff --git a/modular_ss220/modules/return_prs/gunsgalore/sound/impact/impact_metal_11.ogg b/modular_ss220/reverts/return_prs/sound/gunsgalore/impact/impact_metal_11.ogg similarity index 100% rename from modular_ss220/modules/return_prs/gunsgalore/sound/impact/impact_metal_11.ogg rename to modular_ss220/reverts/return_prs/sound/gunsgalore/impact/impact_metal_11.ogg diff --git a/modular_ss220/modules/return_prs/gunsgalore/sound/impact/impact_metal_12.ogg b/modular_ss220/reverts/return_prs/sound/gunsgalore/impact/impact_metal_12.ogg similarity index 100% rename from modular_ss220/modules/return_prs/gunsgalore/sound/impact/impact_metal_12.ogg rename to modular_ss220/reverts/return_prs/sound/gunsgalore/impact/impact_metal_12.ogg diff --git a/modular_ss220/modules/return_prs/gunsgalore/sound/impact/impact_metal_13.ogg b/modular_ss220/reverts/return_prs/sound/gunsgalore/impact/impact_metal_13.ogg similarity index 100% rename from modular_ss220/modules/return_prs/gunsgalore/sound/impact/impact_metal_13.ogg rename to modular_ss220/reverts/return_prs/sound/gunsgalore/impact/impact_metal_13.ogg diff --git a/modular_ss220/modules/return_prs/gunsgalore/sound/impact/impact_metal_14.ogg b/modular_ss220/reverts/return_prs/sound/gunsgalore/impact/impact_metal_14.ogg similarity index 100% rename from modular_ss220/modules/return_prs/gunsgalore/sound/impact/impact_metal_14.ogg rename to modular_ss220/reverts/return_prs/sound/gunsgalore/impact/impact_metal_14.ogg diff --git a/modular_ss220/modules/return_prs/gunsgalore/sound/impact/impact_metal_15.ogg b/modular_ss220/reverts/return_prs/sound/gunsgalore/impact/impact_metal_15.ogg similarity index 100% rename from modular_ss220/modules/return_prs/gunsgalore/sound/impact/impact_metal_15.ogg rename to modular_ss220/reverts/return_prs/sound/gunsgalore/impact/impact_metal_15.ogg diff --git a/modular_ss220/modules/return_prs/gunsgalore/sound/impact/impact_metal_16.ogg b/modular_ss220/reverts/return_prs/sound/gunsgalore/impact/impact_metal_16.ogg similarity index 100% rename from modular_ss220/modules/return_prs/gunsgalore/sound/impact/impact_metal_16.ogg rename to modular_ss220/reverts/return_prs/sound/gunsgalore/impact/impact_metal_16.ogg diff --git a/modular_ss220/modules/return_prs/gunsgalore/sound/impact/impact_metal_17.ogg b/modular_ss220/reverts/return_prs/sound/gunsgalore/impact/impact_metal_17.ogg similarity index 100% rename from modular_ss220/modules/return_prs/gunsgalore/sound/impact/impact_metal_17.ogg rename to modular_ss220/reverts/return_prs/sound/gunsgalore/impact/impact_metal_17.ogg diff --git a/modular_ss220/modules/return_prs/gunsgalore/sound/impact/impact_snow_01.ogg b/modular_ss220/reverts/return_prs/sound/gunsgalore/impact/impact_snow_01.ogg similarity index 100% rename from modular_ss220/modules/return_prs/gunsgalore/sound/impact/impact_snow_01.ogg rename to modular_ss220/reverts/return_prs/sound/gunsgalore/impact/impact_snow_01.ogg diff --git a/modular_ss220/modules/return_prs/gunsgalore/sound/impact/impact_snow_02.ogg b/modular_ss220/reverts/return_prs/sound/gunsgalore/impact/impact_snow_02.ogg similarity index 100% rename from modular_ss220/modules/return_prs/gunsgalore/sound/impact/impact_snow_02.ogg rename to modular_ss220/reverts/return_prs/sound/gunsgalore/impact/impact_snow_02.ogg diff --git a/modular_ss220/modules/return_prs/gunsgalore/sound/impact/impact_snow_03.ogg b/modular_ss220/reverts/return_prs/sound/gunsgalore/impact/impact_snow_03.ogg similarity index 100% rename from modular_ss220/modules/return_prs/gunsgalore/sound/impact/impact_snow_03.ogg rename to modular_ss220/reverts/return_prs/sound/gunsgalore/impact/impact_snow_03.ogg diff --git a/modular_ss220/modules/return_prs/gunsgalore/sound/impact/impact_snow_04.ogg b/modular_ss220/reverts/return_prs/sound/gunsgalore/impact/impact_snow_04.ogg similarity index 100% rename from modular_ss220/modules/return_prs/gunsgalore/sound/impact/impact_snow_04.ogg rename to modular_ss220/reverts/return_prs/sound/gunsgalore/impact/impact_snow_04.ogg diff --git a/modular_ss220/modules/return_prs/gunsgalore/sound/impact/impact_snow_05.ogg b/modular_ss220/reverts/return_prs/sound/gunsgalore/impact/impact_snow_05.ogg similarity index 100% rename from modular_ss220/modules/return_prs/gunsgalore/sound/impact/impact_snow_05.ogg rename to modular_ss220/reverts/return_prs/sound/gunsgalore/impact/impact_snow_05.ogg diff --git a/modular_ss220/modules/return_prs/gunsgalore/sound/impact/impact_snow_06.ogg b/modular_ss220/reverts/return_prs/sound/gunsgalore/impact/impact_snow_06.ogg similarity index 100% rename from modular_ss220/modules/return_prs/gunsgalore/sound/impact/impact_snow_06.ogg rename to modular_ss220/reverts/return_prs/sound/gunsgalore/impact/impact_snow_06.ogg diff --git a/modular_ss220/modules/return_prs/gunsgalore/sound/impact/impact_snow_07.ogg b/modular_ss220/reverts/return_prs/sound/gunsgalore/impact/impact_snow_07.ogg similarity index 100% rename from modular_ss220/modules/return_prs/gunsgalore/sound/impact/impact_snow_07.ogg rename to modular_ss220/reverts/return_prs/sound/gunsgalore/impact/impact_snow_07.ogg diff --git a/modular_ss220/modules/return_prs/gunsgalore/sound/impact/impact_snow_08.ogg b/modular_ss220/reverts/return_prs/sound/gunsgalore/impact/impact_snow_08.ogg similarity index 100% rename from modular_ss220/modules/return_prs/gunsgalore/sound/impact/impact_snow_08.ogg rename to modular_ss220/reverts/return_prs/sound/gunsgalore/impact/impact_snow_08.ogg diff --git a/modular_ss220/modules/return_prs/gunsgalore/sound/impact/impact_snow_09.ogg b/modular_ss220/reverts/return_prs/sound/gunsgalore/impact/impact_snow_09.ogg similarity index 100% rename from modular_ss220/modules/return_prs/gunsgalore/sound/impact/impact_snow_09.ogg rename to modular_ss220/reverts/return_prs/sound/gunsgalore/impact/impact_snow_09.ogg diff --git a/modular_ss220/modules/return_prs/gunsgalore/sound/impact/impact_snow_10.ogg b/modular_ss220/reverts/return_prs/sound/gunsgalore/impact/impact_snow_10.ogg similarity index 100% rename from modular_ss220/modules/return_prs/gunsgalore/sound/impact/impact_snow_10.ogg rename to modular_ss220/reverts/return_prs/sound/gunsgalore/impact/impact_snow_10.ogg diff --git a/modular_ss220/modules/return_prs/gunsgalore/sound/impact/impact_wood_01.ogg b/modular_ss220/reverts/return_prs/sound/gunsgalore/impact/impact_wood_01.ogg similarity index 100% rename from modular_ss220/modules/return_prs/gunsgalore/sound/impact/impact_wood_01.ogg rename to modular_ss220/reverts/return_prs/sound/gunsgalore/impact/impact_wood_01.ogg diff --git a/modular_ss220/modules/return_prs/gunsgalore/sound/impact/impact_wood_02.ogg b/modular_ss220/reverts/return_prs/sound/gunsgalore/impact/impact_wood_02.ogg similarity index 100% rename from modular_ss220/modules/return_prs/gunsgalore/sound/impact/impact_wood_02.ogg rename to modular_ss220/reverts/return_prs/sound/gunsgalore/impact/impact_wood_02.ogg diff --git a/modular_ss220/modules/return_prs/gunsgalore/sound/impact/impact_wood_03.ogg b/modular_ss220/reverts/return_prs/sound/gunsgalore/impact/impact_wood_03.ogg similarity index 100% rename from modular_ss220/modules/return_prs/gunsgalore/sound/impact/impact_wood_03.ogg rename to modular_ss220/reverts/return_prs/sound/gunsgalore/impact/impact_wood_03.ogg diff --git a/modular_ss220/modules/return_prs/gunsgalore/sound/impact/impact_wood_04.ogg b/modular_ss220/reverts/return_prs/sound/gunsgalore/impact/impact_wood_04.ogg similarity index 100% rename from modular_ss220/modules/return_prs/gunsgalore/sound/impact/impact_wood_04.ogg rename to modular_ss220/reverts/return_prs/sound/gunsgalore/impact/impact_wood_04.ogg diff --git a/modular_ss220/modules/return_prs/gunsgalore/sound/impact/impact_wood_05.ogg b/modular_ss220/reverts/return_prs/sound/gunsgalore/impact/impact_wood_05.ogg similarity index 100% rename from modular_ss220/modules/return_prs/gunsgalore/sound/impact/impact_wood_05.ogg rename to modular_ss220/reverts/return_prs/sound/gunsgalore/impact/impact_wood_05.ogg diff --git a/modular_ss220/modules/return_prs/gunsgalore/sound/impact/impact_wood_06.ogg b/modular_ss220/reverts/return_prs/sound/gunsgalore/impact/impact_wood_06.ogg similarity index 100% rename from modular_ss220/modules/return_prs/gunsgalore/sound/impact/impact_wood_06.ogg rename to modular_ss220/reverts/return_prs/sound/gunsgalore/impact/impact_wood_06.ogg diff --git a/modular_ss220/modules/return_prs/gunsgalore/sound/impact/impact_wood_07.ogg b/modular_ss220/reverts/return_prs/sound/gunsgalore/impact/impact_wood_07.ogg similarity index 100% rename from modular_ss220/modules/return_prs/gunsgalore/sound/impact/impact_wood_07.ogg rename to modular_ss220/reverts/return_prs/sound/gunsgalore/impact/impact_wood_07.ogg diff --git a/modular_ss220/modules/return_prs/gunsgalore/sound/impact/impact_wood_08.ogg b/modular_ss220/reverts/return_prs/sound/gunsgalore/impact/impact_wood_08.ogg similarity index 100% rename from modular_ss220/modules/return_prs/gunsgalore/sound/impact/impact_wood_08.ogg rename to modular_ss220/reverts/return_prs/sound/gunsgalore/impact/impact_wood_08.ogg diff --git a/modular_ss220/modules/return_prs/gunsgalore/sound/impact/impact_wood_09.ogg b/modular_ss220/reverts/return_prs/sound/gunsgalore/impact/impact_wood_09.ogg similarity index 100% rename from modular_ss220/modules/return_prs/gunsgalore/sound/impact/impact_wood_09.ogg rename to modular_ss220/reverts/return_prs/sound/gunsgalore/impact/impact_wood_09.ogg diff --git a/modular_ss220/modules/return_prs/gunsgalore/sound/impact/impact_wood_10.ogg b/modular_ss220/reverts/return_prs/sound/gunsgalore/impact/impact_wood_10.ogg similarity index 100% rename from modular_ss220/modules/return_prs/gunsgalore/sound/impact/impact_wood_10.ogg rename to modular_ss220/reverts/return_prs/sound/gunsgalore/impact/impact_wood_10.ogg diff --git a/modular_ss220/modules/return_prs/black_mesa/hev_suit/sound/hev/01_hev_logon.ogg b/modular_ss220/reverts/return_prs/sound/hev_suit/hev/01_hev_logon.ogg similarity index 100% rename from modular_ss220/modules/return_prs/black_mesa/hev_suit/sound/hev/01_hev_logon.ogg rename to modular_ss220/reverts/return_prs/sound/hev_suit/hev/01_hev_logon.ogg diff --git a/modular_ss220/modules/return_prs/black_mesa/hev_suit/sound/hev/02_powerarmor_on.ogg b/modular_ss220/reverts/return_prs/sound/hev_suit/hev/02_powerarmor_on.ogg similarity index 100% rename from modular_ss220/modules/return_prs/black_mesa/hev_suit/sound/hev/02_powerarmor_on.ogg rename to modular_ss220/reverts/return_prs/sound/hev_suit/hev/02_powerarmor_on.ogg diff --git a/modular_ss220/modules/return_prs/black_mesa/hev_suit/sound/hev/03_atmospherics_on.ogg b/modular_ss220/reverts/return_prs/sound/hev_suit/hev/03_atmospherics_on.ogg similarity index 100% rename from modular_ss220/modules/return_prs/black_mesa/hev_suit/sound/hev/03_atmospherics_on.ogg rename to modular_ss220/reverts/return_prs/sound/hev_suit/hev/03_atmospherics_on.ogg diff --git a/modular_ss220/modules/return_prs/black_mesa/hev_suit/sound/hev/04_vitalsigns_on.ogg b/modular_ss220/reverts/return_prs/sound/hev_suit/hev/04_vitalsigns_on.ogg similarity index 100% rename from modular_ss220/modules/return_prs/black_mesa/hev_suit/sound/hev/04_vitalsigns_on.ogg rename to modular_ss220/reverts/return_prs/sound/hev_suit/hev/04_vitalsigns_on.ogg diff --git a/modular_ss220/modules/return_prs/black_mesa/hev_suit/sound/hev/05_automedic_on.ogg b/modular_ss220/reverts/return_prs/sound/hev_suit/hev/05_automedic_on.ogg similarity index 100% rename from modular_ss220/modules/return_prs/black_mesa/hev_suit/sound/hev/05_automedic_on.ogg rename to modular_ss220/reverts/return_prs/sound/hev_suit/hev/05_automedic_on.ogg diff --git a/modular_ss220/modules/return_prs/black_mesa/hev_suit/sound/hev/06_weaponselect_on.ogg b/modular_ss220/reverts/return_prs/sound/hev_suit/hev/06_weaponselect_on.ogg similarity index 100% rename from modular_ss220/modules/return_prs/black_mesa/hev_suit/sound/hev/06_weaponselect_on.ogg rename to modular_ss220/reverts/return_prs/sound/hev_suit/hev/06_weaponselect_on.ogg diff --git a/modular_ss220/modules/return_prs/black_mesa/hev_suit/sound/hev/07_munitionview_on.ogg b/modular_ss220/reverts/return_prs/sound/hev_suit/hev/07_munitionview_on.ogg similarity index 100% rename from modular_ss220/modules/return_prs/black_mesa/hev_suit/sound/hev/07_munitionview_on.ogg rename to modular_ss220/reverts/return_prs/sound/hev_suit/hev/07_munitionview_on.ogg diff --git a/modular_ss220/modules/return_prs/black_mesa/hev_suit/sound/hev/08_communications_on.ogg b/modular_ss220/reverts/return_prs/sound/hev_suit/hev/08_communications_on.ogg similarity index 100% rename from modular_ss220/modules/return_prs/black_mesa/hev_suit/sound/hev/08_communications_on.ogg rename to modular_ss220/reverts/return_prs/sound/hev_suit/hev/08_communications_on.ogg diff --git a/modular_ss220/modules/return_prs/black_mesa/hev_suit/sound/hev/09_safe_day.ogg b/modular_ss220/reverts/return_prs/sound/hev_suit/hev/09_safe_day.ogg similarity index 100% rename from modular_ss220/modules/return_prs/black_mesa/hev_suit/sound/hev/09_safe_day.ogg rename to modular_ss220/reverts/return_prs/sound/hev_suit/hev/09_safe_day.ogg diff --git a/modular_ss220/modules/return_prs/black_mesa/hev_suit/sound/hev/_comma.ogg b/modular_ss220/reverts/return_prs/sound/hev_suit/hev/_comma.ogg similarity index 100% rename from modular_ss220/modules/return_prs/black_mesa/hev_suit/sound/hev/_comma.ogg rename to modular_ss220/reverts/return_prs/sound/hev_suit/hev/_comma.ogg diff --git a/modular_ss220/modules/return_prs/black_mesa/hev_suit/sound/hev/_period.ogg b/modular_ss220/reverts/return_prs/sound/hev_suit/hev/_period.ogg similarity index 100% rename from modular_ss220/modules/return_prs/black_mesa/hev_suit/sound/hev/_period.ogg rename to modular_ss220/reverts/return_prs/sound/hev_suit/hev/_period.ogg diff --git a/modular_ss220/modules/return_prs/black_mesa/hev_suit/sound/hev/acquired.ogg b/modular_ss220/reverts/return_prs/sound/hev_suit/hev/acquired.ogg similarity index 100% rename from modular_ss220/modules/return_prs/black_mesa/hev_suit/sound/hev/acquired.ogg rename to modular_ss220/reverts/return_prs/sound/hev_suit/hev/acquired.ogg diff --git a/modular_ss220/modules/return_prs/black_mesa/hev_suit/sound/hev/activated.ogg b/modular_ss220/reverts/return_prs/sound/hev_suit/hev/activated.ogg similarity index 100% rename from modular_ss220/modules/return_prs/black_mesa/hev_suit/sound/hev/activated.ogg rename to modular_ss220/reverts/return_prs/sound/hev_suit/hev/activated.ogg diff --git a/modular_ss220/modules/return_prs/black_mesa/hev_suit/sound/hev/ammo_depleted.ogg b/modular_ss220/reverts/return_prs/sound/hev_suit/hev/ammo_depleted.ogg similarity index 100% rename from modular_ss220/modules/return_prs/black_mesa/hev_suit/sound/hev/ammo_depleted.ogg rename to modular_ss220/reverts/return_prs/sound/hev_suit/hev/ammo_depleted.ogg diff --git a/modular_ss220/modules/return_prs/black_mesa/hev_suit/sound/hev/ammowarning.ogg b/modular_ss220/reverts/return_prs/sound/hev_suit/hev/ammowarning.ogg similarity index 100% rename from modular_ss220/modules/return_prs/black_mesa/hev_suit/sound/hev/ammowarning.ogg rename to modular_ss220/reverts/return_prs/sound/hev_suit/hev/ammowarning.ogg diff --git a/modular_ss220/modules/return_prs/black_mesa/hev_suit/sound/hev/anomalous_materials.mp4 b/modular_ss220/reverts/return_prs/sound/hev_suit/hev/anomalous_materials.mp4 similarity index 100% rename from modular_ss220/modules/return_prs/black_mesa/hev_suit/sound/hev/anomalous_materials.mp4 rename to modular_ss220/reverts/return_prs/sound/hev_suit/hev/anomalous_materials.mp4 diff --git a/modular_ss220/modules/return_prs/black_mesa/hev_suit/sound/hev/anomalous_materials.ogg b/modular_ss220/reverts/return_prs/sound/hev_suit/hev/anomalous_materials.ogg similarity index 100% rename from modular_ss220/modules/return_prs/black_mesa/hev_suit/sound/hev/anomalous_materials.ogg rename to modular_ss220/reverts/return_prs/sound/hev_suit/hev/anomalous_materials.ogg diff --git a/modular_ss220/modules/return_prs/black_mesa/hev_suit/sound/hev/antidote_shot.ogg b/modular_ss220/reverts/return_prs/sound/hev_suit/hev/antidote_shot.ogg similarity index 100% rename from modular_ss220/modules/return_prs/black_mesa/hev_suit/sound/hev/antidote_shot.ogg rename to modular_ss220/reverts/return_prs/sound/hev_suit/hev/antidote_shot.ogg diff --git a/modular_ss220/modules/return_prs/black_mesa/hev_suit/sound/hev/antitoxin_shot.ogg b/modular_ss220/reverts/return_prs/sound/hev_suit/hev/antitoxin_shot.ogg similarity index 100% rename from modular_ss220/modules/return_prs/black_mesa/hev_suit/sound/hev/antitoxin_shot.ogg rename to modular_ss220/reverts/return_prs/sound/hev_suit/hev/antitoxin_shot.ogg diff --git a/modular_ss220/modules/return_prs/black_mesa/hev_suit/sound/hev/beep.ogg b/modular_ss220/reverts/return_prs/sound/hev_suit/hev/beep.ogg similarity index 100% rename from modular_ss220/modules/return_prs/black_mesa/hev_suit/sound/hev/beep.ogg rename to modular_ss220/reverts/return_prs/sound/hev_suit/hev/beep.ogg diff --git a/modular_ss220/modules/return_prs/black_mesa/hev_suit/sound/hev/bell.ogg b/modular_ss220/reverts/return_prs/sound/hev_suit/hev/bell.ogg similarity index 100% rename from modular_ss220/modules/return_prs/black_mesa/hev_suit/sound/hev/bell.ogg rename to modular_ss220/reverts/return_prs/sound/hev_suit/hev/bell.ogg diff --git a/modular_ss220/modules/return_prs/black_mesa/hev_suit/sound/hev/biohazard_detected.ogg b/modular_ss220/reverts/return_prs/sound/hev_suit/hev/biohazard_detected.ogg similarity index 100% rename from modular_ss220/modules/return_prs/black_mesa/hev_suit/sound/hev/biohazard_detected.ogg rename to modular_ss220/reverts/return_prs/sound/hev_suit/hev/biohazard_detected.ogg diff --git a/modular_ss220/modules/return_prs/black_mesa/hev_suit/sound/hev/blip.ogg b/modular_ss220/reverts/return_prs/sound/hev_suit/hev/blip.ogg similarity index 100% rename from modular_ss220/modules/return_prs/black_mesa/hev_suit/sound/hev/blip.ogg rename to modular_ss220/reverts/return_prs/sound/hev_suit/hev/blip.ogg diff --git a/modular_ss220/modules/return_prs/black_mesa/hev_suit/sound/hev/blood_loss.ogg b/modular_ss220/reverts/return_prs/sound/hev_suit/hev/blood_loss.ogg similarity index 100% rename from modular_ss220/modules/return_prs/black_mesa/hev_suit/sound/hev/blood_loss.ogg rename to modular_ss220/reverts/return_prs/sound/hev_suit/hev/blood_loss.ogg diff --git a/modular_ss220/modules/return_prs/black_mesa/hev_suit/sound/hev/blood_toxins.ogg b/modular_ss220/reverts/return_prs/sound/hev_suit/hev/blood_toxins.ogg similarity index 100% rename from modular_ss220/modules/return_prs/black_mesa/hev_suit/sound/hev/blood_toxins.ogg rename to modular_ss220/reverts/return_prs/sound/hev_suit/hev/blood_toxins.ogg diff --git a/modular_ss220/modules/return_prs/black_mesa/hev_suit/sound/hev/boop.ogg b/modular_ss220/reverts/return_prs/sound/hev_suit/hev/boop.ogg similarity index 100% rename from modular_ss220/modules/return_prs/black_mesa/hev_suit/sound/hev/boop.ogg rename to modular_ss220/reverts/return_prs/sound/hev_suit/hev/boop.ogg diff --git a/modular_ss220/modules/return_prs/black_mesa/hev_suit/sound/hev/chemical_detected.ogg b/modular_ss220/reverts/return_prs/sound/hev_suit/hev/chemical_detected.ogg similarity index 100% rename from modular_ss220/modules/return_prs/black_mesa/hev_suit/sound/hev/chemical_detected.ogg rename to modular_ss220/reverts/return_prs/sound/hev_suit/hev/chemical_detected.ogg diff --git a/modular_ss220/modules/return_prs/black_mesa/hev_suit/sound/hev/eighty.ogg b/modular_ss220/reverts/return_prs/sound/hev_suit/hev/eighty.ogg similarity index 100% rename from modular_ss220/modules/return_prs/black_mesa/hev_suit/sound/hev/eighty.ogg rename to modular_ss220/reverts/return_prs/sound/hev_suit/hev/eighty.ogg diff --git a/modular_ss220/modules/return_prs/black_mesa/hev_suit/sound/hev/fifteen.ogg b/modular_ss220/reverts/return_prs/sound/hev_suit/hev/fifteen.ogg similarity index 100% rename from modular_ss220/modules/return_prs/black_mesa/hev_suit/sound/hev/fifteen.ogg rename to modular_ss220/reverts/return_prs/sound/hev_suit/hev/fifteen.ogg diff --git a/modular_ss220/modules/return_prs/black_mesa/hev_suit/sound/hev/fifty.ogg b/modular_ss220/reverts/return_prs/sound/hev_suit/hev/fifty.ogg similarity index 100% rename from modular_ss220/modules/return_prs/black_mesa/hev_suit/sound/hev/fifty.ogg rename to modular_ss220/reverts/return_prs/sound/hev_suit/hev/fifty.ogg diff --git a/modular_ss220/modules/return_prs/black_mesa/hev_suit/sound/hev/five.ogg b/modular_ss220/reverts/return_prs/sound/hev_suit/hev/five.ogg similarity index 100% rename from modular_ss220/modules/return_prs/black_mesa/hev_suit/sound/hev/five.ogg rename to modular_ss220/reverts/return_prs/sound/hev_suit/hev/five.ogg diff --git a/modular_ss220/modules/return_prs/black_mesa/hev_suit/sound/hev/flatline.ogg b/modular_ss220/reverts/return_prs/sound/hev_suit/hev/flatline.ogg similarity index 100% rename from modular_ss220/modules/return_prs/black_mesa/hev_suit/sound/hev/flatline.ogg rename to modular_ss220/reverts/return_prs/sound/hev_suit/hev/flatline.ogg diff --git a/modular_ss220/modules/return_prs/black_mesa/hev_suit/sound/hev/fourty.ogg b/modular_ss220/reverts/return_prs/sound/hev_suit/hev/fourty.ogg similarity index 100% rename from modular_ss220/modules/return_prs/black_mesa/hev_suit/sound/hev/fourty.ogg rename to modular_ss220/reverts/return_prs/sound/hev_suit/hev/fourty.ogg diff --git a/modular_ss220/modules/return_prs/black_mesa/hev_suit/sound/hev/fuzz.ogg b/modular_ss220/reverts/return_prs/sound/hev_suit/hev/fuzz.ogg similarity index 100% rename from modular_ss220/modules/return_prs/black_mesa/hev_suit/sound/hev/fuzz.ogg rename to modular_ss220/reverts/return_prs/sound/hev_suit/hev/fuzz.ogg diff --git a/modular_ss220/modules/return_prs/black_mesa/hev_suit/sound/hev/health_critical.ogg b/modular_ss220/reverts/return_prs/sound/hev_suit/hev/health_critical.ogg similarity index 100% rename from modular_ss220/modules/return_prs/black_mesa/hev_suit/sound/hev/health_critical.ogg rename to modular_ss220/reverts/return_prs/sound/hev_suit/hev/health_critical.ogg diff --git a/modular_ss220/modules/return_prs/black_mesa/hev_suit/sound/hev/health_dropping2.ogg b/modular_ss220/reverts/return_prs/sound/hev_suit/hev/health_dropping2.ogg similarity index 100% rename from modular_ss220/modules/return_prs/black_mesa/hev_suit/sound/hev/health_dropping2.ogg rename to modular_ss220/reverts/return_prs/sound/hev_suit/hev/health_dropping2.ogg diff --git a/modular_ss220/modules/return_prs/black_mesa/hev_suit/sound/hev/hiss.ogg b/modular_ss220/reverts/return_prs/sound/hev_suit/hev/hiss.ogg similarity index 100% rename from modular_ss220/modules/return_prs/black_mesa/hev_suit/sound/hev/hiss.ogg rename to modular_ss220/reverts/return_prs/sound/hev_suit/hev/hiss.ogg diff --git a/modular_ss220/modules/return_prs/black_mesa/hev_suit/sound/hev/major_fracture.ogg b/modular_ss220/reverts/return_prs/sound/hev_suit/hev/major_fracture.ogg similarity index 100% rename from modular_ss220/modules/return_prs/black_mesa/hev_suit/sound/hev/major_fracture.ogg rename to modular_ss220/reverts/return_prs/sound/hev_suit/hev/major_fracture.ogg diff --git a/modular_ss220/modules/return_prs/black_mesa/hev_suit/sound/hev/major_lacerations.ogg b/modular_ss220/reverts/return_prs/sound/hev_suit/hev/major_lacerations.ogg similarity index 100% rename from modular_ss220/modules/return_prs/black_mesa/hev_suit/sound/hev/major_lacerations.ogg rename to modular_ss220/reverts/return_prs/sound/hev_suit/hev/major_lacerations.ogg diff --git a/modular_ss220/modules/return_prs/black_mesa/hev_suit/sound/hev/minor_fracture.ogg b/modular_ss220/reverts/return_prs/sound/hev_suit/hev/minor_fracture.ogg similarity index 100% rename from modular_ss220/modules/return_prs/black_mesa/hev_suit/sound/hev/minor_fracture.ogg rename to modular_ss220/reverts/return_prs/sound/hev_suit/hev/minor_fracture.ogg diff --git a/modular_ss220/modules/return_prs/black_mesa/hev_suit/sound/hev/minor_lacerations.ogg b/modular_ss220/reverts/return_prs/sound/hev_suit/hev/minor_lacerations.ogg similarity index 100% rename from modular_ss220/modules/return_prs/black_mesa/hev_suit/sound/hev/minor_lacerations.ogg rename to modular_ss220/reverts/return_prs/sound/hev_suit/hev/minor_lacerations.ogg diff --git a/modular_ss220/modules/return_prs/black_mesa/hev_suit/sound/hev/morphine_shot.ogg b/modular_ss220/reverts/return_prs/sound/hev_suit/hev/morphine_shot.ogg similarity index 100% rename from modular_ss220/modules/return_prs/black_mesa/hev_suit/sound/hev/morphine_shot.ogg rename to modular_ss220/reverts/return_prs/sound/hev_suit/hev/morphine_shot.ogg diff --git a/modular_ss220/modules/return_prs/black_mesa/hev_suit/sound/hev/near_death.ogg b/modular_ss220/reverts/return_prs/sound/hev_suit/hev/near_death.ogg similarity index 100% rename from modular_ss220/modules/return_prs/black_mesa/hev_suit/sound/hev/near_death.ogg rename to modular_ss220/reverts/return_prs/sound/hev_suit/hev/near_death.ogg diff --git a/modular_ss220/modules/return_prs/black_mesa/hev_suit/sound/hev/ninety.ogg b/modular_ss220/reverts/return_prs/sound/hev_suit/hev/ninety.ogg similarity index 100% rename from modular_ss220/modules/return_prs/black_mesa/hev_suit/sound/hev/ninety.ogg rename to modular_ss220/reverts/return_prs/sound/hev_suit/hev/ninety.ogg diff --git a/modular_ss220/modules/return_prs/black_mesa/hev_suit/sound/hev/onehundred.ogg b/modular_ss220/reverts/return_prs/sound/hev_suit/hev/onehundred.ogg similarity index 100% rename from modular_ss220/modules/return_prs/black_mesa/hev_suit/sound/hev/onehundred.ogg rename to modular_ss220/reverts/return_prs/sound/hev_suit/hev/onehundred.ogg diff --git a/modular_ss220/modules/return_prs/black_mesa/hev_suit/sound/hev/percent.ogg b/modular_ss220/reverts/return_prs/sound/hev_suit/hev/percent.ogg similarity index 100% rename from modular_ss220/modules/return_prs/black_mesa/hev_suit/sound/hev/percent.ogg rename to modular_ss220/reverts/return_prs/sound/hev_suit/hev/percent.ogg diff --git a/modular_ss220/modules/return_prs/black_mesa/hev_suit/sound/hev/power_level_is.ogg b/modular_ss220/reverts/return_prs/sound/hev_suit/hev/power_level_is.ogg similarity index 100% rename from modular_ss220/modules/return_prs/black_mesa/hev_suit/sound/hev/power_level_is.ogg rename to modular_ss220/reverts/return_prs/sound/hev_suit/hev/power_level_is.ogg diff --git a/modular_ss220/modules/return_prs/black_mesa/hev_suit/sound/hev/power_level_is_fifty.ogg b/modular_ss220/reverts/return_prs/sound/hev_suit/hev/power_level_is_fifty.ogg similarity index 100% rename from modular_ss220/modules/return_prs/black_mesa/hev_suit/sound/hev/power_level_is_fifty.ogg rename to modular_ss220/reverts/return_prs/sound/hev_suit/hev/power_level_is_fifty.ogg diff --git a/modular_ss220/modules/return_prs/black_mesa/hev_suit/sound/hev/power_level_is_fourty.ogg b/modular_ss220/reverts/return_prs/sound/hev_suit/hev/power_level_is_fourty.ogg similarity index 100% rename from modular_ss220/modules/return_prs/black_mesa/hev_suit/sound/hev/power_level_is_fourty.ogg rename to modular_ss220/reverts/return_prs/sound/hev_suit/hev/power_level_is_fourty.ogg diff --git a/modular_ss220/modules/return_prs/black_mesa/hev_suit/sound/hev/power_level_is_ten.ogg b/modular_ss220/reverts/return_prs/sound/hev_suit/hev/power_level_is_ten.ogg similarity index 100% rename from modular_ss220/modules/return_prs/black_mesa/hev_suit/sound/hev/power_level_is_ten.ogg rename to modular_ss220/reverts/return_prs/sound/hev_suit/hev/power_level_is_ten.ogg diff --git a/modular_ss220/modules/return_prs/black_mesa/hev_suit/sound/hev/power_level_is_thirty.ogg b/modular_ss220/reverts/return_prs/sound/hev_suit/hev/power_level_is_thirty.ogg similarity index 100% rename from modular_ss220/modules/return_prs/black_mesa/hev_suit/sound/hev/power_level_is_thirty.ogg rename to modular_ss220/reverts/return_prs/sound/hev_suit/hev/power_level_is_thirty.ogg diff --git a/modular_ss220/modules/return_prs/black_mesa/hev_suit/sound/hev/power_level_is_twenty.ogg b/modular_ss220/reverts/return_prs/sound/hev_suit/hev/power_level_is_twenty.ogg similarity index 100% rename from modular_ss220/modules/return_prs/black_mesa/hev_suit/sound/hev/power_level_is_twenty.ogg rename to modular_ss220/reverts/return_prs/sound/hev_suit/hev/power_level_is_twenty.ogg diff --git a/modular_ss220/modules/return_prs/black_mesa/hev_suit/sound/hev/power_restored.ogg b/modular_ss220/reverts/return_prs/sound/hev_suit/hev/power_restored.ogg similarity index 100% rename from modular_ss220/modules/return_prs/black_mesa/hev_suit/sound/hev/power_restored.ogg rename to modular_ss220/reverts/return_prs/sound/hev_suit/hev/power_restored.ogg diff --git a/modular_ss220/modules/return_prs/black_mesa/hev_suit/sound/hev/radiation_detected.ogg b/modular_ss220/reverts/return_prs/sound/hev_suit/hev/radiation_detected.ogg similarity index 100% rename from modular_ss220/modules/return_prs/black_mesa/hev_suit/sound/hev/radiation_detected.ogg rename to modular_ss220/reverts/return_prs/sound/hev_suit/hev/radiation_detected.ogg diff --git a/modular_ss220/modules/return_prs/black_mesa/hev_suit/sound/hev/seek_medic.ogg b/modular_ss220/reverts/return_prs/sound/hev_suit/hev/seek_medic.ogg similarity index 100% rename from modular_ss220/modules/return_prs/black_mesa/hev_suit/sound/hev/seek_medic.ogg rename to modular_ss220/reverts/return_prs/sound/hev_suit/hev/seek_medic.ogg diff --git a/modular_ss220/modules/return_prs/black_mesa/hev_suit/sound/hev/seventy.ogg b/modular_ss220/reverts/return_prs/sound/hev_suit/hev/seventy.ogg similarity index 100% rename from modular_ss220/modules/return_prs/black_mesa/hev_suit/sound/hev/seventy.ogg rename to modular_ss220/reverts/return_prs/sound/hev_suit/hev/seventy.ogg diff --git a/modular_ss220/modules/return_prs/black_mesa/hev_suit/sound/hev/sixty.ogg b/modular_ss220/reverts/return_prs/sound/hev_suit/hev/sixty.ogg similarity index 100% rename from modular_ss220/modules/return_prs/black_mesa/hev_suit/sound/hev/sixty.ogg rename to modular_ss220/reverts/return_prs/sound/hev_suit/hev/sixty.ogg diff --git a/modular_ss220/modules/return_prs/black_mesa/hev_suit/sound/hev/ten.ogg b/modular_ss220/reverts/return_prs/sound/hev_suit/hev/ten.ogg similarity index 100% rename from modular_ss220/modules/return_prs/black_mesa/hev_suit/sound/hev/ten.ogg rename to modular_ss220/reverts/return_prs/sound/hev_suit/hev/ten.ogg diff --git a/modular_ss220/modules/return_prs/black_mesa/hev_suit/sound/hev/thirty.ogg b/modular_ss220/reverts/return_prs/sound/hev_suit/hev/thirty.ogg similarity index 100% rename from modular_ss220/modules/return_prs/black_mesa/hev_suit/sound/hev/thirty.ogg rename to modular_ss220/reverts/return_prs/sound/hev_suit/hev/thirty.ogg diff --git a/modular_ss220/modules/return_prs/black_mesa/hev_suit/sound/hev/twenty.ogg b/modular_ss220/reverts/return_prs/sound/hev_suit/hev/twenty.ogg similarity index 100% rename from modular_ss220/modules/return_prs/black_mesa/hev_suit/sound/hev/twenty.ogg rename to modular_ss220/reverts/return_prs/sound/hev_suit/hev/twenty.ogg diff --git a/modular_ss220/modules/return_prs/black_mesa/hev_suit/sound/hev/warning.ogg b/modular_ss220/reverts/return_prs/sound/hev_suit/hev/warning.ogg similarity index 100% rename from modular_ss220/modules/return_prs/black_mesa/hev_suit/sound/hev/warning.ogg rename to modular_ss220/reverts/return_prs/sound/hev_suit/hev/warning.ogg diff --git a/modular_ss220/modules/return_prs/black_mesa/hev_suit/sound/hev/wound_sterilized.ogg b/modular_ss220/reverts/return_prs/sound/hev_suit/hev/wound_sterilized.ogg similarity index 100% rename from modular_ss220/modules/return_prs/black_mesa/hev_suit/sound/hev/wound_sterilized.ogg rename to modular_ss220/reverts/return_prs/sound/hev_suit/hev/wound_sterilized.ogg diff --git a/modular_ss220/modules/return_prs/black_mesa/hev_suit/sound/pcv/01_pcv_logon.ogg b/modular_ss220/reverts/return_prs/sound/hev_suit/pcv/01_pcv_logon.ogg similarity index 100% rename from modular_ss220/modules/return_prs/black_mesa/hev_suit/sound/pcv/01_pcv_logon.ogg rename to modular_ss220/reverts/return_prs/sound/hev_suit/pcv/01_pcv_logon.ogg diff --git a/modular_ss220/modules/return_prs/black_mesa/hev_suit/sound/pcv/02_powerarmor_on.ogg b/modular_ss220/reverts/return_prs/sound/hev_suit/pcv/02_powerarmor_on.ogg similarity index 100% rename from modular_ss220/modules/return_prs/black_mesa/hev_suit/sound/pcv/02_powerarmor_on.ogg rename to modular_ss220/reverts/return_prs/sound/hev_suit/pcv/02_powerarmor_on.ogg diff --git a/modular_ss220/modules/return_prs/black_mesa/hev_suit/sound/pcv/03_atmospherics_on.ogg b/modular_ss220/reverts/return_prs/sound/hev_suit/pcv/03_atmospherics_on.ogg similarity index 100% rename from modular_ss220/modules/return_prs/black_mesa/hev_suit/sound/pcv/03_atmospherics_on.ogg rename to modular_ss220/reverts/return_prs/sound/hev_suit/pcv/03_atmospherics_on.ogg diff --git a/modular_ss220/modules/return_prs/black_mesa/hev_suit/sound/pcv/04_vitalsigns_on.ogg b/modular_ss220/reverts/return_prs/sound/hev_suit/pcv/04_vitalsigns_on.ogg similarity index 100% rename from modular_ss220/modules/return_prs/black_mesa/hev_suit/sound/pcv/04_vitalsigns_on.ogg rename to modular_ss220/reverts/return_prs/sound/hev_suit/pcv/04_vitalsigns_on.ogg diff --git a/modular_ss220/modules/return_prs/black_mesa/hev_suit/sound/pcv/05_automedic_on.ogg b/modular_ss220/reverts/return_prs/sound/hev_suit/pcv/05_automedic_on.ogg similarity index 100% rename from modular_ss220/modules/return_prs/black_mesa/hev_suit/sound/pcv/05_automedic_on.ogg rename to modular_ss220/reverts/return_prs/sound/hev_suit/pcv/05_automedic_on.ogg diff --git a/modular_ss220/modules/return_prs/black_mesa/hev_suit/sound/pcv/06_weaponselect_on.ogg b/modular_ss220/reverts/return_prs/sound/hev_suit/pcv/06_weaponselect_on.ogg similarity index 100% rename from modular_ss220/modules/return_prs/black_mesa/hev_suit/sound/pcv/06_weaponselect_on.ogg rename to modular_ss220/reverts/return_prs/sound/hev_suit/pcv/06_weaponselect_on.ogg diff --git a/modular_ss220/modules/return_prs/black_mesa/hev_suit/sound/pcv/07_munitionview_on.ogg b/modular_ss220/reverts/return_prs/sound/hev_suit/pcv/07_munitionview_on.ogg similarity index 100% rename from modular_ss220/modules/return_prs/black_mesa/hev_suit/sound/pcv/07_munitionview_on.ogg rename to modular_ss220/reverts/return_prs/sound/hev_suit/pcv/07_munitionview_on.ogg diff --git a/modular_ss220/modules/return_prs/black_mesa/hev_suit/sound/pcv/08_communications_on.ogg b/modular_ss220/reverts/return_prs/sound/hev_suit/pcv/08_communications_on.ogg similarity index 100% rename from modular_ss220/modules/return_prs/black_mesa/hev_suit/sound/pcv/08_communications_on.ogg rename to modular_ss220/reverts/return_prs/sound/hev_suit/pcv/08_communications_on.ogg diff --git a/modular_ss220/modules/return_prs/black_mesa/hev_suit/sound/pcv/09_safe_day.ogg b/modular_ss220/reverts/return_prs/sound/hev_suit/pcv/09_safe_day.ogg similarity index 100% rename from modular_ss220/modules/return_prs/black_mesa/hev_suit/sound/pcv/09_safe_day.ogg rename to modular_ss220/reverts/return_prs/sound/hev_suit/pcv/09_safe_day.ogg diff --git a/modular_ss220/modules/return_prs/black_mesa/hev_suit/sound/pcv/_comma.ogg b/modular_ss220/reverts/return_prs/sound/hev_suit/pcv/_comma.ogg similarity index 100% rename from modular_ss220/modules/return_prs/black_mesa/hev_suit/sound/pcv/_comma.ogg rename to modular_ss220/reverts/return_prs/sound/hev_suit/pcv/_comma.ogg diff --git a/modular_ss220/modules/return_prs/black_mesa/hev_suit/sound/pcv/_period.ogg b/modular_ss220/reverts/return_prs/sound/hev_suit/pcv/_period.ogg similarity index 100% rename from modular_ss220/modules/return_prs/black_mesa/hev_suit/sound/pcv/_period.ogg rename to modular_ss220/reverts/return_prs/sound/hev_suit/pcv/_period.ogg diff --git a/modular_ss220/modules/return_prs/black_mesa/hev_suit/sound/pcv/acquired.ogg b/modular_ss220/reverts/return_prs/sound/hev_suit/pcv/acquired.ogg similarity index 100% rename from modular_ss220/modules/return_prs/black_mesa/hev_suit/sound/pcv/acquired.ogg rename to modular_ss220/reverts/return_prs/sound/hev_suit/pcv/acquired.ogg diff --git a/modular_ss220/modules/return_prs/black_mesa/hev_suit/sound/pcv/activated.ogg b/modular_ss220/reverts/return_prs/sound/hev_suit/pcv/activated.ogg similarity index 100% rename from modular_ss220/modules/return_prs/black_mesa/hev_suit/sound/pcv/activated.ogg rename to modular_ss220/reverts/return_prs/sound/hev_suit/pcv/activated.ogg diff --git a/modular_ss220/modules/return_prs/black_mesa/hev_suit/sound/pcv/ammo_depleted.ogg b/modular_ss220/reverts/return_prs/sound/hev_suit/pcv/ammo_depleted.ogg similarity index 100% rename from modular_ss220/modules/return_prs/black_mesa/hev_suit/sound/pcv/ammo_depleted.ogg rename to modular_ss220/reverts/return_prs/sound/hev_suit/pcv/ammo_depleted.ogg diff --git a/modular_ss220/modules/return_prs/black_mesa/hev_suit/sound/pcv/antidote_shot.ogg b/modular_ss220/reverts/return_prs/sound/hev_suit/pcv/antidote_shot.ogg similarity index 100% rename from modular_ss220/modules/return_prs/black_mesa/hev_suit/sound/pcv/antidote_shot.ogg rename to modular_ss220/reverts/return_prs/sound/hev_suit/pcv/antidote_shot.ogg diff --git a/modular_ss220/modules/return_prs/black_mesa/hev_suit/sound/pcv/antitoxin_shot.ogg b/modular_ss220/reverts/return_prs/sound/hev_suit/pcv/antitoxin_shot.ogg similarity index 100% rename from modular_ss220/modules/return_prs/black_mesa/hev_suit/sound/pcv/antitoxin_shot.ogg rename to modular_ss220/reverts/return_prs/sound/hev_suit/pcv/antitoxin_shot.ogg diff --git a/modular_ss220/modules/return_prs/black_mesa/hev_suit/sound/pcv/beep.ogg b/modular_ss220/reverts/return_prs/sound/hev_suit/pcv/beep.ogg similarity index 100% rename from modular_ss220/modules/return_prs/black_mesa/hev_suit/sound/pcv/beep.ogg rename to modular_ss220/reverts/return_prs/sound/hev_suit/pcv/beep.ogg diff --git a/modular_ss220/modules/return_prs/black_mesa/hev_suit/sound/pcv/bell.ogg b/modular_ss220/reverts/return_prs/sound/hev_suit/pcv/bell.ogg similarity index 100% rename from modular_ss220/modules/return_prs/black_mesa/hev_suit/sound/pcv/bell.ogg rename to modular_ss220/reverts/return_prs/sound/hev_suit/pcv/bell.ogg diff --git a/modular_ss220/modules/return_prs/black_mesa/hev_suit/sound/pcv/biohazard_detected.ogg b/modular_ss220/reverts/return_prs/sound/hev_suit/pcv/biohazard_detected.ogg similarity index 100% rename from modular_ss220/modules/return_prs/black_mesa/hev_suit/sound/pcv/biohazard_detected.ogg rename to modular_ss220/reverts/return_prs/sound/hev_suit/pcv/biohazard_detected.ogg diff --git a/modular_ss220/modules/return_prs/black_mesa/hev_suit/sound/pcv/blip.ogg b/modular_ss220/reverts/return_prs/sound/hev_suit/pcv/blip.ogg similarity index 100% rename from modular_ss220/modules/return_prs/black_mesa/hev_suit/sound/pcv/blip.ogg rename to modular_ss220/reverts/return_prs/sound/hev_suit/pcv/blip.ogg diff --git a/modular_ss220/modules/return_prs/black_mesa/hev_suit/sound/pcv/blood_loss.ogg b/modular_ss220/reverts/return_prs/sound/hev_suit/pcv/blood_loss.ogg similarity index 100% rename from modular_ss220/modules/return_prs/black_mesa/hev_suit/sound/pcv/blood_loss.ogg rename to modular_ss220/reverts/return_prs/sound/hev_suit/pcv/blood_loss.ogg diff --git a/modular_ss220/modules/return_prs/black_mesa/hev_suit/sound/pcv/blood_plasma.ogg b/modular_ss220/reverts/return_prs/sound/hev_suit/pcv/blood_plasma.ogg similarity index 100% rename from modular_ss220/modules/return_prs/black_mesa/hev_suit/sound/pcv/blood_plasma.ogg rename to modular_ss220/reverts/return_prs/sound/hev_suit/pcv/blood_plasma.ogg diff --git a/modular_ss220/modules/return_prs/black_mesa/hev_suit/sound/pcv/blood_toxins.ogg b/modular_ss220/reverts/return_prs/sound/hev_suit/pcv/blood_toxins.ogg similarity index 100% rename from modular_ss220/modules/return_prs/black_mesa/hev_suit/sound/pcv/blood_toxins.ogg rename to modular_ss220/reverts/return_prs/sound/hev_suit/pcv/blood_toxins.ogg diff --git a/modular_ss220/modules/return_prs/black_mesa/hev_suit/sound/pcv/boop.ogg b/modular_ss220/reverts/return_prs/sound/hev_suit/pcv/boop.ogg similarity index 100% rename from modular_ss220/modules/return_prs/black_mesa/hev_suit/sound/pcv/boop.ogg rename to modular_ss220/reverts/return_prs/sound/hev_suit/pcv/boop.ogg diff --git a/modular_ss220/modules/return_prs/black_mesa/hev_suit/sound/pcv/chemical_detected.ogg b/modular_ss220/reverts/return_prs/sound/hev_suit/pcv/chemical_detected.ogg similarity index 100% rename from modular_ss220/modules/return_prs/black_mesa/hev_suit/sound/pcv/chemical_detected.ogg rename to modular_ss220/reverts/return_prs/sound/hev_suit/pcv/chemical_detected.ogg diff --git a/modular_ss220/modules/return_prs/black_mesa/hev_suit/sound/pcv/eighty.ogg b/modular_ss220/reverts/return_prs/sound/hev_suit/pcv/eighty.ogg similarity index 100% rename from modular_ss220/modules/return_prs/black_mesa/hev_suit/sound/pcv/eighty.ogg rename to modular_ss220/reverts/return_prs/sound/hev_suit/pcv/eighty.ogg diff --git a/modular_ss220/modules/return_prs/black_mesa/hev_suit/sound/pcv/fifteen.ogg b/modular_ss220/reverts/return_prs/sound/hev_suit/pcv/fifteen.ogg similarity index 100% rename from modular_ss220/modules/return_prs/black_mesa/hev_suit/sound/pcv/fifteen.ogg rename to modular_ss220/reverts/return_prs/sound/hev_suit/pcv/fifteen.ogg diff --git a/modular_ss220/modules/return_prs/black_mesa/hev_suit/sound/pcv/fifty.ogg b/modular_ss220/reverts/return_prs/sound/hev_suit/pcv/fifty.ogg similarity index 100% rename from modular_ss220/modules/return_prs/black_mesa/hev_suit/sound/pcv/fifty.ogg rename to modular_ss220/reverts/return_prs/sound/hev_suit/pcv/fifty.ogg diff --git a/modular_ss220/modules/return_prs/black_mesa/hev_suit/sound/pcv/five.ogg b/modular_ss220/reverts/return_prs/sound/hev_suit/pcv/five.ogg similarity index 100% rename from modular_ss220/modules/return_prs/black_mesa/hev_suit/sound/pcv/five.ogg rename to modular_ss220/reverts/return_prs/sound/hev_suit/pcv/five.ogg diff --git a/modular_ss220/modules/return_prs/black_mesa/hev_suit/sound/pcv/flatline.ogg b/modular_ss220/reverts/return_prs/sound/hev_suit/pcv/flatline.ogg similarity index 100% rename from modular_ss220/modules/return_prs/black_mesa/hev_suit/sound/pcv/flatline.ogg rename to modular_ss220/reverts/return_prs/sound/hev_suit/pcv/flatline.ogg diff --git a/modular_ss220/modules/return_prs/black_mesa/hev_suit/sound/pcv/fourty.ogg b/modular_ss220/reverts/return_prs/sound/hev_suit/pcv/fourty.ogg similarity index 100% rename from modular_ss220/modules/return_prs/black_mesa/hev_suit/sound/pcv/fourty.ogg rename to modular_ss220/reverts/return_prs/sound/hev_suit/pcv/fourty.ogg diff --git a/modular_ss220/modules/return_prs/black_mesa/hev_suit/sound/pcv/fuzz.ogg b/modular_ss220/reverts/return_prs/sound/hev_suit/pcv/fuzz.ogg similarity index 100% rename from modular_ss220/modules/return_prs/black_mesa/hev_suit/sound/pcv/fuzz.ogg rename to modular_ss220/reverts/return_prs/sound/hev_suit/pcv/fuzz.ogg diff --git a/modular_ss220/modules/return_prs/black_mesa/hev_suit/sound/pcv/health_critical.ogg b/modular_ss220/reverts/return_prs/sound/hev_suit/pcv/health_critical.ogg similarity index 100% rename from modular_ss220/modules/return_prs/black_mesa/hev_suit/sound/pcv/health_critical.ogg rename to modular_ss220/reverts/return_prs/sound/hev_suit/pcv/health_critical.ogg diff --git a/modular_ss220/modules/return_prs/black_mesa/hev_suit/sound/pcv/health_dropping2.ogg b/modular_ss220/reverts/return_prs/sound/hev_suit/pcv/health_dropping2.ogg similarity index 100% rename from modular_ss220/modules/return_prs/black_mesa/hev_suit/sound/pcv/health_dropping2.ogg rename to modular_ss220/reverts/return_prs/sound/hev_suit/pcv/health_dropping2.ogg diff --git a/modular_ss220/modules/return_prs/black_mesa/hev_suit/sound/pcv/hiss.ogg b/modular_ss220/reverts/return_prs/sound/hev_suit/pcv/hiss.ogg similarity index 100% rename from modular_ss220/modules/return_prs/black_mesa/hev_suit/sound/pcv/hiss.ogg rename to modular_ss220/reverts/return_prs/sound/hev_suit/pcv/hiss.ogg diff --git a/modular_ss220/modules/return_prs/black_mesa/hev_suit/sound/pcv/major_fracture.ogg b/modular_ss220/reverts/return_prs/sound/hev_suit/pcv/major_fracture.ogg similarity index 100% rename from modular_ss220/modules/return_prs/black_mesa/hev_suit/sound/pcv/major_fracture.ogg rename to modular_ss220/reverts/return_prs/sound/hev_suit/pcv/major_fracture.ogg diff --git a/modular_ss220/modules/return_prs/black_mesa/hev_suit/sound/pcv/major_lacerations.ogg b/modular_ss220/reverts/return_prs/sound/hev_suit/pcv/major_lacerations.ogg similarity index 100% rename from modular_ss220/modules/return_prs/black_mesa/hev_suit/sound/pcv/major_lacerations.ogg rename to modular_ss220/reverts/return_prs/sound/hev_suit/pcv/major_lacerations.ogg diff --git a/modular_ss220/modules/return_prs/black_mesa/hev_suit/sound/pcv/minor_fracture.ogg b/modular_ss220/reverts/return_prs/sound/hev_suit/pcv/minor_fracture.ogg similarity index 100% rename from modular_ss220/modules/return_prs/black_mesa/hev_suit/sound/pcv/minor_fracture.ogg rename to modular_ss220/reverts/return_prs/sound/hev_suit/pcv/minor_fracture.ogg diff --git a/modular_ss220/modules/return_prs/black_mesa/hev_suit/sound/pcv/minor_lacerations.ogg b/modular_ss220/reverts/return_prs/sound/hev_suit/pcv/minor_lacerations.ogg similarity index 100% rename from modular_ss220/modules/return_prs/black_mesa/hev_suit/sound/pcv/minor_lacerations.ogg rename to modular_ss220/reverts/return_prs/sound/hev_suit/pcv/minor_lacerations.ogg diff --git a/modular_ss220/modules/return_prs/black_mesa/hev_suit/sound/pcv/morphine_shot.ogg b/modular_ss220/reverts/return_prs/sound/hev_suit/pcv/morphine_shot.ogg similarity index 100% rename from modular_ss220/modules/return_prs/black_mesa/hev_suit/sound/pcv/morphine_shot.ogg rename to modular_ss220/reverts/return_prs/sound/hev_suit/pcv/morphine_shot.ogg diff --git a/modular_ss220/modules/return_prs/black_mesa/hev_suit/sound/pcv/near_death.ogg b/modular_ss220/reverts/return_prs/sound/hev_suit/pcv/near_death.ogg similarity index 100% rename from modular_ss220/modules/return_prs/black_mesa/hev_suit/sound/pcv/near_death.ogg rename to modular_ss220/reverts/return_prs/sound/hev_suit/pcv/near_death.ogg diff --git a/modular_ss220/modules/return_prs/black_mesa/hev_suit/sound/pcv/ninety.ogg b/modular_ss220/reverts/return_prs/sound/hev_suit/pcv/ninety.ogg similarity index 100% rename from modular_ss220/modules/return_prs/black_mesa/hev_suit/sound/pcv/ninety.ogg rename to modular_ss220/reverts/return_prs/sound/hev_suit/pcv/ninety.ogg diff --git a/modular_ss220/modules/return_prs/black_mesa/hev_suit/sound/pcv/onehundred.ogg b/modular_ss220/reverts/return_prs/sound/hev_suit/pcv/onehundred.ogg similarity index 100% rename from modular_ss220/modules/return_prs/black_mesa/hev_suit/sound/pcv/onehundred.ogg rename to modular_ss220/reverts/return_prs/sound/hev_suit/pcv/onehundred.ogg diff --git a/modular_ss220/modules/return_prs/black_mesa/hev_suit/sound/pcv/pain_block.ogg b/modular_ss220/reverts/return_prs/sound/hev_suit/pcv/pain_block.ogg similarity index 100% rename from modular_ss220/modules/return_prs/black_mesa/hev_suit/sound/pcv/pain_block.ogg rename to modular_ss220/reverts/return_prs/sound/hev_suit/pcv/pain_block.ogg diff --git a/modular_ss220/modules/return_prs/black_mesa/hev_suit/sound/pcv/percent.ogg b/modular_ss220/reverts/return_prs/sound/hev_suit/pcv/percent.ogg similarity index 100% rename from modular_ss220/modules/return_prs/black_mesa/hev_suit/sound/pcv/percent.ogg rename to modular_ss220/reverts/return_prs/sound/hev_suit/pcv/percent.ogg diff --git a/modular_ss220/modules/return_prs/black_mesa/hev_suit/sound/pcv/power_level_is.ogg b/modular_ss220/reverts/return_prs/sound/hev_suit/pcv/power_level_is.ogg similarity index 100% rename from modular_ss220/modules/return_prs/black_mesa/hev_suit/sound/pcv/power_level_is.ogg rename to modular_ss220/reverts/return_prs/sound/hev_suit/pcv/power_level_is.ogg diff --git a/modular_ss220/modules/return_prs/black_mesa/hev_suit/sound/pcv/power_level_is_fifty.ogg b/modular_ss220/reverts/return_prs/sound/hev_suit/pcv/power_level_is_fifty.ogg similarity index 100% rename from modular_ss220/modules/return_prs/black_mesa/hev_suit/sound/pcv/power_level_is_fifty.ogg rename to modular_ss220/reverts/return_prs/sound/hev_suit/pcv/power_level_is_fifty.ogg diff --git a/modular_ss220/modules/return_prs/black_mesa/hev_suit/sound/pcv/power_level_is_fourty.ogg b/modular_ss220/reverts/return_prs/sound/hev_suit/pcv/power_level_is_fourty.ogg similarity index 100% rename from modular_ss220/modules/return_prs/black_mesa/hev_suit/sound/pcv/power_level_is_fourty.ogg rename to modular_ss220/reverts/return_prs/sound/hev_suit/pcv/power_level_is_fourty.ogg diff --git a/modular_ss220/modules/return_prs/black_mesa/hev_suit/sound/pcv/power_level_is_ten.ogg b/modular_ss220/reverts/return_prs/sound/hev_suit/pcv/power_level_is_ten.ogg similarity index 100% rename from modular_ss220/modules/return_prs/black_mesa/hev_suit/sound/pcv/power_level_is_ten.ogg rename to modular_ss220/reverts/return_prs/sound/hev_suit/pcv/power_level_is_ten.ogg diff --git a/modular_ss220/modules/return_prs/black_mesa/hev_suit/sound/pcv/power_level_is_thirty.ogg b/modular_ss220/reverts/return_prs/sound/hev_suit/pcv/power_level_is_thirty.ogg similarity index 100% rename from modular_ss220/modules/return_prs/black_mesa/hev_suit/sound/pcv/power_level_is_thirty.ogg rename to modular_ss220/reverts/return_prs/sound/hev_suit/pcv/power_level_is_thirty.ogg diff --git a/modular_ss220/modules/return_prs/black_mesa/hev_suit/sound/pcv/power_level_is_twenty.ogg b/modular_ss220/reverts/return_prs/sound/hev_suit/pcv/power_level_is_twenty.ogg similarity index 100% rename from modular_ss220/modules/return_prs/black_mesa/hev_suit/sound/pcv/power_level_is_twenty.ogg rename to modular_ss220/reverts/return_prs/sound/hev_suit/pcv/power_level_is_twenty.ogg diff --git a/modular_ss220/modules/return_prs/black_mesa/hev_suit/sound/pcv/power_restored.ogg b/modular_ss220/reverts/return_prs/sound/hev_suit/pcv/power_restored.ogg similarity index 100% rename from modular_ss220/modules/return_prs/black_mesa/hev_suit/sound/pcv/power_restored.ogg rename to modular_ss220/reverts/return_prs/sound/hev_suit/pcv/power_restored.ogg diff --git a/modular_ss220/modules/return_prs/black_mesa/hev_suit/sound/pcv/radiation_detected.ogg b/modular_ss220/reverts/return_prs/sound/hev_suit/pcv/radiation_detected.ogg similarity index 100% rename from modular_ss220/modules/return_prs/black_mesa/hev_suit/sound/pcv/radiation_detected.ogg rename to modular_ss220/reverts/return_prs/sound/hev_suit/pcv/radiation_detected.ogg diff --git a/modular_ss220/modules/return_prs/black_mesa/hev_suit/sound/pcv/seek_medic.ogg b/modular_ss220/reverts/return_prs/sound/hev_suit/pcv/seek_medic.ogg similarity index 100% rename from modular_ss220/modules/return_prs/black_mesa/hev_suit/sound/pcv/seek_medic.ogg rename to modular_ss220/reverts/return_prs/sound/hev_suit/pcv/seek_medic.ogg diff --git a/modular_ss220/modules/return_prs/black_mesa/hev_suit/sound/pcv/seventy.ogg b/modular_ss220/reverts/return_prs/sound/hev_suit/pcv/seventy.ogg similarity index 100% rename from modular_ss220/modules/return_prs/black_mesa/hev_suit/sound/pcv/seventy.ogg rename to modular_ss220/reverts/return_prs/sound/hev_suit/pcv/seventy.ogg diff --git a/modular_ss220/modules/return_prs/black_mesa/hev_suit/sound/pcv/sixty.ogg b/modular_ss220/reverts/return_prs/sound/hev_suit/pcv/sixty.ogg similarity index 100% rename from modular_ss220/modules/return_prs/black_mesa/hev_suit/sound/pcv/sixty.ogg rename to modular_ss220/reverts/return_prs/sound/hev_suit/pcv/sixty.ogg diff --git a/modular_ss220/modules/return_prs/black_mesa/hev_suit/sound/pcv/ten.ogg b/modular_ss220/reverts/return_prs/sound/hev_suit/pcv/ten.ogg similarity index 100% rename from modular_ss220/modules/return_prs/black_mesa/hev_suit/sound/pcv/ten.ogg rename to modular_ss220/reverts/return_prs/sound/hev_suit/pcv/ten.ogg diff --git a/modular_ss220/modules/return_prs/black_mesa/hev_suit/sound/pcv/thirty.ogg b/modular_ss220/reverts/return_prs/sound/hev_suit/pcv/thirty.ogg similarity index 100% rename from modular_ss220/modules/return_prs/black_mesa/hev_suit/sound/pcv/thirty.ogg rename to modular_ss220/reverts/return_prs/sound/hev_suit/pcv/thirty.ogg diff --git a/modular_ss220/modules/return_prs/black_mesa/hev_suit/sound/pcv/torniquette_applied.ogg b/modular_ss220/reverts/return_prs/sound/hev_suit/pcv/torniquette_applied.ogg similarity index 100% rename from modular_ss220/modules/return_prs/black_mesa/hev_suit/sound/pcv/torniquette_applied.ogg rename to modular_ss220/reverts/return_prs/sound/hev_suit/pcv/torniquette_applied.ogg diff --git a/modular_ss220/modules/return_prs/black_mesa/hev_suit/sound/pcv/twenty.ogg b/modular_ss220/reverts/return_prs/sound/hev_suit/pcv/twenty.ogg similarity index 100% rename from modular_ss220/modules/return_prs/black_mesa/hev_suit/sound/pcv/twenty.ogg rename to modular_ss220/reverts/return_prs/sound/hev_suit/pcv/twenty.ogg diff --git a/modular_ss220/modules/return_prs/black_mesa/hev_suit/sound/pcv/warning.ogg b/modular_ss220/reverts/return_prs/sound/hev_suit/pcv/warning.ogg similarity index 100% rename from modular_ss220/modules/return_prs/black_mesa/hev_suit/sound/pcv/warning.ogg rename to modular_ss220/reverts/return_prs/sound/hev_suit/pcv/warning.ogg diff --git a/modular_ss220/modules/return_prs/black_mesa/hev_suit/sound/pcv/wound_sterilized.ogg b/modular_ss220/reverts/return_prs/sound/hev_suit/pcv/wound_sterilized.ogg similarity index 100% rename from modular_ss220/modules/return_prs/black_mesa/hev_suit/sound/pcv/wound_sterilized.ogg rename to modular_ss220/reverts/return_prs/sound/hev_suit/pcv/wound_sterilized.ogg diff --git a/modular_ss220/modules/return_prs/novaya_ert/sound/amr_fire.ogg b/modular_ss220/reverts/return_prs/sound/novaya_ert/amr_fire.ogg similarity index 100% rename from modular_ss220/modules/return_prs/novaya_ert/sound/amr_fire.ogg rename to modular_ss220/reverts/return_prs/sound/novaya_ert/amr_fire.ogg diff --git a/modular_ss220/modules/return_prs/novaya_ert/sound/flatline.ogg b/modular_ss220/reverts/return_prs/sound/novaya_ert/flatline.ogg similarity index 100% rename from modular_ss220/modules/return_prs/novaya_ert/sound/flatline.ogg rename to modular_ss220/reverts/return_prs/sound/novaya_ert/flatline.ogg diff --git a/modular_ss220/modules/translations/code/customer_ru.dm b/modular_ss220/translations/customer/code/customer_ru.dm similarity index 100% rename from modular_ss220/modules/translations/code/customer_ru.dm rename to modular_ss220/translations/customer/code/customer_ru.dm diff --git a/modular_ss220/translations/customer/customer.dm b/modular_ss220/translations/customer/customer.dm new file mode 100644 index 00000000000000..3eb463dd30ba4f --- /dev/null +++ b/modular_ss220/translations/customer/customer.dm @@ -0,0 +1,6 @@ +/datum/modpack/customer_ru + id = "customer_ru" + name = "feature_example" + group = "Translations" + desc = "Переводит фразы посетителей в баре." + author = "К*дер" diff --git a/modular_ss220/translations/customer/customer.dme b/modular_ss220/translations/customer/customer.dme new file mode 100644 index 00000000000000..1856ce5c29f816 --- /dev/null +++ b/modular_ss220/translations/customer/customer.dme @@ -0,0 +1,8 @@ +#ifndef CUSTOMER_RU +#define CUSTOMER_RU + +#include "customer.dm" + +#include "code/customer_ru.dm" + +#endif diff --git a/modular_ss220/translations/readme.md b/modular_ss220/translations/readme.md new file mode 100644 index 00000000000000..93db19244561ae --- /dev/null +++ b/modular_ss220/translations/readme.md @@ -0,0 +1,2 @@ +## Все что связано с добавлением фич для иветов помещяется в данную папку + diff --git a/modular_ss220/translations/translation_example/code/m_crayon.dm b/modular_ss220/translations/translation_example/code/m_crayon.dm new file mode 100644 index 00000000000000..06084e70985d1a --- /dev/null +++ b/modular_ss220/translations/translation_example/code/m_crayon.dm @@ -0,0 +1,3 @@ +//ORIGINAL FILE: code/game/objects/effects/decals/crayon.dm +/obj/effect/decal/cleanable/crayon + icon = 'modular_ss220/translations/translation_example/icons/crayondecal.dmi' diff --git a/modular_ss220/translations/translation_example/code/readme.md b/modular_ss220/translations/translation_example/code/readme.md new file mode 100644 index 00000000000000..dbd11226302709 --- /dev/null +++ b/modular_ss220/translations/translation_example/code/readme.md @@ -0,0 +1 @@ +## Тут мы храним код для нашего ивента diff --git a/modular_ss220/translations/translation_example/icons/crayondecal.dmi b/modular_ss220/translations/translation_example/icons/crayondecal.dmi new file mode 100644 index 00000000000000..b46f2180fe08de Binary files /dev/null and b/modular_ss220/translations/translation_example/icons/crayondecal.dmi differ diff --git a/modular_ss220/translations/translation_example/icons/readme.md b/modular_ss220/translations/translation_example/icons/readme.md new file mode 100644 index 00000000000000..10a520af81a96a --- /dev/null +++ b/modular_ss220/translations/translation_example/icons/readme.md @@ -0,0 +1 @@ +## Тут мы храним иконки к нашему ивенту diff --git a/modular_ss220/translations/translation_example/preview.dmi b/modular_ss220/translations/translation_example/preview.dmi new file mode 100644 index 00000000000000..0b1b4e5726dba1 Binary files /dev/null and b/modular_ss220/translations/translation_example/preview.dmi differ diff --git a/modular_ss220/translations/translation_example/readme.md b/modular_ss220/translations/translation_example/readme.md new file mode 100644 index 00000000000000..3880e03ed77c11 --- /dev/null +++ b/modular_ss220/translations/translation_example/readme.md @@ -0,0 +1,13 @@ +## Module ID: TRANSLATION_EXAMPLE + +### Defines: + +- N/A + +### TG Proc/File Changes: + +- code/game/objects/items/crayons.dm + +### TGUI Files: + +- N/A diff --git a/modular_ss220/translations/translation_example/translation_example.dm b/modular_ss220/translations/translation_example/translation_example.dm new file mode 100644 index 00000000000000..999b30771bb557 --- /dev/null +++ b/modular_ss220/translations/translation_example/translation_example.dm @@ -0,0 +1,9 @@ +/datum/modpack/translation_example + id = "translation_example" + icon = 'modular_ss220/translations/translation_example/preview.dmi' + name = "translation_example" + group = "Translations" + desc = "Пример модпака для перевода." + author = "К*дер" + + visible = FALSE diff --git a/modular_ss220/translations/translation_example/translation_example.dme b/modular_ss220/translations/translation_example/translation_example.dme new file mode 100644 index 00000000000000..890dda11236885 --- /dev/null +++ b/modular_ss220/translations/translation_example/translation_example.dme @@ -0,0 +1,8 @@ +#ifndef TRANSLATION_EXAMPLE +#define TRANSLATION_EXAMPLE + +#include "translation_example.dm" + +#include "code\m_crayon.dm" + +#endif diff --git a/tgstation.dme b/tgstation.dme index 9dc8aedb0f7ff1..4674ebab2496a9 100644 --- a/tgstation.dme +++ b/tgstation.dme @@ -262,6 +262,7 @@ #include "code\__DEFINES\wounds.dm" #include "code\__DEFINES\xenobiology.dm" #include "code\__DEFINES\zoom.dm" +#include "code\__DEFINES\~novarat_defines_include.dm" #include "code\__DEFINES\ai\ai.dm" #include "code\__DEFINES\ai\ai_blackboard.dm" #include "code\__DEFINES\ai\bot_keys.dm" @@ -581,6 +582,7 @@ #include "code\__HELPERS\view.dm" #include "code\__HELPERS\visual_effects.dm" #include "code\__HELPERS\weakref.dm" +#include "code\__HELPERS\~novarat_helpers_include.dm" #include "code\__HELPERS\logging\_logging.dm" #include "code\__HELPERS\logging\admin.dm" #include "code\__HELPERS\logging\antagonists.dm" @@ -628,6 +630,7 @@ #include "code\_globalvars\silo.dm" #include "code\_globalvars\tgui.dm" #include "code\_globalvars\time_vars.dm" +#include "code\_globalvars\~novarat_globalvars_include.dm" #include "code\_globalvars\lists\achievements.dm" #include "code\_globalvars\lists\ambience.dm" #include "code\_globalvars\lists\basic_ai.dm" @@ -8751,116 +8754,5 @@ #include "modular_nova\modules\xenoarchartifacts\obj\geosample.dm" #include "modular_nova\modules\xenoarchartifacts\obj\particle_battery.dm" #include "modular_nova\modules\xenoarchartifacts\obj\wave_scanner.dm" -#include "modular_ss220\master_files_skyrat\code\modules\client\preferences\emote_panel.dm" -#include "modular_ss220\modules\auto_cryo\autocryo.dm" -#include "modular_ss220\modules\auto_cryo\autocryo_config.dm" -#include "modular_ss220\modules\cyrillic_key_fixes\code\client_procs.dm" -#include "modular_ss220\modules\cyrillic_key_fixes\code\communication.dm" -#include "modular_ss220\modules\cyrillic_key_fixes\code\keybindings.dm" -#include "modular_ss220\modules\cyrillic_key_fixes\code\text.dm" -#include "modular_ss220\modules\discord\discord_auth.dm" -#include "modular_ss220\modules\discord\new_player.dm" -#include "modular_ss220\modules\discord\verb.dm" -#include "modular_ss220\modules\events\round_event.dm" -#include "modular_ss220\modules\new_world_topics\world_topic.dm" -#include "modular_ss220\modules\paradise_keybindings\code\keybinding\admin.dm" -#include "modular_ss220\modules\paradise_keybindings\code\keybinding\artificial_intelligence.dm" -#include "modular_ss220\modules\paradise_keybindings\code\keybinding\carbon.dm" -#include "modular_ss220\modules\paradise_keybindings\code\keybinding\client.dm" -#include "modular_ss220\modules\paradise_keybindings\code\keybinding\communication.dm" -#include "modular_ss220\modules\paradise_keybindings\code\keybinding\human.dm" -#include "modular_ss220\modules\paradise_keybindings\code\keybinding\living.dm" -#include "modular_ss220\modules\paradise_keybindings\code\keybinding\mob.dm" -#include "modular_ss220\modules\paradise_keybindings\code\keybinding\movement.dm" -#include "modular_ss220\modules\paradise_keybindings\code\keybinding\robot.dm" -#include "modular_ss220\modules\return_prs\_vars\vars.dm" -#include "modular_ss220\modules\return_prs\ammogun\ammo_boxes.dm" -#include "modular_ss220\modules\return_prs\ammogun\modular_projectiles.dm" -#include "modular_ss220\modules\return_prs\ammogun\shotgunbox.dm" -#include "modular_ss220\modules\return_prs\ammogun\shotgunbullets.dm" -#include "modular_ss220\modules\return_prs\black_mesa\code\armor.dm" -#include "modular_ss220\modules\return_prs\black_mesa\code\bump_teleporter.dm" -#include "modular_ss220\modules\return_prs\black_mesa\code\drops.dm" -#include "modular_ss220\modules\return_prs\black_mesa\code\factions.dm" -#include "modular_ss220\modules\return_prs\black_mesa\code\flag.dm" -#include "modular_ss220\modules\return_prs\black_mesa\code\fluff.dm" -#include "modular_ss220\modules\return_prs\black_mesa\code\follow_component.dm" -#include "modular_ss220\modules\return_prs\black_mesa\code\gateway.dm" -#include "modular_ss220\modules\return_prs\black_mesa\code\ghost_spawners.dm" -#include "modular_ss220\modules\return_prs\black_mesa\code\guns.dm" -#include "modular_ss220\modules\return_prs\black_mesa\code\healing_puddle.dm" -#include "modular_ss220\modules\return_prs\black_mesa\code\lambda_teleporter.dm" -#include "modular_ss220\modules\return_prs\black_mesa\code\m16_variations.dm" -#include "modular_ss220\modules\return_prs\black_mesa\code\mapping_fluff.dm" -#include "modular_ss220\modules\return_prs\black_mesa\code\miscguns.dm" -#include "modular_ss220\modules\return_prs\black_mesa\code\objects.dm" -#include "modular_ss220\modules\return_prs\black_mesa\code\projectiles.dm" -#include "modular_ss220\modules\return_prs\black_mesa\code\rationpacks.dm" -#include "modular_ss220\modules\return_prs\black_mesa\code\resonance_cascade.dm" -#include "modular_ss220\modules\return_prs\black_mesa\code\shield_pylon.dm" -#include "modular_ss220\modules\return_prs\black_mesa\code\shockplant.dm" -#include "modular_ss220\modules\return_prs\black_mesa\code\spawners.dm" -#include "modular_ss220\modules\return_prs\black_mesa\code\turfs.dm" -#include "modular_ss220\modules\return_prs\black_mesa\code\turrets.dm" -#include "modular_ss220\modules\return_prs\black_mesa\code\uber_teleporter.dm" -#include "modular_ss220\modules\return_prs\black_mesa\code\weapons.dm" -#include "modular_ss220\modules\return_prs\black_mesa\code\xen_crystal.dm" -#include "modular_ss220\modules\return_prs\black_mesa\code\armaments\__armament_bodyarmor.dm" -#include "modular_ss220\modules\return_prs\black_mesa\code\armaments\_armament_primary.dm" -#include "modular_ss220\modules\return_prs\black_mesa\code\armaments\_armaments_secondary.dm" -#include "modular_ss220\modules\return_prs\black_mesa\code\armaments\armament_explosives.dm" -#include "modular_ss220\modules\return_prs\black_mesa\code\armaments\armament_medical.dm" -#include "modular_ss220\modules\return_prs\black_mesa\code\armaments\armament_melee.dm" -#include "modular_ss220\modules\return_prs\black_mesa\code\armaments\armament_miscellaneous.dm" -#include "modular_ss220\modules\return_prs\black_mesa\code\armaments\armament_utility.dm" -#include "modular_ss220\modules\return_prs\black_mesa\code\armaments\hecu_armament_station.dm" -#include "modular_ss220\modules\return_prs\black_mesa\code\mobs\bullsquid.dm" -#include "modular_ss220\modules\return_prs\black_mesa\code\mobs\gordon_freeman.dm" -#include "modular_ss220\modules\return_prs\black_mesa\code\mobs\headcrab.dm" -#include "modular_ss220\modules\return_prs\black_mesa\code\mobs\headcrab_zombie.dm" -#include "modular_ss220\modules\return_prs\black_mesa\code\mobs\houndeye.dm" -#include "modular_ss220\modules\return_prs\black_mesa\code\mobs\human_mobs.dm" -#include "modular_ss220\modules\return_prs\black_mesa\code\mobs\mob_spawners.dm" -#include "modular_ss220\modules\return_prs\black_mesa\code\mobs\nihilanth.dm" -#include "modular_ss220\modules\return_prs\black_mesa\code\mobs\vortigaunt.dm" -#include "modular_ss220\modules\return_prs\black_mesa\hev_suit\code\hev_suit.dm" -#include "modular_ss220\modules\return_prs\gunsgalore\code\ammo\ammo.dm" -#include "modular_ss220\modules\return_prs\gunsgalore\code\ammo\misc_items.dm" -#include "modular_ss220\modules\return_prs\gunsgalore\code\guns\akm.dm" -#include "modular_ss220\modules\return_prs\gunsgalore\code\guns\energy.dm" -#include "modular_ss220\modules\return_prs\gunsgalore\code\guns\fg42.dm" -#include "modular_ss220\modules\return_prs\gunsgalore\code\guns\guncrate.dm" -#include "modular_ss220\modules\return_prs\gunsgalore\code\guns\luger.dm" -#include "modular_ss220\modules\return_prs\gunsgalore\code\guns\m16.dm" -#include "modular_ss220\modules\return_prs\gunsgalore\code\guns\mg34.dm" -#include "modular_ss220\modules\return_prs\gunsgalore\code\guns\mp40.dm" -#include "modular_ss220\modules\return_prs\gunsgalore\code\guns\p90.dm" -#include "modular_ss220\modules\return_prs\gunsgalore\code\guns\pps.dm" -#include "modular_ss220\modules\return_prs\gunsgalore\code\guns\ppsh.dm" -#include "modular_ss220\modules\return_prs\gunsgalore\code\guns\scar.dm" -#include "modular_ss220\modules\return_prs\gunsgalore\code\guns\stg.dm" -#include "modular_ss220\modules\shutdown\shutdown_config.dm" -#include "modular_ss220\modules\translations\code\customer_ru.dm" -#include "modular_ss220\modules\tts\code\_tts_defines.dm" -#include "modular_ss220\modules\tts\code\tts_configuration.dm" -#include "modular_ss220\modules\tts\code\tts_mob_Hear.dm" -#include "modular_ss220\modules\tts\code\tts_numbers.dm" -#include "modular_ss220\modules\tts\code\tts_preferences.dm" -#include "modular_ss220\modules\tts\code\tts_provider.dm" -#include "modular_ss220\modules\tts\code\tts_seed.dm" -#include "modular_ss220\modules\tts\code\tts_sound.dm" -#include "modular_ss220\modules\tts\code\tts_sound_TEMPORARY.dm" -#include "modular_ss220\modules\tts\code\tts_subsystem.dm" -#include "modular_ss220\modules\tts\code\base_seeds\mobs\_base.dm" -#include "modular_ss220\modules\tts\code\base_seeds\mobs\alien.dm" -#include "modular_ss220\modules\tts\code\base_seeds\mobs\friendly.dm" -#include "modular_ss220\modules\tts\code\base_seeds\mobs\guardian.dm" -#include "modular_ss220\modules\tts\code\base_seeds\mobs\hostile.dm" -#include "modular_ss220\modules\tts\code\base_seeds\mobs\lavaland.dm" -#include "modular_ss220\modules\tts\code\base_seeds\mobs\other.dm" -#include "modular_ss220\modules\tts\code\base_seeds\mobs\pets.dm" -#include "modular_ss220\modules\tts\code\base_seeds\objs\objs.dm" -#include "modular_ss220\modules\tts\code\providers\silero.dm" -#include "modular_ss220\modules\tts\code\seeds\silero.dm" -#include "modular_ss220\modules\tts\code\~undefs\~tts_undefs.dm" +#include "modular_ss220\modular_includes.dme" // END_INCLUDE diff --git a/tgui/packages/tgui/interfaces/Modpacks.tsx b/tgui/packages/tgui/interfaces/Modpacks.tsx new file mode 100644 index 00000000000000..874f6f52ef8b2f --- /dev/null +++ b/tgui/packages/tgui/interfaces/Modpacks.tsx @@ -0,0 +1,361 @@ +// THIS IS A MASSMETA UI FILE + +import { useState } from 'react'; + +import { useBackend, useLocalState } from '../backend'; +import { + Box, + Collapsible, + Input, + LabeledList, + NoticeBox, + Section, + Stack, + Table, + Tabs, +} from '../components'; +import { Window } from '../layouts'; + +type Data = { + categories: string[]; + features: Modpack[]; + translations: Modpack[]; + reverts: Modpack[]; +}; + +type Modpack = { + name: string; + desc: string; + author: string; + icon_class: string; + id: string; +}; + +export const Modpacks = (props) => { + const { data } = useBackend(); + const { categories } = data; + const [selectedCategory, setSelectedCategory] = useState(categories[0]); + return ( + + + + В данный момент идёт наполнение меню модпаков, в игре модицикаций + больше чем вы можете тут видеть. + + + setSelectedCategory('Features')} + > + Фичи и Приколы + + setSelectedCategory('Translations')} + > + Переводы на Русский + + setSelectedCategory('Reverts')} + > + Балансы и Реверты + + + {(selectedCategory === 'Features' && ) || + (selectedCategory === 'Translations' && ) || + (selectedCategory === 'Reverts' && )} + + + ); +}; + +const FeaturesTable = () => { + const { data } = useBackend(); + const { features } = data; + + const [searchText, setSearchText] = useLocalState('searchText', ''); + + const searchBar = ( + setSearchText(value)} + /> + ); + + if (features.length === 0) { + return ( + + Этот сервер не использует какие-либо прикольные Фичи + + ); + } + + return ( + + +
{searchBar}
+ + +
0 ? ( + Результаты поиска "{searchText}": + ) : ( + Суммарно модификации — {features.length} + ) + } + > + + + {features + .filter( + (feature) => + feature.name && + (searchText.length > 0 + ? feature.name + .toLowerCase() + .includes(searchText.toLowerCase()) || + feature.desc + .toLowerCase() + .includes(searchText.toLowerCase()) || + feature.author + .toLowerCase() + .includes(searchText.toLowerCase()) + : true), + ) + .map((feature) => ( + {feature.name}} + > + + + + + + + + {feature.desc} + + + {feature.author} + + + + + + ))} + + +
+ + + ); +}; + +const TranslationsTable = () => { + const { data } = useBackend(); + const { translations } = data; + + const [searchText, setSearchText] = useLocalState('searchText', ''); + + const searchBar = ( + setSearchText(value)} + /> + ); + + if (translations.length === 0) { + return ( + + Этот сервер не использует какие-либо переводы на Русский + + ); + } + + return ( + + +
{searchBar}
+ + +
0 ? ( + Результаты поиска "{searchText}": + ) : ( + Суммарно модификации — {translations.length} + ) + } + > + + + {translations + .filter( + (translate) => + translate.name && + (searchText.length > 0 + ? translate.name + .toLowerCase() + .includes(searchText.toLowerCase()) || + translate.desc + .toLowerCase() + .includes(searchText.toLowerCase()) || + translate.author + .toLowerCase() + .includes(searchText.toLowerCase()) + : true), + ) + .map((translate) => ( + {translate.name} + } + > + + + + + + + + {translate.desc} + + + {translate.author} + + + + + + ))} + + +
+ + + ); +}; + +const RevertsTable = () => { + const { data } = useBackend(); + const { reverts } = data; + + const [searchText, setSearchText] = useLocalState('searchText', ''); + + const searchBar = ( + setSearchText(value)} + /> + ); + + if (reverts.length === 0) { + return ( + + Этот сервер не использует какие-либо модификации баланса или ревертов + + ); + } + + return ( + + +
{searchBar}
+ + +
0 ? ( + Результаты поиска "{searchText}": + ) : ( + Суммарно модификации — {reverts.length} + ) + } + > + + + {reverts + .filter( + (revert) => + revert.name && + (searchText.length > 0 + ? revert.name + .toLowerCase() + .includes(searchText.toLowerCase()) || + revert.desc + .toLowerCase() + .includes(searchText.toLowerCase()) || + revert.author + .toLowerCase() + .includes(searchText.toLowerCase()) + : true), + ) + .map((revert) => ( + {revert.name}} + > + + + + + + + + {revert.desc} + + + {revert.author} + + + + + + ))} + + +
+ + + ); +};