From 4b2e3beb96acd7ee82aff11e3fd025b8e39cf286 Mon Sep 17 00:00:00 2001 From: Fox-McCloud Date: Sun, 30 Nov 2014 08:18:29 -0500 Subject: [PATCH] Weapon Changes --- code/game/objects/items/weapons/RCD.dm | 2 +- code/game/objects/items/weapons/extinguisher.dm | 5 +++-- code/game/objects/items/weapons/kitchen.dm | 10 +++++----- code/game/objects/items/weapons/mop.dm | 2 +- code/game/objects/items/weapons/storage/briefcase.dm | 6 ++++-- code/game/objects/items/weapons/storage/toolbox.dm | 9 +++++---- code/game/objects/items/weapons/tools.dm | 7 ++++--- code/modules/reagents/Chemistry-Reagents.dm | 2 ++ 8 files changed, 25 insertions(+), 18 deletions(-) diff --git a/code/game/objects/items/weapons/RCD.dm b/code/game/objects/items/weapons/RCD.dm index 82ee98f5f51..6d49d14c23e 100644 --- a/code/game/objects/items/weapons/RCD.dm +++ b/code/game/objects/items/weapons/RCD.dm @@ -15,7 +15,7 @@ RCD flags = FPRINT | TABLEPASS| CONDUCT force = 10.0 throwforce = 10.0 - throw_speed = 1 + throw_speed = 3 throw_range = 5 w_class = 3.0 m_amt = 30000 diff --git a/code/game/objects/items/weapons/extinguisher.dm b/code/game/objects/items/weapons/extinguisher.dm index 37eb1384e9e..a11db2d4dcd 100644 --- a/code/game/objects/items/weapons/extinguisher.dm +++ b/code/game/objects/items/weapons/extinguisher.dm @@ -10,7 +10,7 @@ throwforce = 10 w_class = 3.0 throw_speed = 2 - throw_range = 10 + throw_range = 7 force = 10 m_amt = 90 attack_verb = list("slammed", "whacked", "bashed", "thunked", "battered", "bludgeoned", "thrashed") @@ -20,7 +20,6 @@ var/sprite_name = "fire_extinguisher" reagents_to_log=list( - "fuel" = "welder fuel", "plasma"= "plasma", "pacid" = "polytrinic acid", "sacid" = "sulphuric acid" @@ -65,6 +64,7 @@ user << "The safety is [safety ? "on" : "off"]." return +/* /obj/item/weapon/extinguisher/attackby(obj/item/W, mob/user) if(user.stat || user.restrained() || user.lying) return @@ -94,6 +94,7 @@ W.loc=src user << "You cram \the [W] into the nozzle of \the [src]." msg_admin_attack("[user]/[user.ckey] has crammed \a [W] into a [src].") + */ /obj/item/weapon/extinguisher/afterattack(atom/target, mob/user , flag) diff --git a/code/game/objects/items/weapons/kitchen.dm b/code/game/objects/items/weapons/kitchen.dm index eb4710d1d76..ae5d8a170c3 100644 --- a/code/game/objects/items/weapons/kitchen.dm +++ b/code/game/objects/items/weapons/kitchen.dm @@ -19,7 +19,7 @@ /obj/item/weapon/kitchen/utensil force = 5.0 w_class = 1.0 - throwforce = 5.0 + throwforce = 0.0 throw_speed = 3 throw_range = 5 flags = FPRINT | TABLEPASS | CONDUCT @@ -210,7 +210,7 @@ icon_state = "rolling_pin" force = 8.0 throwforce = 10.0 - throw_speed = 2 + throw_speed = 3 throw_range = 7 w_class = 3.0 attack_verb = list("bashed", "battered", "bludgeoned", "thrashed", "whacked") //I think the rollingpin attackby will end up ignoring this anyway. @@ -261,11 +261,11 @@ icon = 'icons/obj/food.dmi' icon_state = "tray" desc = "A metal tray to lay food on." - throwforce = 12.0 + throwforce = 5.0 throwforce = 10.0 - throw_speed = 1 + throw_speed = 3 throw_range = 5 - w_class = 3.0 + w_class = 4.0 flags = FPRINT | TABLEPASS | CONDUCT m_amt = 3000 /* // NOPE diff --git a/code/game/objects/items/weapons/mop.dm b/code/game/objects/items/weapons/mop.dm index 5c0572fd7d8..b1c37f7cc47 100644 --- a/code/game/objects/items/weapons/mop.dm +++ b/code/game/objects/items/weapons/mop.dm @@ -6,7 +6,7 @@ force = 3.0 throwforce = 5.0 throw_speed = 3 - throw_range = 10 + throw_range = 7 w_class = 3.0 flags = FPRINT | TABLEPASS attack_verb = list("mopped", "bashed", "bludgeoned", "whacked") diff --git a/code/game/objects/items/weapons/storage/briefcase.dm b/code/game/objects/items/weapons/storage/briefcase.dm index 7d350b61545..d6d288c5734 100644 --- a/code/game/objects/items/weapons/storage/briefcase.dm +++ b/code/game/objects/items/weapons/storage/briefcase.dm @@ -4,12 +4,14 @@ icon_state = "briefcase" item_state = "briefcase" flags = FPRINT | TABLEPASS| CONDUCT + hitsound = "swing_hit" force = 8.0 - throw_speed = 1 + throw_speed = 2 throw_range = 4 w_class = 4.0 max_w_class = 3 - max_combined_w_class = 16 + max_combined_w_class = 21 + attack_verb = list("bashed", "battered", "bludgeoned", "thrashed", "whacked") /obj/item/weapon/storage/briefcase/New() ..() diff --git a/code/game/objects/items/weapons/storage/toolbox.dm b/code/game/objects/items/weapons/storage/toolbox.dm index 3d6e62b6948..4c7ea0617a0 100644 --- a/code/game/objects/items/weapons/storage/toolbox.dm +++ b/code/game/objects/items/weapons/storage/toolbox.dm @@ -5,14 +5,14 @@ icon_state = "red" item_state = "toolbox_red" flags = FPRINT | TABLEPASS| CONDUCT - force = 5.0 + force = 10.0 throwforce = 10.0 - throw_speed = 1 + throw_speed = 2 throw_range = 7 w_class = 4.0 origin_tech = "combat=1" attack_verb = list("robusted") - hitsound = "swing_hit" + hitsound = "sound/weapons/smash.ogg" New() ..() @@ -73,7 +73,8 @@ icon_state = "syndicate" item_state = "toolbox_syndi" origin_tech = "combat=1;syndicate=1" - force = 7.0 + force = 15.0 + throwforce = 18.0 New() ..() diff --git a/code/game/objects/items/weapons/tools.dm b/code/game/objects/items/weapons/tools.dm index 9500c238da2..c10764b4d67 100644 --- a/code/game/objects/items/weapons/tools.dm +++ b/code/game/objects/items/weapons/tools.dm @@ -102,12 +102,13 @@ flags = FPRINT | TABLEPASS| CONDUCT slot_flags = SLOT_BELT force = 6.0 - throw_speed = 2 - throw_range = 9 + throw_speed = 3 + throw_range = 7 w_class = 2.0 m_amt = 80 origin_tech = "materials=1;engineering=1" attack_verb = list("pinched", "nipped") + hitsound = "sound/items/Wirecutter.ogg" sharp = 1 edge = 1 @@ -140,7 +141,7 @@ //Amount of OUCH when it's thrown force = 3.0 throwforce = 5.0 - throw_speed = 1 + throw_speed = 3 throw_range = 5 w_class = 2.0 diff --git a/code/modules/reagents/Chemistry-Reagents.dm b/code/modules/reagents/Chemistry-Reagents.dm index 5f497b6dcce..3aaea3a12d3 100644 --- a/code/modules/reagents/Chemistry-Reagents.dm +++ b/code/modules/reagents/Chemistry-Reagents.dm @@ -1381,6 +1381,7 @@ datum if(method == TOUCH) M.adjust_fire_stacks(volume / 10) return + /* reaction_obj(var/obj/O, var/volume) var/turf/the_turf = get_turf(O) if(!the_turf) @@ -1389,6 +1390,7 @@ datum reaction_turf(var/turf/T, var/volume) new /obj/effect/decal/cleanable/liquid_fuel(T, volume) return + */ on_mob_life(var/mob/living/M as mob) if(!M) M = holder.my_atom M.adjustToxLoss(1)