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

[FEAT] Material pouch port #447

Merged
merged 5 commits into from
Jul 22, 2024
Merged

[FEAT] Material pouch port #447

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
a36638e
Initial commit
Chorden523 Jul 21, 2024
277b50e
oops
Chorden523 Jul 21, 2024
6c20057
Merge branch 'master' into material_pouch_port
Chorden523 Jul 21, 2024
61113f9
Changes after sugestion
Chorden523 Jul 22, 2024
408d5a0
Merge branch 'master' into material_pouch_port
Chorden523 Jul 22, 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
1 change: 1 addition & 0 deletions modular_bandastation/modular_bandastation.dme
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,3 +28,4 @@
#include "preferences/_preferences.dme"
#include "drinks/_drinks.dme"
#include "jukebox/_jukebox.dme"
#include "objects/_objects.dme"
4 changes: 4 additions & 0 deletions modular_bandastation/objects/_objects.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
/datum/modpack/objects
name = "Объекты"
desc = "В основном включает в себя портированные объекты и всякие мелочи, которым не нужен отдельный модпак."
author = "dj-34, Chorden"
3 changes: 3 additions & 0 deletions modular_bandastation/objects/_objects.dme
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
#include "_objects.dm"

#include "code/material_pouch.dm"
38 changes: 38 additions & 0 deletions modular_bandastation/objects/code/material_pouch.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,38 @@
/obj/item/storage/bag/material_pouch
name = "material pouch"
desc = "Сумка для хранения листов материалов."
icon = 'modular_bandastation/objects/icons/material_pouch.dmi'
icon_state = "materialpouch"
w_class = WEIGHT_CLASS_BULKY
resistance_flags = FLAMMABLE
slot_flags = ITEM_SLOT_POCKETS | ITEM_SLOT_BELT
var/static/list/matpouch_holdables = list(
/obj/item/stack/sheet/iron,
/obj/item/stack/sheet/plasteel,
/obj/item/stack/sheet/plasmaglass,
/obj/item/stack/sheet/bluespace_crystal,
/obj/item/stack/sheet/bronze,
/obj/item/stack/sheet/glass,
/obj/item/stack/sheet/plasmarglass,
/obj/item/stack/sheet/titaniumglass,
/obj/item/stack/sheet/plastic,
/obj/item/stack/sheet/rglass,
/obj/item/stack/sheet/mineral/wood,
/obj/item/stack/sheet/mineral/adamantine,
/obj/item/stack/sheet/mineral/bamboo,
/obj/item/stack/sheet/mineral/bananium,
/obj/item/stack/sheet/mineral/diamond,
/obj/item/stack/sheet/mineral/gold,
/obj/item/stack/sheet/mineral/metal_hydrogen,
/obj/item/stack/sheet/mineral/uranium,
/obj/item/stack/sheet/mineral/silver,
/obj/item/stack/sheet/mineral/titanium,
)

/obj/item/storage/bag/material_pouch/Initialize(mapload)
. = ..()
atom_storage.max_specific_storage = WEIGHT_CLASS_NORMAL
atom_storage.max_total_storage = INFINITY
atom_storage.max_slots = 2
atom_storage.numerical_stacking = TRUE
atom_storage.set_holdable(matpouch_holdables)
Binary file added modular_bandastation/objects/icons/material_pouch.dmi
View file
Open in desktop
Binary file not shown.
Loading