updates

Citadel-Station-13 · Oct 7, 2023 · d7e8cfd · d7e8cfd
1 parent 6c78b29
commit d7e8cfd
Show file tree

Hide file tree

Showing 3 changed files with 20 additions and 16 deletions.
diff --git a/code/__DEFINES/inventory/carry_weight.dm b/code/__DEFINES/inventory/carry_weight.dm
@@ -102,18 +102,18 @@
 /// magboots off
 #define ITEM_ENCUMBRANCE_SHOES_MAGBOOTS 5
 /// normal magboots on
-#define ITEM_ENCUMBRANCE_SHOES_MAGBOOTS_PULSE 30
+#define ITEM_ENCUMBRANCE_SHOES_MAGBOOTS_PULSE 25
 /// ce magboots on
-#define ITEM_ENCUMBRANCE_SHOES_MAGBOOTS_PULSE_ADVANCED 10
+#define ITEM_ENCUMBRANCE_SHOES_MAGBOOTS_PULSE_ADVANCED 7.5
 #define ITEM_ENCUMBRANCE_SHOES_CLOWN 15
 #define ITEM_ENCUMBRANCE_SHOES_FINS 15
 #define ITEM_ENCUMBRANCE_SHOES_GALOSHES 15
 
 //* Factions
 
 #define ITEM_ENCUMBRANCE_CHANGELING_MAGBOOTS 5
-#define ITEM_ENCUMBRANCE_CHANGELING_MAGBOOTS_PULSE 15
-#define ITEM_ENCUMBRANCE_CULT_VOIDSUIT 30
+#define ITEM_ENCUMBRANCE_CHANGELING_MAGBOOTS_PULSE 7.5
+#define ITEM_ENCUMBRANCE_CULT_VOIDSUIT 35
 #define ITEM_ENCUMBRANCE_CULT_VOIDSUIT_HELMET 2.5
 
 //* Spacesuits
@@ -132,27 +132,29 @@
 #define ITEM_ENCUMBRANCE_VOIDSUIT_ULTRALIGHT 5
 #define ITEM_ENCUMBRANCE_VOIDSUIT_HELMET_ULTRALIGHT 0
 
-#define ITEM_ENCUMBRANCE_VOIDSUIT_ANOMALY 10
+#define ITEM_ENCUMBRANCE_VOIDSUIT_ANOMALY 40
 #define ITEM_ENCUMBRANCE_VOIDSUIT_ANOMALY_HELMET 2.5
 
 #define ITEM_ENCUMBRANCE_LEGACY_RIG_LIGHT 10
 #define ITEM_ENCUMBRANCE_LEGACY_RIG 15
 #define ITEM_ENCUMBRANCE_LEGACY_RIG_HEAVY 25
 
-#define ITEM_ENCUMBRANCE_EMERGENCY_SOFTSUIT 20
+#define ITEM_ENCUMBRANCE_EMERGENCY_SOFTSUIT 40
 #define ITEM_ENCUMBRANCE_EMERGENCY_SOFTSUIT_HELMET 0
 
+#warn above
+
 //* Storage
 
-#define ITEM_ENCUMBRANCE_STORAGE_BACKPACK 10
-#define ITEM_ENCUMBRANCE_STORAGE_DUFFLEBAG 20
+#define ITEM_ENCUMBRANCE_STORAGE_BACKPACK 5
+#define ITEM_ENCUMBRANCE_STORAGE_DUFFLEBAG 5
 #define ITEM_ENCUMBRANCE_STORAGE_POUCH_LARGE 5
 
 //* Species
 
-#define ITEM_ENCUMBRANCE_PHORONOID_SUIT 15
+#define ITEM_ENCUMBRANCE_PHORONOID_SUIT 20
 #define ITEM_ENCUMBRANCE_PHORONOID_HELMET 0
-#define ITEM_ENCUMBRANCE_TAJARAN_SWORDSMAN_ARMOR 10
+#define ITEM_ENCUMBRANCE_TAJARAN_SWORDSMAN_ARMOR 20
 
 //* Weapons
 
@@ -165,11 +167,9 @@
 #define ITEM_ENCUMBRANCE_GUN_VEHICLE 60
 
 #define ITEM_ENCUMBRANCE_MELEE_SPEAR 15
-#define ITEM_ENCUMBRANCE_MELEE_SLEDGEHAMMER 15
-
-#warn above
+#define ITEM_ENCUMBRANCE_MELEE_SLEDGEHAMMER 20
 
-#define ITEM_ENCUMBRANCE_SHIELD_TOWER 25
+#define ITEM_ENCUMBRANCE_SHIELD_TOWER 30
 
 //? Item Weight defines
 

diff --git a/code/game/objects/items/storage/backpack.dm b/code/game/objects/items/storage/backpack.dm
@@ -51,6 +51,8 @@
 /obj/item/storage/backpack/holding/duffle
 	name = "dufflebag of holding"
 	icon_state = "holdingduffle"
+	encumbrance = ITEM_ENCUMBRANCE_STORAGE_DUFFLEBAG
+	weight = ITEM_WEIGHT_STORAGE_DUFFLEBAG
 
 /obj/item/storage/backpack/holding/attackby(obj/item/W as obj, mob/user as mob)
 	if(istype(W, /obj/item/storage/backpack/holding))
@@ -166,7 +168,9 @@
 	icon_state = "duffle"
 	item_state_slots = list(SLOT_ID_RIGHT_HAND = "duffle", SLOT_ID_LEFT_HAND = "duffle")
 	weight = ITEM_WEIGHT_STORAGE_DUFFLEBAG
-	encumbrance = ITEM_ENCUMBRANCE_STORAGE_BACKPACK
+	encumbrance = ITEM_ENCUMBRANCE_STORAGE_DUFFLEBAG
+	// todo: remove when weight system is used
+	slowdown = 0.25
 	max_storage_space = INVENTORY_DUFFLEBAG_SPACE
 
 /obj/item/storage/backpack/dufflebag/syndie

diff --git a/code/modules/projectiles/gun.dm b/code/modules/projectiles/gun.dm
@@ -38,7 +38,7 @@
 		)
 	icon_state = "detective"
 	item_state = "gun"
-	item_flags = ITEM_ENCUMBERS_WHILE_HELD
+	item_flags = ITEM_ENCUMBERS_WHILE_HELD | ITEM_ENCUMBERS_ONLY_HELD
 	slot_flags = SLOT_BELT|SLOT_HOLSTER
 	materials = list(MAT_STEEL = 2000)
 	rad_flags = RAD_BLOCK_CONTENTS