From 9e6ad0440fd39c25e3070734ba78317de6bafa2b Mon Sep 17 00:00:00 2001 From: RatFromTheJungle <62520989+RatFromTheJungle@users.noreply.github.com> Date: Wed, 18 Dec 2024 18:12:18 -0500 Subject: [PATCH] Tinypaks, backpacks, but tiny [SLIGHTLY LESS MODULAR] (#4651) * 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 * Update modular_nova/modules/clothing_improvements/code/tinypacks.dm Co-authored-by: FlufflesTheDog --------- Co-authored-by: Bloop <13398309+vinylspiders@users.noreply.github.com> Co-authored-by: FlufflesTheDog --- code/_globalvars/lists/flavor_misc.dm | 10 ++++++ code/modules/client/preferences/clothing.dm | 14 ++++++++- code/modules/jobs/job_types/_job.dm | 8 +++++ .../clothing_improvements/code/clothing.dmi | Bin 0 -> 590 bytes .../code/clothing_worn.dmi | Bin 0 -> 507 bytes .../clothing_improvements/code/tinypacks.dm | 29 ++++++++++++++++++ tgstation.dme | 1 + 7 files changed, 61 insertions(+), 1 deletion(-) create mode 100644 modular_nova/modules/clothing_improvements/code/clothing.dmi create mode 100644 modular_nova/modules/clothing_improvements/code/clothing_worn.dmi create mode 100644 modular_nova/modules/clothing_improvements/code/tinypacks.dm diff --git a/code/_globalvars/lists/flavor_misc.dm b/code/_globalvars/lists/flavor_misc.dm index 00b26e7703d..bb799e0c0cb 100644 --- a/code/_globalvars/lists/flavor_misc.dm +++ b/code/_globalvars/lists/flavor_misc.dm @@ -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, @@ -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 diff --git a/code/modules/client/preferences/clothing.dm b/code/modules/client/preferences/clothing.dm index a595af615e8..8ac6951a390 100644 --- a/code/modules/client/preferences/clothing.dm +++ b/code/modules/client/preferences/clothing.dm @@ -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 @@ -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 diff --git a/code/modules/jobs/job_types/_job.dm b/code/modules/jobs/job_types/_job.dm index 8731a1397b1..c95102d9b0e 100644 --- a/code/modules/jobs/job_types/_job.dm +++ b/code/modules/jobs/job_types/_job.dm @@ -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 diff --git a/modular_nova/modules/clothing_improvements/code/clothing.dmi b/modular_nova/modules/clothing_improvements/code/clothing.dmi new file mode 100644 index 0000000000000000000000000000000000000000..b347b9cd0356d6f5dc3b97a9be1c0e7f10345304 GIT binary patch literal 590 zcmV-U0%zgw!otaki=9YGTT+WmZvX%Q0d!JMQvg8b*k%9#0Cjp) zSad{Xb7OL8aCB*JZU6vyoKseCa&`CgQ*iP1Z!WQw0?I(kQ#Pw070tN z6Qi66R&!HRsNy6!3*%a{?!ay&^9h)liQEa07xTM}XN9U^7?Dg<_%P0wy>lYxf@QIt znChN^+xMBkLrv#f2UIvdete)J*SIiO3I9vKye+DW8B+xbcXj1OujpwNrf30JR1uf8x&ibTcbvZF@3 cH2!+L1Bak9Hz3H=^#A|>07*qoM6N<$g6Ks3^Z)<= literal 0 HcmV?d00001 diff --git a/modular_nova/modules/clothing_improvements/code/clothing_worn.dmi b/modular_nova/modules/clothing_improvements/code/clothing_worn.dmi new file mode 100644 index 0000000000000000000000000000000000000000..b39cc1e40dcb1d094e1134ae408650857405397a GIT binary patch literal 507 zcmVV_YZUq3m z95Z%fC8ZJo009$8L_t(oh3%J7YQr!LhGli_bCUT0cH9GGVS8_B4^Vc3vHKsQNg1_d zD;cHiVeo$th-Cl2WxvQK0sw$N#Ra0MG8^Bh3CBSTeB)aY`>ySzVj4@zup4j5EJ!i! zg&@WAF$J;SB+)fac5;Q(6AJ+`k0Xn4Bm*V*`7(WwkqV>;00000Ca$xxt(CO#Z^3YV zS9g-8o{@>Yk>r?Nd7;DKE3hsQEGpoJS1WL)y}T6dPiuMr001SM=j7bWx9qSuZ;|vF zeyhgi-?~ZghkS<;9g6W;vAxUOMf=Usw{A`^g~43XE*pGNxlMjm1=Oc7$o@6=xnh^D xY_G14wLx(V^{K2j(~5FEJM|!sl>oqh=L)tW4ope;AeI0C002ovPDHLkV1l_E)M@|# literal 0 HcmV?d00001 diff --git a/modular_nova/modules/clothing_improvements/code/tinypacks.dm b/modular_nova/modules/clothing_improvements/code/tinypacks.dm new file mode 100644 index 00000000000..0cf29707ba5 --- /dev/null +++ b/modular_nova/modules/clothing_improvements/code/tinypacks.dm @@ -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' diff --git a/tgstation.dme b/tgstation.dme index ea343b72702..3a7331b8b9b 100644 --- a/tgstation.dme +++ b/tgstation.dme @@ -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"