From ab08b30593f49a735f234139609ef43576717974 Mon Sep 17 00:00:00 2001 From: Chorden523 <130075022+Chorden523@users.noreply.github.com> Date: Wed, 24 Jul 2024 14:26:36 +0800 Subject: [PATCH 1/4] Initial commit --- modular_bandastation/loadout/_loadout.dm | 4 +++ modular_bandastation/loadout/_loadout.dme | 3 ++ modular_bandastation/loadout/code/hampters.dm | 35 +++++++++++++++++++ modular_bandastation/modular_bandastation.dme | 1 + 4 files changed, 43 insertions(+) create mode 100644 modular_bandastation/loadout/_loadout.dm create mode 100644 modular_bandastation/loadout/_loadout.dme create mode 100644 modular_bandastation/loadout/code/hampters.dm diff --git a/modular_bandastation/loadout/_loadout.dm b/modular_bandastation/loadout/_loadout.dm new file mode 100644 index 0000000000000..5f0386b819828 --- /dev/null +++ b/modular_bandastation/loadout/_loadout.dm @@ -0,0 +1,4 @@ +/datum/modpack/loadout + name = "Лоадаут" + desc = "Добавляет новые вещи в лоадаут." + author = "Chorden" diff --git a/modular_bandastation/loadout/_loadout.dme b/modular_bandastation/loadout/_loadout.dme new file mode 100644 index 0000000000000..fe3573d3b3b3f --- /dev/null +++ b/modular_bandastation/loadout/_loadout.dme @@ -0,0 +1,3 @@ +#include "_loadout.dm" + +#include "code/hampters.dm" diff --git a/modular_bandastation/loadout/code/hampters.dm b/modular_bandastation/loadout/code/hampters.dm new file mode 100644 index 0000000000000..98617042741f8 --- /dev/null +++ b/modular_bandastation/loadout/code/hampters.dm @@ -0,0 +1,35 @@ +/datum/loadout_item/pocket_items/plush/hampter_ass + name = "Хамптер ассистент" + item_path = /obj/item/toy/plush/hampter/assistant + +/datum/loadout_item/pocket_items/plush/hampter_cap + name = "Хамптер капитан" + item_path = /obj/item/toy/plush/hampter/captain + +/datum/loadout_item/pocket_items/plush/hampter_ded + name = "Хамптер дедсквада" + item_path = /obj/item/toy/plush/hampter/deadsquad + +/datum/loadout_item/pocket_items/plush/hampter_ert + name = "Хамптер ОБР" + item_path = /obj/item/toy/plush/hampter/ert + +/datum/loadout_item/pocket_items/plush/hampter_jan + name = "Хамптер уборщик" + item_path = /obj/item/toy/plush/hampter/janitor + +/datum/loadout_item/pocket_items/plush/hampter_med + name = "Хамптер врач" + item_path = /obj/item/toy/plush/hampter/medical + +/datum/loadout_item/pocket_items/plush/hampter_cap_old + name = "Хамптер старый капитан" + item_path = /obj/item/toy/plush/hampter/old_captain + +/datum/loadout_item/pocket_items/plush/hampter_sdy + name = "Хамптер синдиката" + item_path = /obj/item/toy/plush/hampter/syndicate + +/datum/loadout_item/pocket_items/plush/hampter_sec + name = "Хамптер офицер" + item_path = /obj/item/toy/plush/hampter/security diff --git a/modular_bandastation/modular_bandastation.dme b/modular_bandastation/modular_bandastation.dme index 9d82748282b85..020c1846dfb92 100644 --- a/modular_bandastation/modular_bandastation.dme +++ b/modular_bandastation/modular_bandastation.dme @@ -31,3 +31,4 @@ #include "drinks/_drinks.dme" #include "jukebox/_jukebox.dme" #include "objects/_objects.dme" +#include "loadout/_loadout.dme" From af05059445a62112c9da907c6e256aeec3ae4a41 Mon Sep 17 00:00:00 2001 From: Chorden523 <130075022+Chorden523@users.noreply.github.com> Date: Wed, 24 Jul 2024 14:30:49 +0800 Subject: [PATCH 2/4] Grammar --- modular_bandastation/loadout/code/hampters.dm | 2 +- modular_bandastation/objects/code/hampters.dm | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/modular_bandastation/loadout/code/hampters.dm b/modular_bandastation/loadout/code/hampters.dm index 98617042741f8..20be3ffed821a 100644 --- a/modular_bandastation/loadout/code/hampters.dm +++ b/modular_bandastation/loadout/code/hampters.dm @@ -7,7 +7,7 @@ item_path = /obj/item/toy/plush/hampter/captain /datum/loadout_item/pocket_items/plush/hampter_ded - name = "Хамптер дедсквада" + name = "Хамптер Дедсквада" item_path = /obj/item/toy/plush/hampter/deadsquad /datum/loadout_item/pocket_items/plush/hampter_ert diff --git a/modular_bandastation/objects/code/hampters.dm b/modular_bandastation/objects/code/hampters.dm index 94c5300f7260b..8b7838bc816b9 100644 --- a/modular_bandastation/objects/code/hampters.dm +++ b/modular_bandastation/objects/code/hampters.dm @@ -52,7 +52,7 @@ /obj/item/toy/plush/hampter/old_captain name = "хамптер старый капитан" - desc = "ПЛюшевый хамптер капитан в старой униформе. Это какой год?" + desc = "Плюшевый хамптер капитан в старой униформе. Это какой год?" icon_state = "hampter_old-cap" inhand_icon_state = "hampter_old-cap" worn_icon_state = "hampter_old-cap" From 79f49f16e16867895f5dad9d538a88e63fdafedb Mon Sep 17 00:00:00 2001 From: Chorden523 <130075022+Chorden523@users.noreply.github.com> Date: Wed, 24 Jul 2024 19:38:46 +0800 Subject: [PATCH 3/4] Linter --- modular_bandastation/modular_bandastation.dme | 1 - 1 file changed, 1 deletion(-) diff --git a/modular_bandastation/modular_bandastation.dme b/modular_bandastation/modular_bandastation.dme index 3a71351e8a6b2..36693b0faaacd 100644 --- a/modular_bandastation/modular_bandastation.dme +++ b/modular_bandastation/modular_bandastation.dme @@ -32,4 +32,3 @@ #include "drinks/_drinks.dme" #include "jukebox/_jukebox.dme" #include "objects/_objects.dme" -#include "loadout/_loadout.dme" From 31c91c90543473f4e07bce1cd1c4d551f1d6d1a7 Mon Sep 17 00:00:00 2001 From: Chorden523 <130075022+Chorden523@users.noreply.github.com> Date: Wed, 24 Jul 2024 21:41:11 +0800 Subject: [PATCH 4/4] Moved hampters to category --- modular_bandastation/loadout/_loadout.dme | 2 +- .../loadout/code/{hampters.dm => categories/pocket.dm} | 0 2 files changed, 1 insertion(+), 1 deletion(-) rename modular_bandastation/loadout/code/{hampters.dm => categories/pocket.dm} (100%) diff --git a/modular_bandastation/loadout/_loadout.dme b/modular_bandastation/loadout/_loadout.dme index 5b982b600f9ca..39fe2629a8fd4 100644 --- a/modular_bandastation/loadout/_loadout.dme +++ b/modular_bandastation/loadout/_loadout.dme @@ -5,4 +5,4 @@ #include "code/loadout_items.dm" #include "code/loadout_preference.dm" #include "code/categories/accessories.dm" -#include "code/hampters.dm" +#include "code/categories/pocket.dm" diff --git a/modular_bandastation/loadout/code/hampters.dm b/modular_bandastation/loadout/code/categories/pocket.dm similarity index 100% rename from modular_bandastation/loadout/code/hampters.dm rename to modular_bandastation/loadout/code/categories/pocket.dm