Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Hampters now in loadout #454

Merged
merged 6 commits into from
Jul 24, 2024
Merged

Hampters now in loadout #454

Show file tree
Hide file tree
Changes from 5 commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
ab08b30
Initial commit
Chorden523 Jul 24, 2024
af05059
Grammar
Chorden523 Jul 24, 2024
ada162c
Merge branch 'master' into hampters_loadout
Chorden523 Jul 24, 2024
77f0c3f
Merge branch 'master' into hampters_loadout
Chorden523 Jul 24, 2024
79f49f1
Linter
Chorden523 Jul 24, 2024
31c91c9
Moved hampters to category
Chorden523 Jul 24, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions modular_bandastation/loadout/_loadout.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
/datum/modpack/loadout
name = "Loadout"
desc = "Изменения в loadout."
author = "larentoun"
desc = "Добавляет новые вещи в loadout и изменяет уже существующие."
author = "larentoun, Chorden"
1 change: 1 addition & 0 deletions modular_bandastation/loadout/_loadout.dme
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,3 +5,4 @@
#include "code/loadout_items.dm"
#include "code/loadout_preference.dm"
#include "code/categories/accessories.dm"
#include "code/hampters.dm"
Chorden523 marked this conversation as resolved.
Show resolved Hide resolved
35 changes: 35 additions & 0 deletions modular_bandastation/loadout/code/hampters.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
2 changes: 1 addition & 1 deletion modular_bandastation/objects/code/hampters.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
Loading