Merge pull request #1092 from Ollanius/Ollanius-patch-1

A Yuletide Tweak - Alters 'flail.dmi' by removing the 'swingdelay' variable, and by introducing the 'chargedrain' variable.
GeneralPantsuIsBadAtCoding · Jan 1, 2025 · 353a09c · 353a09c
2 parents 435c55a + 0bd20c6
commit 353a09c
Showing 1 changed file with 3 additions and 3 deletions.
diff --git a/code/game/objects/items/rogueweapons/melee/flail.dm b/code/game/objects/items/rogueweapons/melee/flail.dm
@@ -44,10 +44,10 @@
 /datum/intent/flail/strike/smash
 	name = "smash"
 	chargetime = 5
+	chargedrain = 2
 	no_early_release = TRUE
 	penfactor = 80
 	recovery = 10
-	swingdelay = 7
 	damfactor = 1.2
 	chargedloop = /datum/looping_sound/flailswing
 	keep_looping = TRUE
@@ -60,12 +60,12 @@
 /datum/intent/flail/strike/smashrange
 	name = "ranged smash"
 	chargetime = 25
+	chargedrain = 2
 	no_early_release = TRUE
 	penfactor = 50
 	recovery = 30
-	damfactor = 1.5
+	damfactor = 1.2
 	reach = 2
-	swingdelay = 8
 	chargedloop = /datum/looping_sound/flailswing
 	keep_looping = TRUE
 	icon_state = "insmash"