Merge pull request #2634 from ARF-SS13/time-to-set-every-multiplier-to-1

fixes recoil and damage forever
ARF-SS13 · Jul 14, 2023 · 33f1fe1 · 33f1fe1
2 parents 13ebd37 + 60ca01f
commit 33f1fe1
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 1 deletion.
diff --git a/code/controllers/subsystem/recoil.dm b/code/controllers/subsystem/recoil.dm
@@ -284,7 +284,7 @@ SUBSYSTEM_DEF(recoil)
 	if(LAZYLEN(modifiers) != 2)
 		modifiers = RECOIL_LIST_DEFAULT
 	var/list/item_recoil_args = RECOIL_TAG2LIST(recoil_tag)
-	if(LAZYLEN(item_recoil_args) != 2) // "UNWIELD" "WIELD"
+	if(!IS_RECOIL_LIST(item_recoil_args)) // "UNWIELD" "WIELD"
 		item_recoil_args = RECOIL_LIST_DEFAULT
 	var/my_one_handed_recoil = text2num(item_recoil_args[RECOIL_INDEX_UNWIELDED])
 	var/my_two_handed_recoil = text2num(item_recoil_args[RECOIL_INDEX_WIELDED])

diff --git a/modular_coyote/eris/code/gun_firemode.dm b/modular_coyote/eris/code/gun_firemode.dm
@@ -47,6 +47,7 @@
 	shoot_delay = shoot_delay_default
 	burst_delay = burst_delay_default
 	burst_count = burst_count_default
+	damage_multiplier_default = _gun.damage_multiplier
 	damage_multiplier = damage_multiplier_default
 	shot_cost_multiplier = shot_cost_multiplier_default
 	my_gun = WEAKREF(_gun)