[MODULAR] double-weapon rebalance (#2433)

* Update pistol.dm * Update submachinegun.dm * Update magazines.dm * Update pistol.dm * Update submachinegun.dm * Update pistol.dm
Fluffy-Frontier · May 14, 2024 · 0c25188 · 0c25188
1 parent dcbe8ba
commit 0c25188
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 5 deletions.
diff --git a/...va/modules/modular_weapons/code/company_and_or_faction_based/szot_dynamica/ammo/pistol.dm b/...va/modules/modular_weapons/code/company_and_or_faction_based/szot_dynamica/ammo/pistol.dm
@@ -18,7 +18,7 @@
 
 /obj/projectile/bullet/c27_54cesarzowa
 	name = ".27-54 Cesarzowa piercing bullet"
-	damage = 15
+	damage = 18
 	armour_penetration = 30
 	wound_bonus = -30
 	bare_wound_bonus = -10
@@ -36,7 +36,7 @@
 
 	caliber = CALIBER_CESARZOWA
 	ammo_type = /obj/item/ammo_casing/c27_54cesarzowa
-	max_ammo = 18
+	max_ammo = 28
 
 // .27-54 Cesarzowa rubber
 // Small caliber pistol round meant to be fired out of something that shoots real quick like, this one is less lethal

diff --git a/...nova/modules/modular_weapons/code/company_and_or_faction_based/szot_dynamica/magazines.dm b/...nova/modules/modular_weapons/code/company_and_or_faction_based/szot_dynamica/magazines.dm
@@ -29,7 +29,7 @@
 
 	ammo_type = /obj/item/ammo_casing/c27_54cesarzowa
 	caliber = CALIBER_CESARZOWA
-	max_ammo = 18
+	max_ammo = 28
 
 /obj/item/ammo_box/magazine/miecz/spawns_empty
 	start_empty = TRUE

diff --git a/.../modules/modular_weapons/code/company_and_or_faction_based/szot_dynamica/submachinegun.dm b/.../modules/modular_weapons/code/company_and_or_faction_based/szot_dynamica/submachinegun.dm
@@ -18,7 +18,7 @@
 
 	bolt_type = BOLT_TYPE_STANDARD
 
-	w_class = WEIGHT_CLASS_BULKY
+	w_class = WEIGHT_CLASS_NORMAL
 	weapon_weight = WEAPON_MEDIUM
 	slot_flags = ITEM_SLOT_BELT
 
@@ -51,7 +51,7 @@
 /obj/item/gun/ballistic/automatic/miecz/examine_more(mob/user)
 	. = ..()
 
-	. += "The Meicz is one of the newest weapons to come out of CIN member state hands and \
+	. += "The Miecz is one of the newest weapons to come out of CIN member state hands and \
 		into the wild, typically the frontier. It was built alongside the round it fires, the \
 		.27-54 Cesarzawa pistol round. Based on the proven Lanca design, it seeks to bring that \
 		same reliable weapon design into the factor of a submachinegun. While it is significantly \

diff --git a/...ova/modules/modular_weapons/code/company_and_or_faction_based/trappiste_fabriek/pistol.dm b/...ova/modules/modular_weapons/code/company_and_or_faction_based/trappiste_fabriek/pistol.dm
@@ -47,6 +47,10 @@
 /obj/item/gun/ballistic/automatic/pistol/sol/no_mag
 	spawnwithmagazine = FALSE
 
+/obj/item/gun/ballistic/automatic/pistol/sol/Initialize(mapload)
+	. = ..()
+	AddComponent(/datum/component/automatic_fire, fire_delay)
+
 // Sol pistol evil gun
 
 /obj/item/gun/ballistic/automatic/pistol/sol/evil