diff --git a/code/game/objects/items/devices/lighting/flashlight.dm b/code/game/objects/items/devices/lighting/flashlight.dm index d8c2c909b40..501cde6fb56 100644 --- a/code/game/objects/items/devices/lighting/flashlight.dm +++ b/code/game/objects/items/devices/lighting/flashlight.dm @@ -343,7 +343,7 @@ desc = "A heavy flashlight, designed for security personnel." icon_state = "maglight" item_state = "maglight" - force = 5 + force = 9 brightness_on = 5 efficiency_modifier = 0.8 w_class = ITEMSIZE_NORMAL diff --git a/code/game/objects/items/weapons/melee/energy.dm b/code/game/objects/items/weapons/melee/energy.dm index 3849c0ee57c..16bdca52f8b 100644 --- a/code/game/objects/items/weapons/melee/energy.dm +++ b/code/game/objects/items/weapons/melee/energy.dm @@ -134,7 +134,7 @@ icon_state = "eglaive0" force = 25 throwforce = 30 - active_force = 40 + active_force = 44 active_throwforce = 60 active_w_class = ITEMSIZE_HUGE armor_penetration = 20 @@ -226,7 +226,7 @@ to block projectiles and melee attacks while it is on and being held. The sword can be toggled on or off by using it in your hand. While it is off, \ it can be concealed in your pocket or bag." icon_state = "sword0" - active_force = 30 + active_force = 33 armor_penetration = 25 active_throwforce = 20 active_w_class = ITEMSIZE_LARGE @@ -318,7 +318,7 @@ /obj/item/melee/energy/sword/pirate/generic desc = "An energy with a curved output, useful for defense and intimidation." - active_force = 20 // 20 damage per hit, seems more balanced for what it can do + active_force = 25 /obj/item/melee/energy/glaive/hegemony name = "hegemony energy glaive" @@ -358,7 +358,7 @@ icon_state = "edagger0" base_reflectchance = 10 base_block_chance = 10 - active_force = 20 + active_force = 25 force = 15 origin_tech = list(TECH_MAGNET = 3) @@ -372,7 +372,7 @@ icon_state = "sol_edagger0" base_reflectchance = 10 base_block_chance = 10 - active_force = 20 + active_force = 25 force = 15 origin_tech = list(TECH_MAGNET = 3) @@ -392,7 +392,7 @@ item_state = "runesword0" //same icon, lol contained_sprite = TRUE base_reflectchance = 65 - active_force = 40 + active_force = 44 base_block_chance = 65 active_w_class = ITEMSIZE_NORMAL w_class = ITEMSIZE_NORMAL @@ -424,7 +424,7 @@ desc = "A concentrated beam of energy in the shape of a blade. Very stylish... and lethal." icon_state = "blade" force = 30 - active_force = 40 //Normal attacks deal very high damage - about the same as wielded fire axe + active_force = 44 //Normal attacks deal very high damage - about the same as wielded fire axe sharp = TRUE edge = TRUE anchored = 1 // Never spawned outside of inventory, should be fine. diff --git a/code/game/objects/items/weapons/vaurca_items.dm b/code/game/objects/items/weapons/vaurca_items.dm index b3206313575..20ef5984d9b 100644 --- a/code/game/objects/items/weapons/vaurca_items.dm +++ b/code/game/objects/items/weapons/vaurca_items.dm @@ -104,7 +104,7 @@ icon = 'icons/obj/vaurca_items.dmi' icon_state = "eknife0" item_state = "eknife0" - active_force = 20 + active_force = 25 active_throwforce = 20 active_w_class = ITEMSIZE_HUGE force = 11 @@ -381,7 +381,7 @@ icon = 'icons/obj/vaurca_items.dmi' icon_state = "greatblade0" item_state = "greatblade0" - active_force = 30 + active_force = 33 armor_penetration = 30 active_throwforce = 20 active_w_class = ITEMSIZE_HUGE diff --git a/html/changelogs/pirouette-force-adjustments.yml b/html/changelogs/pirouette-force-adjustments.yml new file mode 100644 index 00000000000..0e970922ff3 --- /dev/null +++ b/html/changelogs/pirouette-force-adjustments.yml @@ -0,0 +1,5 @@ +author: Pirouette +delete-after: True +changes: + - balance: "Buffed the force of energy melee weapons in line with prior buffs to non-energy weapons." + - balance: "Buffed the force of maglights." \ No newline at end of file