Skip to content

Commit b25aee2

Browse files
committed
Импровизация модулей
1 parent 7a091a2 commit b25aee2

85 files changed

Lines changed: 134 additions & 247 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

code/__HELPERS/priority_announce.dm

Lines changed: 0 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -56,23 +56,18 @@
5656
sound = SSstation.announcer.event_sounds[sound]
5757

5858
var/header
59-
var/title_shit // MASSMETA EDIT (вебхуки)
6059
switch(type)
6160
if(ANNOUNCEMENT_TYPE_PRIORITY)
6261
header = MAJOR_ANNOUNCEMENT_TITLE("Priority Announcement")
63-
title_shit = "Priority Announcement" // MASSMETA EDIT (вебхуки)
6462
if(length(title) > 0)
6563
header += SUBHEADER_ANNOUNCEMENT_TITLE(title)
6664
if(ANNOUNCEMENT_TYPE_CAPTAIN)
6765
header = MAJOR_ANNOUNCEMENT_TITLE("Captain's Announcement")
68-
title_shit = "Captain's Announcement" // MASSMETA EDIT (вебхуки)
6966
GLOB.news_network.submit_article(text, "Captain's Announcement", NEWSCASTER_STATION_ANNOUNCEMENTS, null)
7067
if(ANNOUNCEMENT_TYPE_SYNDICATE)
7168
header = MAJOR_ANNOUNCEMENT_TITLE("Syndicate Captain's Announcement")
72-
title_shit = "Syndicate Captain's Announcement" // MASSMETA EDIT (вебхуки)
7369
else
7470
header += generate_unique_announcement_header(title, sender_override)
75-
title_shit = title // MASSMETA EDIT (вебхуки)
7671

7772
announcement_strings += ANNOUNCEMENT_HEADER(header)
7873

@@ -96,8 +91,6 @@
9691
else
9792
GLOB.news_network.submit_article(text, "[command_name()] Update", NEWSCASTER_STATION_ANNOUNCEMENTS, null)
9893

99-
send2announcement_webhook(title_shit, text, sender_override, color_override) // MASSMETA EDIT: Добавляем отправку анонсов в Discord
100-
10194
/proc/print_command_report(text = "", title = null, announce=TRUE)
10295
if(!title)
10396
title = "Classified [command_name()] Update"
@@ -152,14 +145,6 @@
152145
var/custom_sound = sound_override || (alert ? 'sound/announcer/notice/notice1.ogg' : 'sound/announcer/notice/notice2.ogg')
153146
dispatch_announcement_to_players(finalized_announcement, players, custom_sound, should_play_sound)
154147

155-
// MASSMETA EDIT BEGIN (вебхуки)
156-
var/text = message
157-
if(title != null && title != "" && title == "Attention:")
158-
send2announcement_webhook(title, text, color_override) // MASSMETA EDIT: Добавляем отправку анонсов в Discord
159-
else
160-
send2announcement_webhook("Attention", text, color_override) // MASSMETA EDIT: Добавляем отправку анонсов в Discord
161-
// MASSMETA EDIT END
162-
163148
/// Sends an announcement about the level changing to players. Uses the passed in datum and the subsystem's previous security level to generate the message.
164149
/proc/level_announce(datum/security_level/selected_level, previous_level_number)
165150
var/current_level_number = selected_level.number_level

code/__HELPERS/roundend.dm

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -292,9 +292,6 @@ GLOBAL_LIST_INIT(achievements_unlocked, list())
292292

293293
world.TgsTriggerEvent("tg-Roundend", wait_for_completion = TRUE)
294294

295-
// MASSMETA EDIT (вебхуки)
296-
send2announcement_webhook("Round Ended", "[GLOB.round_id ? "Round [GLOB.round_id]" : "The round has"] just ended.", null, "green")
297-
298295
sleep(5 SECONDS)
299296
ready_for_reboot = TRUE
300297
standard_reboot()

