Skip to content

Commit

Permalink
Tinypaks, backpacks, but tiny [SLIGHTLY LESS MODULAR] (#4651)
Browse files Browse the repository at this point in the history
* Add files via upload

* Create tinypacks

* Update flavor_misc.dm

* Update tgstation.dme

* Rename tinypacks to tinypacks.dm

* Update clothing.dm

* Update _job.dm

* Update tinypacks.dm

* Update tinypacks.dm

* Update _job.dm

* Apply suggestions from code review

Co-authored-by: FlufflesTheDog <[email protected]>

* Update modular_nova/modules/clothing_improvements/code/tinypacks.dm

Co-authored-by: FlufflesTheDog <[email protected]>

---------

Co-authored-by: Bloop <[email protected]>
Co-authored-by: FlufflesTheDog <[email protected]>
  • Loading branch information
3 people authored and StealsThePRs committed Dec 18, 2024
1 parent da3d1f0 commit 9e6ad04
Show file tree
Hide file tree
Showing 7 changed files with 61 additions and 1 deletion.
10 changes: 10 additions & 0 deletions code/_globalvars/lists/flavor_misc.dm
Original file line number Diff line number Diff line change
Expand Up @@ -106,6 +106,11 @@ GLOBAL_LIST_INIT(security_depts_prefs, sort_list(list(
#define GSATCHEL "Grey Satchel"
#define GMESSENGER "Grey Messenger Bag"
#define LSATCHEL "Leather Satchel"
/// NOVA EDIT ADDITION START - Adds tpacks, tiny backpacks
#define TPACKB "Beltpack"
#define TPACKA "Waistpack"
#define TPACKC "Chest pack"
// NOVA EDIT ADDITION END
GLOBAL_LIST_INIT(backpacklist, list(
DBACKPACK,
DDUFFELBAG,
Expand All @@ -116,6 +121,11 @@ GLOBAL_LIST_INIT(backpacklist, list(
GSATCHEL,
GMESSENGER,
LSATCHEL,
// NOVA EDIT ADDITION START
TPACKB,
TPACKA,
TPACKC,
// NOVA EDIT ADDITION END
))

//Suit/Skirt
Expand Down
14 changes: 13 additions & 1 deletion code/modules/client/preferences/clothing.dm
Original file line number Diff line number Diff line change
Expand Up @@ -31,8 +31,12 @@
DSATCHEL,
DDUFFELBAG,
DMESSENGER,
// NOVA EDIT ADDITION START
TPACKB,
TPACKA,
TPACKC,
// NOVA EDIT ADDITION END
)

/datum/preference/choiced/backpack/create_default_value()
return DBACKPACK

Expand All @@ -48,6 +52,14 @@
return /obj/item/storage/backpack/duffelbag
if (GMESSENGER)
return /obj/item/storage/backpack/messenger
// NOVA EDIT ADDITION START
if (TPACKB)
return /obj/item/storage/backpack/tinypakb
if (TPACKA)
return /obj/item/storage/backpack/tinypaka
if (TPACKC)
return /obj/item/storage/backpack/tinypakc
// NOVA EDIT ADDITION END

// In a perfect world, these would be your department's backpack.
// However, this doesn't factor in assistants, or no high slot, and would
Expand Down
8 changes: 8 additions & 0 deletions code/modules/jobs/job_types/_job.dm
Original file line number Diff line number Diff line change
Expand Up @@ -398,6 +398,14 @@
back = duffelbag //Department duffel bag
if(DMESSENGER)
back = messenger //Department messenger bag
// NOVA EDIT ADDITION START - Tinypaks
if(TPACKB)
back = /obj/item/storage/backpack/tinypakb
if(TPACKA)
back = /obj/item/storage/backpack/tinypaka
if(TPACKC)
back = /obj/item/storage/backpack/tinypakc
// NOVA EDIT ADDITION START
else
back = backpack //Department backpack

Expand Down
Binary file not shown.
Binary file not shown.
29 changes: 29 additions & 0 deletions modular_nova/modules/clothing_improvements/code/tinypacks.dm
Original file line number Diff line number Diff line change
@@ -0,0 +1,29 @@
/obj/item/storage/backpack/tinypakb
name = "storage belt"
desc = "A small belt coated from front to back in pouches."
icon_state = "tinypakb"
inhand_icon_state = "messenger"
icon = 'modular_nova/modules/clothing_improvements/code/clothing.dmi'
worn_icon = 'modular_nova/modules/clothing_improvements/code/clothing_worn.dmi'
lefthand_file = 'icons/mob/inhands/equipment/backpack_lefthand.dmi'
righthand_file = 'icons/mob/inhands/equipment/backpack_righthand.dmi'

/obj/item/storage/backpack/tinypaka
name = "waistpack"
desc = "A small, waist-mounted pack for... well, storing stuff!"
icon_state = "tinypaka"
inhand_icon_state = "messenger"
icon = 'modular_nova/modules/clothing_improvements/code/clothing.dmi'
worn_icon = 'modular_nova/modules/clothing_improvements/code/clothing_worn.dmi'
lefthand_file = 'icons/mob/inhands/equipment/backpack_lefthand.dmi'
righthand_file = 'icons/mob/inhands/equipment/backpack_righthand.dmi'

/obj/item/storage/backpack/tinypakc
name = "chest pouch"
desc = "Like a fannypack, but for your chest! ...Seems to hold alot more, though."
icon_state = "tinypakc"
inhand_icon_state = "messenger"
icon = 'modular_nova/modules/clothing_improvements/code/clothing.dmi'
worn_icon = 'modular_nova/modules/clothing_improvements/code/clothing_worn.dmi'
lefthand_file = 'icons/mob/inhands/equipment/backpack_lefthand.dmi'
righthand_file = 'icons/mob/inhands/equipment/backpack_righthand.dmi'
1 change: 1 addition & 0 deletions tgstation.dme
Original file line number Diff line number Diff line change
Expand Up @@ -7347,6 +7347,7 @@
#include "modular_nova\modules\clothing_improvements\code\chaplain.dm"
#include "modular_nova\modules\clothing_improvements\code\functional_toggle.dm"
#include "modular_nova\modules\clothing_improvements\code\holsters.dm"
#include "modular_nova\modules\clothing_improvements\code\tinypacks.dm"
#include "modular_nova\modules\colony_fabricator\code\cargo_packs.dm"
#include "modular_nova\modules\colony_fabricator\code\colony_fabricator.dm"
#include "modular_nova\modules\colony_fabricator\code\looping_sounds.dm"
Expand Down

0 comments on commit 9e6ad04

Please sign in to comment.