From 1956e846e6facf5638955e692d78cb1b009dd3a5 Mon Sep 17 00:00:00 2001 From: Geevies Date: Sat, 14 Mar 2020 11:47:29 +0200 Subject: [PATCH 1/3] tool damage buff --- code/game/objects/items/weapons/tools.dm | 57 ++++++++++++------------ html/changelogs/geeves-tools_harm.yml | 6 +++ 2 files changed, 34 insertions(+), 29 deletions(-) create mode 100644 html/changelogs/geeves-tools_harm.yml diff --git a/code/game/objects/items/weapons/tools.dm b/code/game/objects/items/weapons/tools.dm index 129f49c6701..c54c59577ec 100644 --- a/code/game/objects/items/weapons/tools.dm +++ b/code/game/objects/items/weapons/tools.dm @@ -22,9 +22,9 @@ icon_state = "wrench" flags = CONDUCT slot_flags = SLOT_BELT - force = 5.0 - throwforce = 7.0 - w_class = 2.0 + force = 8 + throwforce = 7 + w_class = ITEMSIZE_SMALL origin_tech = list(TECH_MATERIAL = 1, TECH_ENGINEERING = 1) matter = list(DEFAULT_WALL_MATERIAL = 150) attack_verb = list("bashed", "battered", "bludgeoned", "whacked") @@ -45,9 +45,9 @@ flags = CONDUCT slot_flags = SLOT_BELT | SLOT_EARS center_of_mass = list("x" = 13,"y" = 7) - force = 5.0 - w_class = 1.0 - throwforce = 5.0 + force = 8 + w_class = ITEMSIZE_TINY + throwforce = 5 throw_speed = 3 throw_range = 5 matter = list(DEFAULT_WALL_MATERIAL = 75) @@ -112,15 +112,15 @@ flags = CONDUCT center_of_mass = list("x" = 18,"y" = 10) slot_flags = SLOT_BELT - force = 6.0 + force = 6 throw_speed = 2 throw_range = 9 - w_class = 2.0 + w_class = ITEMSIZE_SMALL origin_tech = list(TECH_MATERIAL = 1, TECH_ENGINEERING = 1) matter = list(DEFAULT_WALL_MATERIAL = 80) attack_verb = list("pinched", "nipped") - sharp = 1 - edge = 1 + sharp = TRUE + edge = TRUE drop_sound = 'sound/items/drop/knife.ogg' /obj/item/wirecutters/New() @@ -129,13 +129,13 @@ item_state = "cutters_yellow" ..() -/obj/item/wirecutters/attack(mob/living/carbon/C as mob, mob/user as mob, var/target_zone) +/obj/item/wirecutters/attack(mob/living/carbon/C, mob/user, var/target_zone) if(user.a_intent == I_HELP && (C.handcuffed) && (istype(C.handcuffed, /obj/item/handcuffs/cable))) - usr.visible_message("\The [usr] cuts \the [C]'s restraints with \the [src]!",\ - "You cut \the [C]'s restraints with \the [src]!",\ - "You hear cable being cut.") + user.visible_message(SPAN_NOTICE("\The [usr] cuts \the [C]'s restraints with \the [src]!"),\ + SPAN_NOTICE("You cut \the [C]'s restraints with \the [src]!"),\ + SPAN_NOTICE("You hear cable being cut.")) C.handcuffed = null - if(C.buckled && C.buckled.buckle_require_restraints) + if(C.buckled?.buckle_require_restraints) C.buckled.unbuckle_mob() C.update_inv_handcuffed() return @@ -160,11 +160,11 @@ drop_sound = 'sound/items/drop/scrap.ogg' //Amount of OUCH when it's thrown - force = 3.0 - throwforce = 5.0 + force = 3 + throwforce = 5 throw_speed = 1 throw_range = 5 - w_class = 2.0 + w_class = ITEMSIZE_SMALL //Cost to make in the autolathe matter = list(DEFAULT_WALL_MATERIAL = 70, "glass" = 30) @@ -193,7 +193,6 @@ name = "advanced welding tool" desc = "A rare and powerful welding tool with a super-extended fuel tank." max_fuel = 80 - w_class = 2.0 matter = list(DEFAULT_WALL_MATERIAL = 200, "glass" = 120) base_iconstate = "adv_welder" origin_tech = list(TECH_ENGINEERING = 3) @@ -203,7 +202,6 @@ name = "experimental welding tool" desc = "A scientifically-enhanced welding tool that uses fuel-producing microbes to gradually replenish its fuel supply." max_fuel = 40 - w_class = 2.0 matter = list(DEFAULT_WALL_MATERIAL = 100, "glass" = 120) base_iconstate = "exp_welder" origin_tech = list(TECH_ENGINEERING = 4, TECH_BIO = 4) @@ -542,8 +540,8 @@ icon_state = "crowbar" flags = CONDUCT slot_flags = SLOT_BELT - force = 5.0 - throwforce = 7.0 + force = 8 + throwforce = 7 item_state = "crowbar" w_class = 2.0 origin_tech = list(TECH_ENGINEERING = 1) @@ -568,9 +566,9 @@ icon_state = "pipewrench" flags = CONDUCT slot_flags = SLOT_BELT - force = 5.0 - throwforce = 7.0 - w_class = 2.0 + force = 8 + throwforce = 7 + w_class = ITEMSIZE_SMALL origin_tech = list(TECH_MATERIAL = 1, TECH_ENGINEERING = 2) matter = list(DEFAULT_WALL_MATERIAL = 150) attack_verb = list("bashed", "battered", "bludgeoned", "whacked") @@ -583,7 +581,7 @@ icon = 'icons/obj/tools.dmi' icon_state = "combitool" force = 3 - w_class = 2 + w_class = ITEMSIZE_SMALL var/list/tools = list( "crowbar", @@ -641,8 +639,9 @@ icon = 'icons/obj/tools.dmi' icon_state = "powerdrillyellow" var/drillcolor = null - force = 3 - w_class = 2 + force = 10 + attack_verb = list("gored", "drilled", "screwed", "punctured") + w_class = ITEMSIZE_SMALL toolspeed = 3 usesound = 'sound/items/drill_use.ogg' @@ -700,4 +699,4 @@ to_chat(user, "You switch \the [src] to the [tool] fitting.") playsound(loc, 'sound/items/change_drill.ogg', 50, 1) update_tool() - return 1 + return 1 \ No newline at end of file diff --git a/html/changelogs/geeves-tools_harm.yml b/html/changelogs/geeves-tools_harm.yml new file mode 100644 index 00000000000..953baa8e64b --- /dev/null +++ b/html/changelogs/geeves-tools_harm.yml @@ -0,0 +1,6 @@ +author: Geeves + +delete-after: True + +changes: + - tweak: "Increased the damage tools do so they aren't on the same level as punching." \ No newline at end of file From 590046ee46c8364b070e3c23b35576a6634febd8 Mon Sep 17 00:00:00 2001 From: Geeves Date: Sat, 14 Mar 2020 18:55:05 +0200 Subject: [PATCH 2/3] Update code/game/objects/items/weapons/tools.dm Co-Authored-By: Matt Atlas --- code/game/objects/items/weapons/tools.dm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/code/game/objects/items/weapons/tools.dm b/code/game/objects/items/weapons/tools.dm index c54c59577ec..a05fe724f37 100644 --- a/code/game/objects/items/weapons/tools.dm +++ b/code/game/objects/items/weapons/tools.dm @@ -131,7 +131,7 @@ /obj/item/wirecutters/attack(mob/living/carbon/C, mob/user, var/target_zone) if(user.a_intent == I_HELP && (C.handcuffed) && (istype(C.handcuffed, /obj/item/handcuffs/cable))) - user.visible_message(SPAN_NOTICE("\The [usr] cuts \the [C]'s restraints with \the [src]!"),\ + user.visible_message(SPAN_NOTICE("\The [user] cuts \the [C]'s restraints with \the [src]!"),\ SPAN_NOTICE("You cut \the [C]'s restraints with \the [src]!"),\ SPAN_NOTICE("You hear cable being cut.")) C.handcuffed = null @@ -699,4 +699,4 @@ to_chat(user, "You switch \the [src] to the [tool] fitting.") playsound(loc, 'sound/items/change_drill.ogg', 50, 1) update_tool() - return 1 \ No newline at end of file + return 1 From 70be8ba533c5b10ca3531ed920fa61b9f008b905 Mon Sep 17 00:00:00 2001 From: Geeves Date: Sat, 14 Mar 2020 18:55:35 +0200 Subject: [PATCH 3/3] Update code/game/objects/items/weapons/tools.dm --- code/game/objects/items/weapons/tools.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/game/objects/items/weapons/tools.dm b/code/game/objects/items/weapons/tools.dm index a05fe724f37..5347ab3310b 100644 --- a/code/game/objects/items/weapons/tools.dm +++ b/code/game/objects/items/weapons/tools.dm @@ -639,7 +639,7 @@ icon = 'icons/obj/tools.dmi' icon_state = "powerdrillyellow" var/drillcolor = null - force = 10 + force = 8 attack_verb = list("gored", "drilled", "screwed", "punctured") w_class = ITEMSIZE_SMALL toolspeed = 3