code/controllers/subsystem/ticker.dm

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -297,9 +297,6 @@ SUBSYSTEM_DEF(ticker)
297297

298298
PostSetup()
299299

300-
// MASSMETA EDIT (вебхуки)
301-
send2announcement_webhook("Round Start", "[GLOB.round_id ? "Round [GLOB.round_id]" : "The round has"] started.", null, "green")
302-
303300
return TRUE
304301

305302
/datum/controller/subsystem/ticker/proc/PostSetup()

modular_meta/__modpack/modpack.dm

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
var/desc
1010
/// A string with authors of this modpack.
1111
var/author
12-
/// A string with group of this modpack. Choose between "Features", "Translations" and "Reverts"
12+
/// A string with group of this modpack. Choose between "Features", "Tweaks" and "Reverts"
1313
var/group
1414
/// A list of your modpack's dependencies. If you use obj from another modpack - put it here.
1515
var/list/mod_depends = list()
@@ -58,9 +58,9 @@
5858

5959
/datum/modpack/ui_static_data(mob/user)
6060
. = ..()
61-
.["categories"] = list("Features", "Translations", "Reverts")
61+
.["categories"] = list("Features", "Tweaks", "Reverts")
6262
.["features"] = list()
63-
.["translations"] = list()
63+
.["tweaks"] = list()
6464
.["reverts"] = list()
6565

6666
var/datum/asset/spritesheet_batched/assets = get_asset_datum(/datum/asset/spritesheet_batched/modpacks)
@@ -78,9 +78,9 @@
7878

7979
if (modpack.group == "Фичи" || modpack.group == "Features")
8080
.["features"] += list(modpack_data)
81-
else if (modpack.group == "Переводы" || modpack.group == "Translations")
82-
.["translations"] += list(modpack_data)
83-
else if (modpack.group == "Балансы" || modpack.group == "Reverts")
81+
else if (modpack.group == "Твики" || modpack.group == "Tweaks")
82+
.["tweaks"] += list(modpack_data)
83+
else if (modpack.group == "Откаты" || modpack.group == "Reverts")
8484
.["reverts"] += list(modpack_data)
8585
else
8686
CRASH("Modpack [modpack.name] has bad group name or queued for deletion.")

modular_meta/features/countdown_antimov_sfx/includes.dm

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,9 @@
22
#include "code\countdown.dm"
33

44
/datum/modpack/countdown_antimov_sfx
5-
id = "COUNTDOWN"
5+
id = "countdown_antimov_sfx"
66
icon = 'modular_meta/features/countdown_antimov_sfx/preview.dmi'
7-
name = "Misc stuff"
7+
name = "Countdown Antimov SFX"
88
group = "Features"
9-
desc = "Добавляет звук ИИ-шке при получении набора законов «Антимов». А также музыку при объявлении войны и запуске ядерной боеголовки"
9+
desc = "Добавляет звук ИИ при получении набора законов «Антимов». А также музыку при объявлении войны и запуске ядерной боеголовки"
1010
author = "code by Bruh24, idea by piki.ta"

modular_meta/features/hierophant_club_resprite/code/master_megafauna_loot.dm

Lines changed: 0 additions & 5 deletions
This file was deleted.

modular_meta/features/hierophant_club_resprite/includes.dm

Lines changed: 0 additions & 8 deletions
This file was deleted.

modular_meta/features/roundstart_shell/includes.dm

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
/datum/modpack/roundstart_shell
44
id = "roundstart_shell"
5-
name = "Раундстартовые шеллы для ИИ"
5+
name = "Раундстартовые оболочки для ИИ"
66
group = "Features"
77
desc = "Добавляет на каждую станцию по 2 шелла для ИИ."
88
author = "Sanecman"

modular_meta/features/send2status/code/webhook.dm

Lines changed: 0 additions & 46 deletions
This file was deleted.

modular_meta/features/send2status/include.dm

Lines changed: 0 additions & 8 deletions
This file was deleted.

0 commit comments

Comments
 (0)