cyberpresidentvanellope/Bubberstation
1
0
Fork 0
mirror of https://github.com/Bubberstation/Bubberstation.git synced 2026-08-25 22:19:30 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master' into upstream-feb12-2026

Browse Source 
# Conflicts:
#	tgstation.dme
This commit is contained in:
nevimer
2026-03-18 13:48:42 -04:00
parent cb7d2ab1e6 0a873295a4
commit 29ef34cf8d
12 changed files with 76 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/client/preferences/clothing.dm
+12
View File
@@ -31,9 +31,14 @@
DSATCHEL,
DDUFFELBAG,
DMESSENGER,
//BUBBER EDIT BEGIN
FBACKPACK,
FSATCHEL,
FMESSENGER,
TPACKWAIST,
TPACKBELT,
TPACKCHEST,
//BUBBER EDIT END
)
/datum/preference/choiced/backpack/create_default_value()
@@ -51,12 +56,19 @@
return /obj/item/storage/backpack/duffelbag
if (GMESSENGER)
return /obj/item/storage/backpack/messenger
//BUBBER EDIT BEGIN
if (FBACKPACK)
return /obj/item/storage/backpack/industrial/frontier_colonist
if (FSATCHEL)
return /obj/item/storage/backpack/industrial/frontier_colonist/satchel
if (FMESSENGER)
return /obj/item/storage/backpack/industrial/frontier_colonist/messenger
if (TPACKWAIST)
return /obj/item/storage/backpack/waist_pack
if (TPACKBELT)
return /obj/item/storage/backpack/storage_belt
if (TPACKCHEST)
return /obj/item/storage/backpack/chest_pack
// In a perfect world, these would be your department's backpack.
// However, this doesn't factor in assistants, or no high slot, and would