Merge remote-tracking branch 'upstream/master' into Dingo's-sillystuff

code/__DEFINES/combat.dm

@@ -419,7 +419,7 @@ GLOBAL_LIST_INIT(main_body_parts, list(
 #define BULLET_WOUND_PISTOL_22_MATCH (BULLET_WOUND_PISTOL_22 * BULLET_MATCH_MULT_WOUND)
 #define BULLET_WOUND_PISTOL_22_NAKED_MULT 1
 #define RUBBERY_DAMAGE_PISTOL_22 (BULLET_DAMAGE_PISTOL_22 * RUBBERY_DAMAGE_MULT)
-#define RUBBERY_STAMINA_PISTOL_22 (BULLET_DAMAGE_PISTOL_22 * 2)
+#define RUBBERY_STAMINA_PISTOL_22 (BULLET_DAMAGE_PISTOL_22)
 #define RUBBERY_RECOIL_PISTOL_22 (BULLET_RECOIL_PISTOL_22 * RUBBERY_RECOIL_MULT)
 #define RUBBERY_WOUND_PISTOL_22 (BULLET_WOUND_PISTOL_22 * 2)
 
@@ -438,7 +438,7 @@ GLOBAL_LIST_INIT(main_body_parts, list(
 #define BULLET_WOUND_PISTOL_9MM_MATCH (BULLET_WOUND_PISTOL_9MM * BULLET_MATCH_MULT_WOUND)
 #define BULLET_WOUND_PISTOL_9MM_NAKED_MULT 1
 #define RUBBERY_DAMAGE_PISTOL_9MM (BULLET_DAMAGE_PISTOL_9MM * RUBBERY_DAMAGE_MULT)
-#define RUBBERY_STAMINA_PISTOL_9MM (BULLET_DAMAGE_PISTOL_9MM * 2)
+#define RUBBERY_STAMINA_PISTOL_9MM (BULLET_DAMAGE_PISTOL_9MM)
 #define RUBBERY_RECOIL_PISTOL_9MM (BULLET_RECOIL_PISTOL_9MM * RUBBERY_RECOIL_MULT)
 #define RUBBERY_WOUND_PISTOL_9MM (BULLET_WOUND_PISTOL_9MM * 2)
 
@@ -457,7 +457,7 @@ GLOBAL_LIST_INIT(main_body_parts, list(
 #define BULLET_WOUND_PISTOL_45ACP_MATCH (BULLET_WOUND_PISTOL_45ACP * BULLET_MATCH_MULT_WOUND)
 #define BULLET_WOUND_PISTOL_45ACP_NAKED_MULT 1
 #define RUBBERY_DAMAGE_PISTOL_45ACP (BULLET_DAMAGE_PISTOL_45ACP * RUBBERY_DAMAGE_MULT)
-#define RUBBERY_STAMINA_PISTOL_45ACP (BULLET_DAMAGE_PISTOL_45ACP * 3)
+#define RUBBERY_STAMINA_PISTOL_45ACP (BULLET_DAMAGE_PISTOL_45ACP)
 #define RUBBERY_RECOIL_PISTOL_45ACP (BULLET_RECOIL_PISTOL_45ACP * RUBBERY_RECOIL_MULT)
 #define RUBBERY_WOUND_PISTOL_45ACP (BULLET_WOUND_PISTOL_45ACP * 2)
 
@@ -476,7 +476,7 @@ GLOBAL_LIST_INIT(main_body_parts, list(
 #define BULLET_WOUND_PISTOL_10MM_MATCH (BULLET_WOUND_PISTOL_10MM * BULLET_MATCH_MULT_WOUND)
 #define BULLET_WOUND_PISTOL_10MM_NAKED_MULT 1
 #define RUBBERY_DAMAGE_PISTOL_10MM (BULLET_DAMAGE_PISTOL_10MM * RUBBERY_DAMAGE_MULT)
-#define RUBBERY_STAMINA_PISTOL_10MM (BULLET_DAMAGE_PISTOL_10MM * 3)
+#define RUBBERY_STAMINA_PISTOL_10MM (BULLET_DAMAGE_PISTOL_10MM)
 #define RUBBERY_RECOIL_PISTOL_10MM (BULLET_RECOIL_PISTOL_10MM * RUBBERY_RECOIL_MULT)
 #define RUBBERY_WOUND_PISTOL_10MM (BULLET_WOUND_PISTOL_10MM * 2)
 
@@ -495,7 +495,7 @@ GLOBAL_LIST_INIT(main_body_parts, list(
 #define BULLET_WOUND_PISTOL_NEEDLE_MATCH (BULLET_WOUND_PISTOL_NEEDLE * BULLET_MATCH_MULT_WOUND)
 #define BULLET_WOUND_PISTOL_NEEDLE_NAKED_MULT 10
 #define RUBBERY_DAMAGE_PISTOL_NEEDLE (BULLET_DAMAGE_PISTOL_NEEDLE * RUBBERY_DAMAGE_MULT)
-#define RUBBERY_STAMINA_PISTOL_NEEDLE (BULLET_DAMAGE_PISTOL_NEEDLE * 3)
+#define RUBBERY_STAMINA_PISTOL_NEEDLE (BULLET_DAMAGE_PISTOL_NEEDLE)
 #define RUBBERY_RECOIL_PISTOL_NEEDLE (BULLET_RECOIL_PISTOL_NEEDLE * RUBBERY_RECOIL_MULT)
 #define RUBBERY_WOUND_PISTOL_NEEDLE (BULLET_WOUND_PISTOL_NEEDLE * 20)
 
@@ -514,7 +514,7 @@ GLOBAL_LIST_INIT(main_body_parts, list(
 #define BULLET_WOUND_PISTOL_38_MATCH (BULLET_WOUND_PISTOL_38 * BULLET_MATCH_MULT_WOUND)
 #define BULLET_WOUND_PISTOL_38_NAKED_MULT 1
 #define RUBBERY_DAMAGE_PISTOL_38 (BULLET_DAMAGE_PISTOL_38 * RUBBERY_DAMAGE_MULT)
-#define RUBBERY_STAMINA_PISTOL_38 (BULLET_DAMAGE_PISTOL_38 * 3)
+#define RUBBERY_STAMINA_PISTOL_38 (BULLET_DAMAGE_PISTOL_38)
 #define RUBBERY_RECOIL_PISTOL_38 (BULLET_RECOIL_PISTOL_38 * RUBBERY_RECOIL_MULT)
 #define RUBBERY_WOUND_PISTOL_38 (BULLET_WOUND_PISTOL_38 * 2)
 
@@ -533,7 +533,7 @@ GLOBAL_LIST_INIT(main_body_parts, list(
 #define BULLET_WOUND_PISTOL_44_MATCH (BULLET_WOUND_PISTOL_44 * BULLET_MATCH_MULT_WOUND)
 #define BULLET_WOUND_PISTOL_44_NAKED_MULT 1
 #define RUBBERY_DAMAGE_PISTOL_44 (BULLET_DAMAGE_PISTOL_44 * RUBBERY_DAMAGE_MULT)
-#define RUBBERY_STAMINA_PISTOL_44 (BULLET_DAMAGE_PISTOL_44 * 4)
+#define RUBBERY_STAMINA_PISTOL_44 (BULLET_DAMAGE_PISTOL_44)
 #define RUBBERY_RECOIL_PISTOL_44 (BULLET_RECOIL_PISTOL_44 * RUBBERY_RECOIL_MULT)
 #define RUBBERY_WOUND_PISTOL_44 (BULLET_WOUND_PISTOL_44 * 2)
 
@@ -552,7 +552,7 @@ GLOBAL_LIST_INIT(main_body_parts, list(
 #define BULLET_WOUND_PISTOL_14MM_MATCH (BULLET_WOUND_PISTOL_14MM * BULLET_MATCH_MULT_WOUND)
 #define BULLET_WOUND_PISTOL_14MM_NAKED_MULT 1
 #define RUBBERY_DAMAGE_PISTOL_14MM (BULLET_DAMAGE_PISTOL_14MM * RUBBERY_DAMAGE_MULT)
-#define RUBBERY_STAMINA_PISTOL_14MM (BULLET_DAMAGE_PISTOL_14MM * 4)
+#define RUBBERY_STAMINA_PISTOL_14MM (BULLET_DAMAGE_PISTOL_14MM)
 #define RUBBERY_RECOIL_PISTOL_14MM (BULLET_RECOIL_PISTOL_14MM * RUBBERY_RECOIL_MULT)
 #define RUBBERY_WOUND_PISTOL_14MM (BULLET_WOUND_PISTOL_14MM * 2)
 
@@ -571,7 +571,7 @@ GLOBAL_LIST_INIT(main_body_parts, list(
 #define BULLET_WOUND_RIFLE_223_MATCH (BULLET_WOUND_RIFLE_223 * BULLET_MATCH_MULT_WOUND)
 #define BULLET_WOUND_RIFLE_223_NAKED_MULT 1
 #define RUBBERY_DAMAGE_RIFLE_223 (BULLET_DAMAGE_RIFLE_223 * RUBBERY_DAMAGE_MULT)
-#define RUBBERY_STAMINA_RIFLE_223 (BULLET_DAMAGE_RIFLE_223 * 2)
+#define RUBBERY_STAMINA_RIFLE_223 (BULLET_DAMAGE_RIFLE_223)
 #define RUBBERY_RECOIL_RIFLE_223 (BULLET_RECOIL_RIFLE_223 * RUBBERY_RECOIL_MULT)
 #define RUBBERY_WOUND_RIFLE_223 (BULLET_WOUND_RIFLE_223 * 2)
 
@@ -590,7 +590,7 @@ GLOBAL_LIST_INIT(main_body_parts, list(
 #define BULLET_WOUND_RIFLE_5MM_MATCH (BULLET_WOUND_RIFLE_5MM * BULLET_MATCH_MULT_WOUND)
 #define BULLET_WOUND_RIFLE_5MM_NAKED_MULT 1
 #define RUBBERY_DAMAGE_RIFLE_5MM (BULLET_DAMAGE_RIFLE_5MM * RUBBERY_DAMAGE_MULT)
-#define RUBBERY_STAMINA_RIFLE_5MM (BULLET_DAMAGE_RIFLE_5MM * 2)
+#define RUBBERY_STAMINA_RIFLE_5MM (BULLET_DAMAGE_RIFLE_5MM)
 #define RUBBERY_RECOIL_RIFLE_5MM (BULLET_RECOIL_RIFLE_5MM * RUBBERY_RECOIL_MULT)
 #define RUBBERY_WOUND_RIFLE_5MM (BULLET_WOUND_RIFLE_5MM * 2)
 
@@ -609,7 +609,7 @@ GLOBAL_LIST_INIT(main_body_parts, list(
 #define BULLET_WOUND_RIFLE_473_MATCH (BULLET_WOUND_RIFLE_473 * BULLET_MATCH_MULT_WOUND)
 #define BULLET_WOUND_RIFLE_473_NAKED_MULT 1
 #define RUBBERY_DAMAGE_RIFLE_473 (BULLET_DAMAGE_RIFLE_473 * RUBBERY_DAMAGE_MULT)
-#define RUBBERY_STAMINA_RIFLE_473 (BULLET_DAMAGE_RIFLE_473 * 2)
+#define RUBBERY_STAMINA_RIFLE_473 (BULLET_DAMAGE_RIFLE_473)
 #define RUBBERY_RECOIL_RIFLE_473 (BULLET_RECOIL_RIFLE_473 * RUBBERY_RECOIL_MULT)
 #define RUBBERY_WOUND_RIFLE_473 (BULLET_WOUND_RIFLE_473 * 2)
 
@@ -628,7 +628,7 @@ GLOBAL_LIST_INIT(main_body_parts, list(
 #define BULLET_WOUND_RIFLE_308_MATCH (BULLET_WOUND_RIFLE_308 * BULLET_MATCH_MULT_WOUND)
 #define BULLET_WOUND_RIFLE_308_NAKED_MULT 1
 #define RUBBERY_DAMAGE_RIFLE_308 (BULLET_DAMAGE_RIFLE_308 * RUBBERY_DAMAGE_MULT)
-#define RUBBERY_STAMINA_RIFLE_308 (BULLET_DAMAGE_RIFLE_308 * 3)
+#define RUBBERY_STAMINA_RIFLE_308 (BULLET_DAMAGE_RIFLE_308)
 #define RUBBERY_RECOIL_RIFLE_308 (BULLET_RECOIL_RIFLE_308 * RUBBERY_RECOIL_MULT)
 #define RUBBERY_WOUND_RIFLE_308 (BULLET_WOUND_RIFLE_308 * 2)
 
@@ -647,7 +647,7 @@ GLOBAL_LIST_INIT(main_body_parts, list(
 #define BULLET_WOUND_RIFLE_4570_MATCH (BULLET_WOUND_RIFLE_4570 * BULLET_MATCH_MULT_WOUND)
 #define BULLET_WOUND_RIFLE_4570_NAKED_MULT 1
 #define RUBBERY_DAMAGE_RIFLE_4570 (BULLET_DAMAGE_RIFLE_4570 * RUBBERY_DAMAGE_MULT)
-#define RUBBERY_STAMINA_RIFLE_4570 (BULLET_DAMAGE_RIFLE_4570 * 3)
+#define RUBBERY_STAMINA_RIFLE_4570 (BULLET_DAMAGE_RIFLE_4570)
 #define RUBBERY_RECOIL_RIFLE_4570 (BULLET_RECOIL_RIFLE_4570 * RUBBERY_RECOIL_MULT)
 #define RUBBERY_WOUND_RIFLE_4570 (BULLET_WOUND_RIFLE_4570 * 4)
 
@@ -666,7 +666,7 @@ GLOBAL_LIST_INIT(main_body_parts, list(
 #define BULLET_WOUND_RIFLE_3006_MATCH (BULLET_WOUND_RIFLE_3006 * BULLET_MATCH_MULT_WOUND)
 #define BULLET_WOUND_RIFLE_3006_NAKED_MULT 1
 #define RUBBERY_DAMAGE_RIFLE_3006 (BULLET_DAMAGE_RIFLE_3006 * RUBBERY_DAMAGE_MULT)
-#define RUBBERY_STAMINA_RIFLE_3006 (BULLET_DAMAGE_RIFLE_3006 * 3)
+#define RUBBERY_STAMINA_RIFLE_3006 (BULLET_DAMAGE_RIFLE_3006)
 #define RUBBERY_RECOIL_RIFLE_3006 (BULLET_RECOIL_RIFLE_3006 * RUBBERY_RECOIL_MULT)
 #define RUBBERY_WOUND_RIFLE_3006 (BULLET_WOUND_RIFLE_3006 * 4)
 
@@ -685,7 +685,7 @@ GLOBAL_LIST_INIT(main_body_parts, list(
 #define BULLET_WOUND_RIFLE_50MG_MATCH (BULLET_WOUND_RIFLE_50MG * BULLET_MATCH_MULT_WOUND)
 #define BULLET_WOUND_RIFLE_50MG_NAKED_MULT 1
 #define RUBBERY_DAMAGE_RIFLE_50MG (BULLET_DAMAGE_RIFLE_50MG * RUBBERY_DAMAGE_MULT)
-#define RUBBERY_STAMINA_RIFLE_50MG (BULLET_DAMAGE_RIFLE_50MG * 4)
+#define RUBBERY_STAMINA_RIFLE_50MG (BULLET_DAMAGE_RIFLE_50MG)
 #define RUBBERY_RECOIL_RIFLE_50MG (BULLET_RECOIL_RIFLE_50MG * RUBBERY_RECOIL_MULT)
 #define RUBBERY_WOUND_RIFLE_50MG (BULLET_WOUND_RIFLE_50MG * 2)
 
@@ -704,7 +704,7 @@ GLOBAL_LIST_INIT(main_body_parts, list(
 #define BULLET_WOUND_RIFLE_GAUSS_MATCH (BULLET_WOUND_RIFLE_GAUSS * BULLET_MATCH_MULT_WOUND)
 #define BULLET_WOUND_RIFLE_GAUSS_NAKED_MULT 1
 #define RUBBERY_DAMAGE_RIFLE_GAUSS (BULLET_DAMAGE_RIFLE_GAUSS * RUBBERY_DAMAGE_MULT)
-#define RUBBERY_STAMINA_RIFLE_GAUSS (BULLET_DAMAGE_RIFLE_GAUSS * 4)
+#define RUBBERY_STAMINA_RIFLE_GAUSS (BULLET_DAMAGE_RIFLE_GAUSS)
 #define RUBBERY_RECOIL_RIFLE_GAUSS (BULLET_RECOIL_RIFLE_GAUSS * RUBBERY_RECOIL_MULT)
 #define RUBBERY_WOUND_RIFLE_GAUSS (BULLET_WOUND_RIFLE_GAUSS * 2)
 
@@ -724,7 +724,7 @@ GLOBAL_LIST_INIT(main_body_parts, list(
 #define BULLET_WOUND_SHOTGUN_PELLET_MATCH (BULLET_WOUND_SHOTGUN_PELLET * BULLET_MATCH_MULT_WOUND)
 #define BULLET_WOUND_SHOTGUN_PELLET_NAKED_MULT 1
 #define RUBBERY_DAMAGE_SHOTGUN_PELLET (BULLET_DAMAGE_SHOTGUN_PELLET * RUBBERY_DAMAGE_MULT)
-#define RUBBERY_STAMINA_SHOTGUN_PELLET (BULLET_DAMAGE_SHOTGUN_PELLET * 2)
+#define RUBBERY_STAMINA_SHOTGUN_PELLET (BULLET_DAMAGE_SHOTGUN_PELLET * 1.5)
 #define RUBBERY_RECOIL_SHOTGUN_PELLET (BULLET_RECOIL_SHOTGUN_PELLET * RUBBERY_RECOIL_MULT)
 #define RUBBERY_WOUND_SHOTGUN_PELLET (BULLET_WOUND_SHOTGUN_PELLET * 2)
 
@@ -743,7 +743,7 @@ GLOBAL_LIST_INIT(main_body_parts, list(
 #define BULLET_WOUND_SHOTGUN_SLUG_MATCH (BULLET_WOUND_SHOTGUN_SLUG * BULLET_MATCH_MULT_WOUND)
 #define BULLET_WOUND_SHOTGUN_SLUG_NAKED_MULT 1
 #define RUBBERY_DAMAGE_SHOTGUN_SLUG (BULLET_DAMAGE_SHOTGUN_SLUG * RUBBERY_DAMAGE_MULT)
-#define RUBBERY_STAMINA_SHOTGUN_SLUG (BULLET_DAMAGE_SHOTGUN_SLUG * 4)
+#define RUBBERY_STAMINA_SHOTGUN_SLUG (BULLET_DAMAGE_SHOTGUN_SLUG)
 #define RUBBERY_RECOIL_SHOTGUN_SLUG (BULLET_RECOIL_SHOTGUN_SLUG * RUBBERY_RECOIL_MULT)
 #define RUBBERY_WOUND_SHOTGUN_SLUG (BULLET_WOUND_SHOTGUN_SLUG * 4)
 
@@ -762,7 +762,7 @@ GLOBAL_LIST_INIT(main_body_parts, list(
 #define BULLET_WOUND_SHOTGUN_TRAIN_MATCH (BULLET_WOUND_SHOTGUN_TRAIN * BULLET_MATCH_MULT_WOUND)
 #define BULLET_WOUND_SHOTGUN_TRAIN_NAKED_MULT 1
 #define RUBBERY_DAMAGE_SHOTGUN_TRAIN (BULLET_DAMAGE_SHOTGUN_TRAIN * RUBBERY_DAMAGE_MULT)
-#define RUBBERY_STAMINA_SHOTGUN_TRAIN (BULLET_DAMAGE_SHOTGUN_TRAIN * 4)
+#define RUBBERY_STAMINA_SHOTGUN_TRAIN (BULLET_DAMAGE_SHOTGUN_TRAIN)
 #define RUBBERY_RECOIL_SHOTGUN_TRAIN (BULLET_RECOIL_SHOTGUN_TRAIN * RUBBERY_RECOIL_MULT)
 #define RUBBERY_WOUND_SHOTGUN_TRAIN (BULLET_WOUND_SHOTGUN_TRAIN * 4)
 
@@ -781,7 +781,7 @@ GLOBAL_LIST_INIT(main_body_parts, list(
 #define BULLET_WOUND_FLINTLOCK_MATCH (BULLET_WOUND_FLINTLOCK * BULLET_MATCH_MULT_WOUND)
 #define BULLET_WOUND_FLINTLOCK_NAKED_MULT 1
 #define RUBBERY_DAMAGE_FLINTLOCK (BULLET_DAMAGE_FLINTLOCK * RUBBERY_DAMAGE_MULT)
-#define RUBBERY_STAMINA_FLINTLOCK (BULLET_DAMAGE_FLINTLOCK * 4)
+#define RUBBERY_STAMINA_FLINTLOCK (BULLET_DAMAGE_FLINTLOCK)
 #define RUBBERY_RECOIL_FLINTLOCK (BULLET_RECOIL_FLINTLOCK * RUBBERY_RECOIL_MULT)
 #define RUBBERY_WOUND_FLINTLOCK (BULLET_WOUND_FLINTLOCK * 4)
 
@@ -800,7 +800,7 @@ GLOBAL_LIST_INIT(main_body_parts, list(
 #define BULLET_WOUND_GHOUL_ROCK_MATCH (BULLET_WOUND_GHOUL_ROCK * BULLET_MATCH_MULT_WOUND)
 #define BULLET_WOUND_GHOUL_ROCK_NAKED_MULT 2
 #define RUBBERY_DAMAGE_GHOUL_ROCK (BULLET_DAMAGE_GHOUL_ROCK * RUBBERY_DAMAGE_MULT)
-#define RUBBERY_STAMINA_GHOUL_ROCK (BULLET_DAMAGE_GHOUL_ROCK * 4)
+#define RUBBERY_STAMINA_GHOUL_ROCK (BULLET_DAMAGE_GHOUL_ROCK)
 #define RUBBERY_RECOIL_GHOUL_ROCK (BULLET_RECOIL_GHOUL_ROCK * RUBBERY_RECOIL_MULT)
 #define RUBBERY_WOUND_GHOUL_ROCK (BULLET_WOUND_GHOUL_ROCK * 4)
 
@@ -1400,4 +1400,3 @@ GLOBAL_LIST_INIT(main_body_parts, list(
 #define FLINTLOCK_PISTOL_PREFIRE_STD 2
 #define FLINTLOCK_MINIMUSKET_PREFIRE_STD 1
 #define FLINTLOCK_MUSKET_PREFIRE_STD 1.5
-

code/game/objects/items/melee/f13powerfist.dm

@@ -12,7 +12,7 @@
 	righthand_file = 'icons/mob/inhands/weapons/melee_righthand.dmi'
 	flags_1 = CONDUCT_1
 	attack_verb = list("whacked", "fisted", "power-punched")
-	force = 30 //needs more hefty damage to be worthwhile outside pvp. will have to test
+	force = 45 //needs more hefty damage to be worthwhile outside pvp. will have to test
 	throwforce = 10
 	throw_range = 3
 	w_class = WEIGHT_CLASS_NORMAL
@@ -21,6 +21,27 @@
 	var/throw_distance = 1
 	attack_speed = CLICK_CD_MELEE
 
+	///Extra damage through the punch.
+	var/enhancement = 45 // makes it add 45 to the user punches , replace that number with whatever you want the punch damage to be
+
+
+/obj/item/melee/powerfist/f13/equipped(mob/user, slot)
+	. = ..()
+	if(slot == SLOT_GLOVES)
+		if(ishuman(user))
+			var/mob/living/carbon/human/H = user
+			ADD_TRAIT(H, TRAIT_PUGILIST, GLOVE_TRAIT)
+			H.dna.species.punchdamagehigh += enhancement
+			H.dna.species.punchdamagelow += enhancement
+
+/obj/item/clothing/gloves/fingerless/pugilist/dropped(mob/user)
+
+	REMOVE_TRAIT(user, TRAIT_PUGILIST, GLOVE_TRAIT)
+	if(ishuman(user))
+		var/mob/living/carbon/human/H = user
+		H.dna.species.punchdamagehigh -= enhancement
+		H.dna.species.punchdamagelow -= enhancement
+	return ..()
 /obj/item/melee/powerfist/f13/attackby(obj/item/W, mob/user, params)
 	if(istype(W, /obj/item/wrench))
 		switch(fisto_setting)
@@ -63,9 +84,9 @@
 	righthand_file = 'icons/fallout/onmob/weapons/melee1h_righthand.dmi'
 	icon_state = "goliath"
 	item_state = "goliath"
-	force = 35 //needs to fuckin slapp
+	force = 55 //legendary tier power fist, one of a kind, why should it hit for less than a machete
 	throw_distance = 3
-
+	enhancement = 50
 // Mole Miner
 /obj/item/melee/powerfist/f13/moleminer
 	name = "mole miner gauntlet"
@@ -75,9 +96,10 @@
 	lefthand_file = 'icons/mob/inhands/weapons/melee_lefthand.dmi'
 	righthand_file = 'icons/mob/inhands/weapons/melee_righthand.dmi'
 	flags_1 = CONDUCT_1
-	force = 25 //It shouldn't be both a mid fist weapon and a digging tool dangit! Especially for the resources it takes! 5 less dmg than a power fist
+	force = 38 //weaker but it should atleast 1 tap trash mobs
 	throwforce = 10
 	throw_range = 7
+	enhancement = 30 //mace tier
 	attack_verb = list("slashed", "sliced", "torn", "ripped", "diced", "cut")
 	hitsound = 'sound/weapons/bladeslice.ogg'
 	tool_behaviour = TOOL_MINING

modular_citadel/code/modules/client/loadout/belt_loadout.dm

@@ -65,6 +65,11 @@
 	name = "army belt"
 	path = /obj/item/storage/belt/army
 
+/datum/gear/belt/armyold
+	name = "old style army belt"
+	path = /obj/item/storage/belt/army/assault/enclave
+	cost = 2
+
 /datum/gear/belt/army/assault
 	name = "assault belt"
 	path = /obj/item/storage/belt/army/assault

modular_citadel/code/modules/client/loadout/shoes.dm

@@ -7,7 +7,7 @@
 /datum/gear/shoes/laceup
 	name = "laceup shoes"
 	path = /obj/item/clothing/shoes/laceup
-	cost = 1
+	cost = 0
 
 /datum/gear/shoes/workboots
 	name = "work boots"
@@ -63,22 +63,22 @@
 /datum/gear/shoes/wraps
 	name = "golden leg wraps"
 	path = /obj/item/clothing/shoes/wraps
-	cost = 1
+	cost = 0
 
 /datum/gear/shoes/wrapssilver
 	name = "silver leg wraps"
 	path = /obj/item/clothing/shoes/wraps/silver
-	cost = 1
+	cost = 0
 
 /datum/gear/shoes/wrapsblue
 	name = "blue leg wraps"
 	path = /obj/item/clothing/shoes/wraps/blue
-	cost = 1
+	cost = 0
 
 /datum/gear/shoes/wrapsred
 	name = "red leg wraps"
 	path = /obj/item/clothing/shoes/wraps/red
-	cost = 1
+	cost = 0
 
 /datum/gear/shoes/wornboots
 	name = "worn boots"