diff --git a/AAADevTool/AAA_DEVELOPMENT_CONFIG.json b/AAADevTool/AAA_DEVELOPMENT_CONFIG.json index d02253af778..316412f2b18 100644 --- a/AAADevTool/AAA_DEVELOPMENT_CONFIG.json +++ b/AAADevTool/AAA_DEVELOPMENT_CONFIG.json @@ -1,3 +1,3 @@ { - "sanic speed" : true + "sanic speed" : false } diff --git a/code/__DEFINES/inventory.dm b/code/__DEFINES/inventory.dm index 32669881a7d..d5194caafe8 100644 --- a/code/__DEFINES/inventory.dm +++ b/code/__DEFINES/inventory.dm @@ -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 ))) diff --git a/code/__DEFINES/traits.dm b/code/__DEFINES/traits.dm index 15c16fd8c6d..5ebd19d6336 100644 --- a/code/__DEFINES/traits.dm +++ b/code/__DEFINES/traits.dm @@ -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" diff --git a/code/datums/traits/good.dm b/code/datums/traits/good.dm index 20c19409eb1..6179bce0e13 100644 --- a/code/datums/traits/good.dm +++ b/code/datums/traits/good.dm @@ -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." @@ -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" diff --git a/code/modules/mob/living/carbon/human/species.dm b/code/modules/mob/living/carbon/human/species.dm index ee9ea435910..2152d63cce3 100644 --- a/code/modules/mob/living/carbon/human/species.dm +++ b/code/modules/mob/living/carbon/human/species.dm @@ -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) diff --git a/strings/tips.txt b/strings/tips.txt index 508a470d615..5adbbd9c77c 100644 --- a/strings/tips.txt +++ b/strings/tips.txt @@ -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!