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

Jump to bottom

Addition + Port: Backpacks Selection + Dark Durathread #125

Merged
merged 2 commits into from
Apr 30, 2024
Merged

Addition + Port: Backpacks Selection + Dark Durathread #125

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
5418bc1
backcentrel
OliOliOnsiPree Apr 25, 2024
6707c32
Merge branch 'master' into backpacks
xTrainx Apr 30, 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
16 changes: 15 additions & 1 deletion code/_globalvars/lists/flavor_misc.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -104,13 +104,27 @@ GLOBAL_LIST_INIT(security_depts_prefs, list(SEC_DEPT_RANDOM, SEC_DEPT_NONE, SEC_
#define DDUFFELBAG "Department Duffel Bag"
GLOBAL_LIST_INIT(backbaglist, list(DBACKPACK, DSATCHEL, DDUFFELBAG, //everything after this point is a non-department backpack
"Hiking Backpack" = /obj/item/storage/backpack,
"Medical Backpack" = /obj/item/storage/backpack/medic,
"Service Backpack" = /obj/item/storage/backpack/enclave,
"Security Backpack" = /obj/item/storage/backpack/security,
"Captain Backpack" = /obj/item/storage/backpack/captain,
"Trekkers Pack" = /obj/item/storage/backpack/trekker,
"Trophy Rack" = /obj/item/storage/backpack/cultpack,
"Explorer Bag" = /obj/item/storage/backpack/explorer,
"Grey Duffel Bag" = /obj/item/storage/backpack/duffelbag,
"Medical Duffel Bag" = /obj/item/storage/backpack/duffelbag/med,
"Security Duffel Bag" = /obj/item/storage/backpack/duffelbag/sec,
"Captain Duffel Bag" = /obj/item/storage/backpack/duffelbag/captain,
"Grey Satchel" = /obj/item/storage/backpack/satchel,
"Leather Satchel" = /obj/item/storage/backpack/satchel/leather,
"Bone Satchel" = /obj/item/storage/backpack/satchel/bone,
"Explorer Satchel" = /obj/item/storage/backpack/satchel/explorer,
"Medical Satchel" = /obj/item/storage/backpack/satchel/med,
"Old Satchel" = /obj/item/storage/backpack/satchel/old,
"Service Satchel" = /obj/item/storage/backpack/satchel/enclave
"Service Satchel" = /obj/item/storage/backpack/satchel/enclave,
"Security Satchel" = /obj/item/storage/backpack/satchel/sec,
"Captain Satchel" = /obj/item/storage/backpack/satchel/cap,
"Trekkers Satchel" = /obj/item/storage/backpack/satchel/trekker,
))

//Suit/Skirt
Expand Down
3 changes: 2 additions & 1 deletion code/game/objects/items/stacks/sheets/sheet_types.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -511,7 +511,8 @@ GLOBAL_LIST_INIT(cloth_recipes, list ( \
* Durathread
*/
GLOBAL_LIST_INIT(durathread_recipes, list ( \
new/datum/stack_recipe("durathread dufflebag", /obj/item/storage/backpack/duffelbag/durathread, 6, time = 60)
new/datum/stack_recipe("durathread dufflebag", /obj/item/storage/backpack/duffelbag/durathread, 6, time = 60), \
new/datum/stack_recipe("dark durathread dufflebag", /obj/item/storage/backpack/duffelbag/durathread/dark, 6, time = 60) \
))

/obj/item/stack/sheet/durathread
Expand Down
6 changes: 6 additions & 0 deletions code/game/objects/items/storage/backpack.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -461,6 +461,12 @@
resistance_flags = FIRE_PROOF
slowdown = 0

/obj/item/storage/backpack/duffelbag/durathread/dark
name = "dark durathread duffel bag"
desc = "A lightweight duffel bag made out of durathread."
icon_state = "duffel-syndie"
item_state = "duffel-syndieammo"

/obj/item/storage/backpack/duffelbag/drone
name = "drone duffel bag"
desc = "A large duffel bag for holding tools and hats."
Expand Down
Loading