From c09205ac3a915467f78eec8b4f082623acac957c Mon Sep 17 00:00:00 2001 From: Legendaxe <102746941+Legendaxe@users.noreply.github.com> Date: Thu, 18 Jan 2024 13:55:24 +0200 Subject: [PATCH 1/3] tweak: cargo miscellaneous update --- modular_ss220/modular_ss220.dme | 1 + modular_ss220/supply/_supply.dm | 4 ++++ modular_ss220/supply/_supply.dme | 3 +++ modular_ss220/supply/code/pack_miscellaneous.dm | 12 ++++++++++++ 4 files changed, 20 insertions(+) create mode 100644 modular_ss220/supply/_supply.dm create mode 100644 modular_ss220/supply/_supply.dme create mode 100644 modular_ss220/supply/code/pack_miscellaneous.dm diff --git a/modular_ss220/modular_ss220.dme b/modular_ss220/modular_ss220.dme index 53a170e02283..c3160371ce47 100644 --- a/modular_ss220/modular_ss220.dme +++ b/modular_ss220/modular_ss220.dme @@ -77,6 +77,7 @@ #include "phrases/_phrases.dme" #include "species_whitelist/_species_whitelist.dme" #include "antagonists/_antagonists.dme" +#include "supply/_supply.dme" // --- PRIME --- // // #define MODPACK_MAIN_ONLY diff --git a/modular_ss220/supply/_supply.dm b/modular_ss220/supply/_supply.dm new file mode 100644 index 000000000000..0cbc82d9d9bc --- /dev/null +++ b/modular_ss220/supply/_supply.dm @@ -0,0 +1,4 @@ +/datum/modpack/supply + name = "Supply" + desc = "Модпак для заказов в карго" + author = "legendaxe" diff --git a/modular_ss220/supply/_supply.dme b/modular_ss220/supply/_supply.dme new file mode 100644 index 000000000000..f50c79919f46 --- /dev/null +++ b/modular_ss220/supply/_supply.dme @@ -0,0 +1,3 @@ +#include "_supply.dm" + +#include "code/pack_miscellaneous.dm" diff --git a/modular_ss220/supply/code/pack_miscellaneous.dm b/modular_ss220/supply/code/pack_miscellaneous.dm new file mode 100644 index 000000000000..381ecd18b501 --- /dev/null +++ b/modular_ss220/supply/code/pack_miscellaneous.dm @@ -0,0 +1,12 @@ +/datum/supply_packs/misc/bigband/New() + . = ..() + + contains |= /obj/machinery/jukebox/drum_red + +/datum/supply_packs/misc/soundhand + name = "Soundhand fan crate" + contains = list(/obj/item/clothing/suit/soundhand_black_jacket, + /obj/item/clothing/suit/soundhand_olive_jacket, + /obj/item/clothing/suit/soundhand_brown_jacket) + cost = 600 + containername = "soundhand fan crate" From 1b60129a539609c407ad7700b36cc2cd08bbe82d Mon Sep 17 00:00:00 2001 From: Volodymir Ohorodnytskyi <102746941+Legendaxe@users.noreply.github.com> Date: Sat, 27 Jan 2024 13:26:29 +0200 Subject: [PATCH 2/3] Update modular_ss220.dme --- modular_ss220/modular_ss220.dme | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/modular_ss220/modular_ss220.dme b/modular_ss220/modular_ss220.dme index c3160371ce47..beafff8bad8c 100644 --- a/modular_ss220/modular_ss220.dme +++ b/modular_ss220/modular_ss220.dme @@ -37,6 +37,7 @@ #include "clumsy_table/_clumsy_table.dme" // --- MISC --- // +#include "supply/_supply.dme" #include "administration/_administration.dme" #include "aesthetics_sounds/_aesthetics_sounds.dme" #include "agent_id_tgui/_agent_id_tgui.dme" @@ -77,7 +78,7 @@ #include "phrases/_phrases.dme" #include "species_whitelist/_species_whitelist.dme" #include "antagonists/_antagonists.dme" -#include "supply/_supply.dme" + // --- PRIME --- // // #define MODPACK_MAIN_ONLY From 0dd45ab41304a2336dfe7336b645d2f080bba2dd Mon Sep 17 00:00:00 2001 From: Volodymir Ohorodnytskyi <102746941+Legendaxe@users.noreply.github.com> Date: Sat, 27 Jan 2024 13:28:40 +0200 Subject: [PATCH 3/3] Update modular_ss220.dme --- modular_ss220/modular_ss220.dme | 1 - 1 file changed, 1 deletion(-) diff --git a/modular_ss220/modular_ss220.dme b/modular_ss220/modular_ss220.dme index beafff8bad8c..6cec7435f21f 100644 --- a/modular_ss220/modular_ss220.dme +++ b/modular_ss220/modular_ss220.dme @@ -79,7 +79,6 @@ #include "species_whitelist/_species_whitelist.dme" #include "antagonists/_antagonists.dme" - // --- PRIME --- // // #define MODPACK_MAIN_ONLY // Чтобы отключить модпаки прайма, нужно добавиту строку выше в code/__DEFINES/_ss220.dm.