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 #1074

Merged
merged 10 commits into from
Mar 11, 2024
Merged

[FEAT] Material pouch #1074

Show file tree
Hide file tree
Changes from 6 commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
90085bd
Добавляем подсумок для материалов вместе с его крафтом
Chorden523 Mar 9, 2024
fb25224
Merge branch 'ss220club:master' into mat_pouch
Chorden523 Mar 10, 2024
4e29872
Меняем название подсумку, добавляем ему спавн раундстартом в шкафы инжей
Chorden523 Mar 10, 2024
7396392
Спавн в руки
Chorden523 Mar 10, 2024
60b8ba1
Merge branch 'ss220club:master' into mat_pouch
Chorden523 Mar 10, 2024
fc1c3c3
Убираем из шкафов, убираем крафт из ткани, добавляем в биоген
Chorden523 Mar 10, 2024
142350d
Минус стопки
Chorden523 Mar 10, 2024
f803a0e
Material pouch = Подсумок для материалов
Chorden523 Mar 10, 2024
61af2a0
Merge branch 'ss220club:master' into mat_pouch
Chorden523 Mar 10, 2024
045ee0b
Merge branch 'ss220club:master' into mat_pouch
Chorden523 Mar 11, 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
8 changes: 8 additions & 0 deletions modular_ss220/hydroponics/code/biogenerator_designs.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,3 +13,11 @@
materials = list(MAT_BIOMASS = 10000)
build_path = /obj/item/seeds/random
category = list("initial","Organic Materials")

/datum/design/material_pouch
name = "Material pouch"
Chorden523 marked this conversation as resolved.
Show resolved Hide resolved
id = "material_pouch"
build_type = BIOGENERATOR
materials = list(MAT_BIOMASS = 500)
build_path = /obj/item/storage/bag/material_pouch
category = list("initial","Leather and Cloth")
1 change: 0 additions & 1 deletion modular_ss220/objects/_objects.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,4 +22,3 @@
GLOB.plastic_recipes += list(
new /datum/stack_recipe("пластиковый стул", /obj/structure/chair/plastic, time = 2 SECONDS, one_per_turf = TRUE, on_floor = TRUE),
)

Chorden523 marked this conversation as resolved.
Show resolved Hide resolved
2 changes: 2 additions & 0 deletions modular_ss220/objects/_objects.dme
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,3 +28,5 @@
#include "code/wallets.dm"
#include "code/flashlight.dm"
#include "code/electrostaff.dm"
#include "code/material_pouch.dm"

34 changes: 34 additions & 0 deletions modular_ss220/objects/code/material_pouch.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,34 @@
/obj/item/storage/bag/material_pouch
name = "material pouch"
desc = "Сумка для хранения листов материалов, вмещает до 5 стопок."
Chorden523 marked this conversation as resolved.
Show resolved Hide resolved
icon = 'modular_ss220/objects/icons/material_pouch.dmi'
icon_state = "materialpouch"
storage_slots = 5
max_combined_w_class = 250
w_class = WEIGHT_CLASS_BULKY
can_hold = list(
/obj/item/stack/sheet,
/obj/item/stack/rods,
)
cant_hold = list(
/obj/item/stack/sheet/mineral/sandbags,
/obj/item/stack/sheet/mineral/snow,
/obj/item/stack/sheet/animalhide,
/obj/item/stack/sheet/xenochitin,
/obj/item/stack/sheet/hairlesshide,
/obj/item/stack/sheet/wetleather,
/obj/item/stack/sheet/leather,
/obj/item/stack/sheet/sinew,
/obj/item/stack/sheet/cloth,
/obj/item/stack/sheet/durathread,
/obj/item/stack/sheet/cotton,
/obj/item/stack/sheet/cotton/durathread,
/obj/item/stack/sheet/bone,
/obj/item/stack/sheet/soil,
/obj/item/stack/sheet/cardboard,
/obj/item/stack/sheet/cheese,
)
resistance_flags = FLAMMABLE
max_w_class = WEIGHT_CLASS_NORMAL
slot_flags = SLOT_FLAG_BELT | SLOT_FLAG_POCKET

Binary file added modular_ss220/objects/icons/material_pouch.dmi
View file
Open in desktop
Binary file not shown.
Loading