diff --git a/code/__DEFINES/inventory/carry_weight.dm b/code/__DEFINES/inventory/carry_weight.dm index e4793fa3a033..f9d8f6acb020 100644 --- a/code/__DEFINES/inventory/carry_weight.dm +++ b/code/__DEFINES/inventory/carry_weight.dm @@ -1,8 +1,6 @@ //* This file is explicitly licensed under the MIT license. *// //* Copyright (c) 2023 Citadel Station developers. *// -#warn value tune everything - //? Despite this being carry_weight.dm, this contains defines for: //? carry strength - how much someone can carry or move //? weight - how much stuff weighs, recursive diff --git a/code/game/objects/items.dm b/code/game/objects/items.dm index 7be49b7886de..b20e17e97e5c 100644 --- a/code/game/objects/items.dm +++ b/code/game/objects/items.dm @@ -37,8 +37,6 @@ var/economic_category_item = ECONOMIC_CATEGORY_ITEM_DEFAULT //? Carry Weight - // todo: rename carry_weight to weight by getting rid of other var/weight variables. - /// encumberance. /// calculated as max() of all encumbrance /// result is calculated into slowdown value diff --git a/code/modules/mob/living/inventory.dm b/code/modules/mob/living/inventory.dm index bff82ec59e99..f358f3b68d5f 100644 --- a/code/modules/mob/living/inventory.dm +++ b/code/modules/mob/living/inventory.dm @@ -269,7 +269,7 @@ for(var/obj/item/I as anything in get_equipped_items()) tally_weight += (I.weight_registered = I.get_weight()) if(I.is_held()) - if(!(I.item_flags & ITEM_ENCUMBER_IN_HAND)) + if(!(I.item_flags & ITEM_ENCUMBERS_WHILE_HELD)) I.encumbrance_registered = null continue else diff --git a/code/modules/mob/living/living_defines.dm b/code/modules/mob/living/living_defines.dm index 09f8fe99f048..9281567fb6f7 100644 --- a/code/modules/mob/living/living_defines.dm +++ b/code/modules/mob/living/living_defines.dm @@ -132,6 +132,8 @@ var/cached_carry_weight = 0 /// cached encumbrance of all items var/cached_carry_encumbrance = 0 + /// highest flat encumbrance of all items + var/cached_carry_flat_encumbrance = 0 //? movement /// are we currently pushing (or trying to push) (or otherwise inside Bump() handling that deals with this crap) another atom? diff --git a/code/modules/species/protean/protean.dm b/code/modules/species/protean/protean.dm index 2a096b1abaa0..f20b7b98266b 100644 --- a/code/modules/species/protean/protean.dm +++ b/code/modules/species/protean/protean.dm @@ -3,7 +3,7 @@ /datum/physiology_modifier/intrinsic/species/protean carry_strength_add = CARRY_STRENGTH_ADD_PROTEAN - carry_factor_mult = CARRY_FACTOR_MOD_PROTEAN + carry_strength_factor = CARRY_FACTOR_MOD_PROTEAN /datum/species/protean uid = SPECIES_ID_PROTEAN diff --git a/code/modules/species/station/standard/human.dm b/code/modules/species/station/standard/human.dm index ecab14176953..72defa90b66f 100644 --- a/code/modules/species/station/standard/human.dm +++ b/code/modules/species/station/standard/human.dm @@ -1,6 +1,6 @@ /datum/physiology_modifier/intrinsic/species/human carry_strength_add = CARRY_STRENGTH_ADD_HUMAN - carry_factor_mult = CARRY_FACTOR_MOD_HUMAN + carry_strength_factor = CARRY_FACTOR_MOD_HUMAN /datum/species/human id = SPECIES_ID_HUMAN diff --git a/code/modules/species/station/standard/moth.dm b/code/modules/species/station/standard/moth.dm index 9eca4afc5a3b..9e416179ea4d 100644 --- a/code/modules/species/station/standard/moth.dm +++ b/code/modules/species/station/standard/moth.dm @@ -161,7 +161,7 @@ GLOBAL_LIST_INIT(moth_lore_data, init_moth_lore()) /datum/physiology_modifier/intrinsic/species/nepid/dark carry_strength_add = CARRY_STRENGTH_ADD_MOTH_DARK - carry_factor_mult = CARRY_FACTOR_MOD_MOTH_DARK + carry_strength_factor = CARRY_FACTOR_MOD_MOTH_DARK /datum/species/moth/dark name = SPECIES_MOTH_DARK @@ -176,7 +176,7 @@ GLOBAL_LIST_INIT(moth_lore_data, init_moth_lore()) /datum/physiology_modifier/intrinsic/species/nepid/light carry_strength_add = CARRY_STRENGTH_ADD_MOTH_LIGHT - carry_factor_mult = CARRY_FACTOR_MOD_MOTH_LIGHT + carry_strength_factor = CARRY_FACTOR_MOD_MOTH_LIGHT /datum/species/moth/light name = SPECIES_MOTH_LIGHT diff --git a/code/modules/species/station/standard/tajaran.dm b/code/modules/species/station/standard/tajaran.dm index cdb6a931254d..f87fa59449ba 100644 --- a/code/modules/species/station/standard/tajaran.dm +++ b/code/modules/species/station/standard/tajaran.dm @@ -1,6 +1,6 @@ /datum/physiology_modifier/intrinsic/species/tajaran carry_strength_add = CARRY_STRENGTH_ADD_TAJARAN - carry_factor_mult = CARRY_FACTOR_MOD_TAJARAN + carry_strength_factor = CARRY_FACTOR_MOD_TAJARAN /datum/species/tajaran uid = SPECIES_ID_TAJARAN diff --git a/code/modules/species/station/standard/teshari.dm b/code/modules/species/station/standard/teshari.dm index 2b3ace06da07..27a319c4b071 100644 --- a/code/modules/species/station/standard/teshari.dm +++ b/code/modules/species/station/standard/teshari.dm @@ -1,6 +1,6 @@ /datum/physiology_modifier/intrinsic/species/teshari carry_strength_add = CARRY_STRENGTH_ADD_TESHARI - carry_factor_mult = CARRY_FACTOR_MOD_TESHARI + carry_strength_factor = CARRY_FACTOR_MOD_TESHARI /datum/species/teshari uid = SPECIES_ID_TESHARI diff --git a/code/modules/species/station/standard/unathi.dm b/code/modules/species/station/standard/unathi.dm index ecd4e1fa0ec0..51b906ec8009 100644 --- a/code/modules/species/station/standard/unathi.dm +++ b/code/modules/species/station/standard/unathi.dm @@ -1,6 +1,6 @@ /datum/physiology_modifier/intrinsic/species/unathi carry_strength_add = CARRY_STRENGTH_ADD_UNATHI - carry_factor_mult = CARRY_FACTOR_MOD_UNATHI + carry_strength_factor = CARRY_FACTOR_MOD_UNATHI /datum/species/unathi uid = SPECIES_ID_UNATHI diff --git a/code/modules/species/station/xenochimera.dm b/code/modules/species/station/xenochimera.dm index 32d4f13dd562..70c42b5e68fd 100644 --- a/code/modules/species/station/xenochimera.dm +++ b/code/modules/species/station/xenochimera.dm @@ -1,6 +1,6 @@ /datum/physiology_modifier/intrinsic/species/xenochimera carry_strength_add = CARRY_STRENGTH_ADD_XENOCHIMERA - carry_factor_mult = CARRY_FACTOR_MOD_XENOCHIMERA + carry_strength_factor = CARRY_FACTOR_MOD_XENOCHIMERA /datum/species/shapeshifter/xenochimera //Scree's race. uid = SPECIES_ID_XENOCHIMERA diff --git a/code/modules/species/station/xenomorph_hybrids/xeno_hybrids.dm b/code/modules/species/station/xenomorph_hybrids/xeno_hybrids.dm index f8c93331576c..94983c04321c 100644 --- a/code/modules/species/station/xenomorph_hybrids/xeno_hybrids.dm +++ b/code/modules/species/station/xenomorph_hybrids/xeno_hybrids.dm @@ -1,6 +1,6 @@ /datum/physiology_modifier/intrinsic/species/xenohybrid carry_strength_add = CARRY_STRENGTH_ADD_XENOHYBRID - carry_factor_mult = CARRY_FACTOR_MOD_XENOHYBRID + carry_strength_factor = CARRY_FACTOR_MOD_XENOHYBRID /datum/species/xenohybrid name = SPECIES_XENOHYBRID