Skip to content

Commit

Permalink
frontpack
Browse files Browse the repository at this point in the history
  • Loading branch information
FuzzyFuzlet committed Jul 10, 2024
1 parent e3b8e00 commit 281cde2
Show file tree
Hide file tree
Showing 6 changed files with 9 additions and 7 deletions.
2 changes: 1 addition & 1 deletion AAADevTool/AAA_DEVELOPMENT_CONFIG.json
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
{
"sanic speed" : true
"sanic speed" : false
}
2 changes: 1 addition & 1 deletion code/__DEFINES/inventory.dm
Original file line number Diff line number Diff line change
Expand Up @@ -331,7 +331,7 @@ GLOBAL_LIST_INIT(default_all_armor_slot_allowed, typecacheof(list(
/obj/item/toy,
/obj/item/cult_bastard,
/obj/item/shield,
///obj/item/storage/backpack/satchel,
/obj/item/storage/backpack/satchel,
/obj/item/huntinghorn
)))

Expand Down
2 changes: 1 addition & 1 deletion code/__DEFINES/traits.dm
Original file line number Diff line number Diff line change
Expand Up @@ -353,7 +353,7 @@
#define TRAIT_DISTANT "distant"
#define TRAIT_HEADPAT_SLUT "headpat_sluuuuut"
#define TRAIT_ORAL_FIXATION "oral fixation"
#define TRAIT_PACKRAT "packrat"
//#define TRAIT_PACKRAT "packrat"
#define TRAIT_HYDRA_HEADS "hydra_heads"
#define TRAIT_SHELTERED "sheltered"
#define TRAIT_WEAPONSMITH "weaponsmith"
Expand Down
2 changes: 2 additions & 0 deletions code/datums/traits/good.dm
Original file line number Diff line number Diff line change
Expand Up @@ -1766,6 +1766,7 @@ GLOBAL_LIST_INIT(security_expert, list(
medical_record_text = "Patient has failed heart monitoring tests multiple times."
locked = FALSE

/*
/datum/quirk/packrat
name = "Packrat"
desc = "You are well practiced at hoarding random junk, and can carry nearly double what most others can."
Expand All @@ -1774,6 +1775,7 @@ GLOBAL_LIST_INIT(security_expert, list(
mechanics = "You can carry a second backpack or duffel bag in your suit slot, for additional stuff!"
conflicts = list()
mob_trait = TRAIT_PACKRAT
*/

/datum/quirk/ratfriend
name = "Beast Friend - Rats"
Expand Down
6 changes: 3 additions & 3 deletions code/modules/mob/living/carbon/human/species.dm
Original file line number Diff line number Diff line change
Expand Up @@ -1436,9 +1436,9 @@ GLOBAL_LIST_EMPTY(roundstart_race_names)
return FALSE
if( istype(I, /obj/item/pda) || istype(I, /obj/item/pen) || is_type_in_list(I, GLOB.default_all_armor_slot_allowed) )
return TRUE
if(HAS_TRAIT(H, TRAIT_PACKRAT))
if(istype(I, /obj/item/storage/backpack))
return TRUE
// if(HAS_TRAIT(H, TRAIT_PACKRAT))
// if(istype(I, /obj/item/storage/backpack))
// return TRUE
return FALSE
if(SLOT_HANDCUFFED)
if(H.handcuffed)
Expand Down
2 changes: 1 addition & 1 deletion strings/tips.txt
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ Before entering combat, make sure you ready all your advantages. Drugs, spare we
If things go wrong, don't be afraid to run and fight another day.
The wastes have plenty of loot, if you're willing to delve for it.
The most valuable loot isn't the shiniest, it's the friends you make.
If you struggle with carrying enough loot and ammo, take the packrat quirk for an extra backpack slot!
You can wear satchels in your suit storage slot if you don't want to carry an extra weapon.
Change your key-bindings in the Game Preferences window.
You can de-spawn yourself by dragging yourself onto a matrix tile. You can then later rejoin the round with that character if you wish, although the equipment you despawned with will be lost.
You run slower with large weapons out. Holster them before making a run for it!
Expand Down

0 comments on commit 281cde2

Please sign in to comment.