From 28463d15f51d8c150a46521bdcefbaeee31e26a2 Mon Sep 17 00:00:00 2001 From: RG4ORDR Date: Sun, 16 Jul 2023 22:47:25 -0500 Subject: [PATCH 1/3] Clockwork Weapon Teak --- .../clockcult/clock_items/clock_weapons/battlehammer.dm | 3 ++- .../clockcult/clock_items/clock_weapons/longsword.dm | 4 ++-- .../clockcult/clock_items/clock_weapons/ratvarian_spear.dm | 1 + code/modules/projectiles/projectile/reusable/arrow.dm | 2 +- 4 files changed, 6 insertions(+), 4 deletions(-) diff --git a/code/modules/antagonists/clockcult/clock_items/clock_weapons/battlehammer.dm b/code/modules/antagonists/clockcult/clock_items/clock_weapons/battlehammer.dm index 487d3ae960dd..f09e5bff6468 100644 --- a/code/modules/antagonists/clockcult/clock_items/clock_weapons/battlehammer.dm +++ b/code/modules/antagonists/clockcult/clock_items/clock_weapons/battlehammer.dm @@ -2,8 +2,9 @@ name = "brass battle-hammer" desc = "A brass hammer glowing with energy." icon_state = "ratvarian_hammer" - force = 15 + force = 18 throwforce = 15 + wound_bonus = 10 sharpness = SHARP_NONE attack_verb = list("bashed", "smitted", "hammered", "attacked") clockwork_desc = "A powerful hammer of Ratvarian making. Enemies hit with it would be flung back." diff --git a/code/modules/antagonists/clockcult/clock_items/clock_weapons/longsword.dm b/code/modules/antagonists/clockcult/clock_items/clock_weapons/longsword.dm index e7b35a2bb66b..d931924b3b5d 100644 --- a/code/modules/antagonists/clockcult/clock_items/clock_weapons/longsword.dm +++ b/code/modules/antagonists/clockcult/clock_items/clock_weapons/longsword.dm @@ -2,14 +2,14 @@ name = "brass longsword" desc = "A large sword made of brass." icon_state = "ratvarian_sword" - force = 15 + force = 18 throwforce = 20 armour_penetration = 10 block_chance = 35 attack_verb = list("attacked", "slashed", "cut", "torn", "gored") clockwork_desc = "A powerful sword of Ratvarian making. Enemies hit with it will be struck with a powerful electromagnetic pulse." var/emp_cooldown = 0 - var/cooldown_duration = 20 SECONDS + var/cooldown_duration = 10 SECONDS /obj/item/clockwork/weapon/brass_sword/attack(mob/living/target, mob/living/carbon/human/user) . = ..() diff --git a/code/modules/antagonists/clockcult/clock_items/clock_weapons/ratvarian_spear.dm b/code/modules/antagonists/clockcult/clock_items/clock_weapons/ratvarian_spear.dm index 5e7e3ebae3fc..2da35f3a31bb 100644 --- a/code/modules/antagonists/clockcult/clock_items/clock_weapons/ratvarian_spear.dm +++ b/code/modules/antagonists/clockcult/clock_items/clock_weapons/ratvarian_spear.dm @@ -8,6 +8,7 @@ force = 15 //Extra damage is dealt to targets in attack() throwforce = 25 armour_penetration = 10 + wound_bonus = 10 sharpness = SHARP_POINTY attack_verb = list("stabbed", "poked", "slashed") hitsound = 'sound/weapons/bladeslice.ogg' diff --git a/code/modules/projectiles/projectile/reusable/arrow.dm b/code/modules/projectiles/projectile/reusable/arrow.dm index 30058fb07342..5ddb63ee06b5 100644 --- a/code/modules/projectiles/projectile/reusable/arrow.dm +++ b/code/modules/projectiles/projectile/reusable/arrow.dm @@ -298,6 +298,6 @@ /obj/item/projectile/energy/arrow/clockbolt name = "redlight bolt" - damage = 18 + damage = 30 wound_bonus = 5 embed_type = /obj/item/ammo_casing/reusable/arrow/energy/clockbolt From 3e61bf7268e4cc7754187e408db1343657c6556e Mon Sep 17 00:00:00 2001 From: RG4ORDR Date: Mon, 17 Jul 2023 22:31:45 -0500 Subject: [PATCH 2/3] Arrow and Hammer revalue --- .../clockcult/clock_items/clock_weapons/battlehammer.dm | 4 ++-- code/modules/projectiles/projectile/reusable/arrow.dm | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/code/modules/antagonists/clockcult/clock_items/clock_weapons/battlehammer.dm b/code/modules/antagonists/clockcult/clock_items/clock_weapons/battlehammer.dm index f09e5bff6468..582d2aeda557 100644 --- a/code/modules/antagonists/clockcult/clock_items/clock_weapons/battlehammer.dm +++ b/code/modules/antagonists/clockcult/clock_items/clock_weapons/battlehammer.dm @@ -2,9 +2,9 @@ name = "brass battle-hammer" desc = "A brass hammer glowing with energy." icon_state = "ratvarian_hammer" - force = 18 + force = 23 throwforce = 15 - wound_bonus = 10 + armour_penetration = -20 sharpness = SHARP_NONE attack_verb = list("bashed", "smitted", "hammered", "attacked") clockwork_desc = "A powerful hammer of Ratvarian making. Enemies hit with it would be flung back." diff --git a/code/modules/projectiles/projectile/reusable/arrow.dm b/code/modules/projectiles/projectile/reusable/arrow.dm index 5ddb63ee06b5..a4f0f770d08c 100644 --- a/code/modules/projectiles/projectile/reusable/arrow.dm +++ b/code/modules/projectiles/projectile/reusable/arrow.dm @@ -298,6 +298,6 @@ /obj/item/projectile/energy/arrow/clockbolt name = "redlight bolt" - damage = 30 + damage = 20 wound_bonus = 5 embed_type = /obj/item/ammo_casing/reusable/arrow/energy/clockbolt From 72c63b60586b6c936d3e3c9f13b09a0a7567241b Mon Sep 17 00:00:00 2001 From: RG4ORDR Date: Sun, 23 Jul 2023 10:40:09 -0500 Subject: [PATCH 3/3] Update battlehammer.dm Battlehammer damage set to original values. --- .../clockcult/clock_items/clock_weapons/battlehammer.dm | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/code/modules/antagonists/clockcult/clock_items/clock_weapons/battlehammer.dm b/code/modules/antagonists/clockcult/clock_items/clock_weapons/battlehammer.dm index 582d2aeda557..487d3ae960dd 100644 --- a/code/modules/antagonists/clockcult/clock_items/clock_weapons/battlehammer.dm +++ b/code/modules/antagonists/clockcult/clock_items/clock_weapons/battlehammer.dm @@ -2,9 +2,8 @@ name = "brass battle-hammer" desc = "A brass hammer glowing with energy." icon_state = "ratvarian_hammer" - force = 23 + force = 15 throwforce = 15 - armour_penetration = -20 sharpness = SHARP_NONE attack_verb = list("bashed", "smitted", "hammered", "attacked") clockwork_desc = "A powerful hammer of Ratvarian making. Enemies hit with it would be flung back."