Skip to content

Commit

Permalink
Merge branch 'master' into brahmin
Browse files Browse the repository at this point in the history
  • Loading branch information
Aurrain authored Oct 18, 2023
2 parents b462663 + 23c5646 commit f80f142
Showing 1 changed file with 6 additions and 2 deletions.
8 changes: 6 additions & 2 deletions code/_globalvars/lists/flavor_misc.dm
Original file line number Diff line number Diff line change
Expand Up @@ -161,10 +161,14 @@ 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,
"Grey Satchel" = /obj/item/storage/backpack/satchel,
"Service Backpack" = /obj/item/storage/backpack/enclave,
"Grey Duffel Bag" = /obj/item/storage/backpack/duffelbag,
"Grey Satchel" = /obj/item/storage/backpack/satchel,
"Leather Satchel" = /obj/item/storage/backpack/satchel/leather,
"Bone Satchel" = /obj/item/storage/backpack/satchel/bone,))
"Bone Satchel" = /obj/item/storage/backpack/satchel/bone,
"Old Satchel" = /obj/item/storage/backpack/satchel/old,
"Service Satchel" = /obj/item/storage/backpack/satchel/enclave
))

//Suit/Skirt
#define PREF_SUIT "Jumpsuit"
Expand Down

0 comments on commit f80f142

Please sign in to comment.