diff --git a/code/WorkInProgress/virus2/cureimplanter.dm b/code/WorkInProgress/virus2/cureimplanter.dm index 7fc9ea9683e..30d952b4851 100644 --- a/code/WorkInProgress/virus2/cureimplanter.dm +++ b/code/WorkInProgress/virus2/cureimplanter.dm @@ -6,7 +6,7 @@ var/works = 0 var/datum/disease2/disease/virus2 = null item_state = "syringe_0" - throw_speed = 1 + throw_speed = 3 throw_range = 5 w_class = 2.0 diff --git a/code/defines/obj.dm b/code/defines/obj.dm index 6b1d728535b..6e12d340ae6 100644 --- a/code/defines/obj.dm +++ b/code/defines/obj.dm @@ -73,7 +73,7 @@ w_class = 1.0 force = 0.0 throwforce = 0.0 - throw_speed = 1 + throw_speed = 2 throw_range = 20 afterattack(atom/target as mob|obj|turf|area, mob/user as mob) user.drop_item() diff --git a/code/defines/obj/weapon.dm b/code/defines/obj/weapon.dm index 84f884e10e5..60a0082dd5e 100644 --- a/code/defines/obj/weapon.dm +++ b/code/defines/obj/weapon.dm @@ -5,7 +5,7 @@ icon_state = "red_phone" force = 3.0 throwforce = 2.0 - throw_speed = 1 + throw_speed = 3 throw_range = 4 w_class = 2 attack_verb = list("called", "rang") @@ -34,7 +34,7 @@ anchored = 0.0 force = 0 throwforce = 0 - throw_speed = 1 + throw_speed = 2 throw_range = 2 w_class = 1.0 @@ -98,7 +98,7 @@ throwforce = 0 hitsound = null //To prevent tap.ogg playing, as the item lacks of force w_class = 1.0 - throw_speed = 2 + throw_speed = 3 throw_range = 15 attack_verb = list("HONKED") var/spam_flag = 0 @@ -217,7 +217,7 @@ icon_state = "caution" force = 1.0 throwforce = 3.0 - throw_speed = 1 + throw_speed = 2 throw_range = 5 w_class = 2.0 attack_verb = list("warned", "cautioned", "smashed") @@ -242,7 +242,7 @@ icon_state = "staff" force = 3.0 throwforce = 5.0 - throw_speed = 1 + throw_speed = 2 throw_range = 5 w_class = 2.0 flags = NOSHIELD @@ -262,7 +262,7 @@ item_state = "stick" force = 3.0 throwforce = 5.0 - throw_speed = 1 + throw_speed = 2 throw_range = 5 w_class = 2.0 flags = NOSHIELD @@ -360,7 +360,7 @@ desc = "A sharp and curved blade on a long fibremetal handle, this tool makes it easy to reap what you sow." force = 13.0 throwforce = 5.0 - throw_speed = 1 + throw_speed = 2 throw_range = 3 w_class = 4.0 flags = CONDUCT | NOSHIELD diff --git a/code/game/atoms_movable.dm b/code/game/atoms_movable.dm index f12f1881f4a..5800f766e5c 100644 --- a/code/game/atoms_movable.dm +++ b/code/game/atoms_movable.dm @@ -6,7 +6,7 @@ var/l_move_time = 1 var/m_flag = 1 var/throwing = 0 - var/throw_speed = 1 + var/throw_speed = 2 var/throw_range = 7 var/moved_recently = 0 var/mob/pulledby = null diff --git a/code/game/gamemodes/cult/ritual.dm b/code/game/gamemodes/cult/ritual.dm index 43d97cb2edb..98c99bcb69f 100644 --- a/code/game/gamemodes/cult/ritual.dm +++ b/code/game/gamemodes/cult/ritual.dm @@ -305,7 +305,7 @@ var/engwords = list("travel", "blood", "join", "hell", "destroy", "technology", /obj/item/weapon/tome name = "arcane tome" icon_state ="tome" - throw_speed = 1 + throw_speed = 2 throw_range = 5 w_class = 2.0 var/notedat = "" diff --git a/code/game/gamemodes/wizard/spellbook.dm b/code/game/gamemodes/wizard/spellbook.dm index 7c2f5ddf5cc..2f1626d0dd7 100644 --- a/code/game/gamemodes/wizard/spellbook.dm +++ b/code/game/gamemodes/wizard/spellbook.dm @@ -3,7 +3,7 @@ desc = "The legendary book of spells of the wizard." icon = 'icons/obj/library.dmi' icon_state ="book" - throw_speed = 1 + throw_speed = 2 throw_range = 5 w_class = 1.0 var/uses = 5 diff --git a/code/game/machinery/bots/cleanbot.dm b/code/game/machinery/bots/cleanbot.dm index 7dd7556c5ea..5876f90ca5f 100644 --- a/code/game/machinery/bots/cleanbot.dm +++ b/code/game/machinery/bots/cleanbot.dm @@ -6,7 +6,7 @@ icon_state = "bucket_proxy" force = 3.0 throwforce = 5.0 - throw_speed = 1 + throw_speed = 2 throw_range = 5 w_class = 3.0 var/created_name = "Cleanbot" diff --git a/code/game/machinery/bots/floorbot.dm b/code/game/machinery/bots/floorbot.dm index bed92eee562..0c53371b455 100644 --- a/code/game/machinery/bots/floorbot.dm +++ b/code/game/machinery/bots/floorbot.dm @@ -6,7 +6,7 @@ icon_state = "toolbox_tiles" force = 3.0 throwforce = 10.0 - throw_speed = 1 + throw_speed = 2 throw_range = 5 w_class = 3.0 var/created_name = "Floorbot" @@ -18,7 +18,7 @@ icon_state = "toolbox_tiles_sensor" force = 3.0 throwforce = 10.0 - throw_speed = 1 + throw_speed = 2 throw_range = 5 w_class = 3.0 var/created_name = "Floorbot" diff --git a/code/game/machinery/computer/HolodeckControl.dm b/code/game/machinery/computer/HolodeckControl.dm index e6b079517bd..00be5935472 100644 --- a/code/game/machinery/computer/HolodeckControl.dm +++ b/code/game/machinery/computer/HolodeckControl.dm @@ -367,7 +367,7 @@ desc = "May the force be with you. Sorta" icon_state = "sword0" force = 3.0 - throw_speed = 1 + throw_speed = 2 throw_range = 5 throwforce = 0 w_class = 2.0 diff --git a/code/game/mecha/mecha_parts.dm b/code/game/mecha/mecha_parts.dm index 80bca9471b9..003f2ec3fe3 100644 --- a/code/game/mecha/mecha_parts.dm +++ b/code/game/mecha/mecha_parts.dm @@ -408,7 +408,7 @@ force = 5.0 w_class = 2.0 throwforce = 0 - throw_speed = 2 + throw_speed = 3 throw_range = 15 ripley diff --git a/code/game/objects/items/devices/chameleonproj.dm b/code/game/objects/items/devices/chameleonproj.dm index a51decc1379..1d30c43ffb0 100644 --- a/code/game/objects/items/devices/chameleonproj.dm +++ b/code/game/objects/items/devices/chameleonproj.dm @@ -5,7 +5,7 @@ slot_flags = SLOT_BELT item_state = "electronic" throwforce = 5.0 - throw_speed = 1 + throw_speed = 3 throw_range = 5 w_class = 2.0 origin_tech = "syndicate=4;magnets=4" diff --git a/code/game/objects/items/devices/multitool.dm b/code/game/objects/items/devices/multitool.dm index 48cc1d44a58..d752e5e8a32 100644 --- a/code/game/objects/items/devices/multitool.dm +++ b/code/game/objects/items/devices/multitool.dm @@ -12,7 +12,7 @@ w_class = 2.0 throwforce = 0 throw_range = 15 - throw_speed = 2 + throw_speed = 3 m_amt = 50 g_amt = 20 origin_tech = "magnets=1;engineering=1" diff --git a/code/game/objects/items/devices/radio/radio.dm b/code/game/objects/items/devices/radio/radio.dm index 05104f25017..a4050faaae2 100644 --- a/code/game/objects/items/devices/radio/radio.dm +++ b/code/game/objects/items/devices/radio/radio.dm @@ -29,7 +29,7 @@ var/GLOBAL_RADIO_TYPE = 1 // radio type to use // "Example" = FREQ_LISTENING|FREQ_BROADCASTING flags = CONDUCT slot_flags = SLOT_BELT - throw_speed = 1 + throw_speed = 3 throw_range = 9 w_class = 2 g_amt = 25 diff --git a/code/game/objects/items/stacks/sheets/mineral.dm b/code/game/objects/items/stacks/sheets/mineral.dm index 3f9b9e82a45..8d34a8f5301 100644 --- a/code/game/objects/items/stacks/sheets/mineral.dm +++ b/code/game/objects/items/stacks/sheets/mineral.dm @@ -79,7 +79,7 @@ var/global/list/datum/stack_recipe/diamond_recipes = list ( \ force = 5.0 throwforce = 5 w_class = 3.0 - throw_speed = 2 + throw_speed = 1 throw_range = 3 origin_tech = "materials=5" perunit = 2000 @@ -105,7 +105,7 @@ var/global/list/datum/stack_recipe/uranium_recipes = list ( \ force = 5.0 throwforce = 5 w_class = 3.0 - throw_speed = 2 + throw_speed = 1 throw_range = 3 origin_tech = "plasmatech=2;materials=2" perunit = 2000 @@ -131,7 +131,7 @@ var/global/list/datum/stack_recipe/plasma_recipes = list ( \ force = 5.0 throwforce = 5 w_class = 3.0 - throw_speed = 2 + throw_speed = 1 throw_range = 3 origin_tech = "materials=4" perunit = 2000 @@ -157,7 +157,7 @@ var/global/list/datum/stack_recipe/gold_recipes = list ( \ force = 5.0 throwforce = 5 w_class = 3.0 - throw_speed = 2 + throw_speed = 1 throw_range = 3 origin_tech = "materials=3" perunit = 2000 @@ -183,7 +183,7 @@ var/global/list/datum/stack_recipe/silver_recipes = list ( \ force = 5.0 throwforce = 5 w_class = 3.0 - throw_speed = 2 + throw_speed = 1 throw_range = 3 origin_tech = "materials=4" perunit = 2000 @@ -207,7 +207,7 @@ var/global/list/datum/stack_recipe/silver_recipes = list ( \ force = 5.0 throwforce = 5 w_class = 3.0 - throw_speed = 2 + throw_speed = 1 throw_range = 3 origin_tech = "materials=5" perunit = 1000 @@ -222,7 +222,7 @@ var/global/list/datum/stack_recipe/silver_recipes = list ( \ force = 5.0 throwforce = 5 w_class = 3.0 - throw_speed = 2 + throw_speed = 1 throw_range = 3 origin_tech = "materials=4" perunit = 2000 @@ -237,7 +237,7 @@ var/global/list/datum/stack_recipe/silver_recipes = list ( \ force = 5.0 throwforce = 5 w_class = 3.0 - throw_speed = 2 + throw_speed = 1 throw_range = 3 origin_tech = "materials=4" perunit = 2000 \ No newline at end of file diff --git a/code/game/objects/items/stacks/sheets/sheets.dm b/code/game/objects/items/stacks/sheets/sheets.dm index 00ce04a452f..6a55c3629c0 100644 --- a/code/game/objects/items/stacks/sheets/sheets.dm +++ b/code/game/objects/items/stacks/sheets/sheets.dm @@ -4,7 +4,7 @@ force = 5 throwforce = 5 max_amount = 50 - throw_speed = 2 + throw_speed = 1 throw_range = 3 attack_verb = list("bashed", "battered", "bludgeoned", "thrashed", "smashed") var/perunit = 3750 diff --git a/code/game/objects/items/toys.dm b/code/game/objects/items/toys.dm index ab75eb1f7e8..0345e498609 100644 --- a/code/game/objects/items/toys.dm +++ b/code/game/objects/items/toys.dm @@ -374,7 +374,7 @@ desc = "A cheap, plastic replica of TWO energy swords. Double the fun!" force = 0 throwforce = 0 - throw_speed = 1 + throw_speed = 3 throw_range = 5 force_unwielded = 0 force_wielded = 0 diff --git a/code/game/objects/items/weapons/AI_modules.dm b/code/game/objects/items/weapons/AI_modules.dm index 7ad4698bc4e..8aeafb5f8b9 100644 --- a/code/game/objects/items/weapons/AI_modules.dm +++ b/code/game/objects/items/weapons/AI_modules.dm @@ -16,7 +16,7 @@ AI MODULES force = 5.0 w_class = 2.0 throwforce = 0 - throw_speed = 2 + throw_speed = 3 throw_range = 15 origin_tech = "programming=3" var/list/laws = list() diff --git a/code/game/objects/items/weapons/RCD.dm b/code/game/objects/items/weapons/RCD.dm index fd240c23491..a0bc317e8d3 100644 --- a/code/game/objects/items/weapons/RCD.dm +++ b/code/game/objects/items/weapons/RCD.dm @@ -15,7 +15,7 @@ RCD flags = CONDUCT force = 10.0 throwforce = 10.0 - throw_speed = 1 + throw_speed = 3 throw_range = 5 w_class = 3.0 m_amt = 50000 diff --git a/code/game/objects/items/weapons/dna_injector.dm b/code/game/objects/items/weapons/dna_injector.dm index 55b4b82d0c0..1b6c197eb5f 100644 --- a/code/game/objects/items/weapons/dna_injector.dm +++ b/code/game/objects/items/weapons/dna_injector.dm @@ -3,7 +3,7 @@ desc = "This injects the person with DNA." icon = 'icons/obj/items.dmi' icon_state = "dnainjector" - throw_speed = 1 + throw_speed = 3 throw_range = 5 w_class = 1.0 diff --git a/code/game/objects/items/weapons/extinguisher.dm b/code/game/objects/items/weapons/extinguisher.dm index 208422b110c..d54af233904 100644 --- a/code/game/objects/items/weapons/extinguisher.dm +++ b/code/game/objects/items/weapons/extinguisher.dm @@ -8,7 +8,7 @@ flags = CONDUCT throwforce = 10 w_class = 3.0 - throw_speed = 1 + throw_speed = 2 throw_range = 10 force = 10 m_amt = 90 diff --git a/code/game/objects/items/weapons/handcuffs.dm b/code/game/objects/items/weapons/handcuffs.dm index 3ea540548fd..eff7fd48c93 100644 --- a/code/game/objects/items/weapons/handcuffs.dm +++ b/code/game/objects/items/weapons/handcuffs.dm @@ -8,7 +8,7 @@ slot_flags = SLOT_BELT throwforce = 0 w_class = 2.0 - throw_speed = 1 + throw_speed = 3 throw_range = 5 m_amt = 500 origin_tech = "materials=1" diff --git a/code/game/objects/items/weapons/implants/implantcase.dm b/code/game/objects/items/weapons/implants/implantcase.dm index 11f16c466ea..1f3eaabde89 100644 --- a/code/game/objects/items/weapons/implants/implantcase.dm +++ b/code/game/objects/items/weapons/implants/implantcase.dm @@ -3,7 +3,7 @@ desc = "A case containing an implant." icon_state = "implantcase-0" item_state = "implantcase" - throw_speed = 1 + throw_speed = 2 throw_range = 5 w_class = 1.0 var/obj/item/weapon/implant/imp = null diff --git a/code/game/objects/items/weapons/implants/implanter.dm b/code/game/objects/items/weapons/implants/implanter.dm index 8aba8b023fa..735780140df 100644 --- a/code/game/objects/items/weapons/implants/implanter.dm +++ b/code/game/objects/items/weapons/implants/implanter.dm @@ -3,7 +3,7 @@ icon = 'icons/obj/items.dmi' icon_state = "implanter0" item_state = "syringe_0" - throw_speed = 1 + throw_speed = 3 throw_range = 5 w_class = 2.0 var/obj/item/weapon/implant/imp = null diff --git a/code/game/objects/items/weapons/implants/implantpad.dm b/code/game/objects/items/weapons/implants/implantpad.dm index 07926b96d09..ba0fa0d0dd9 100644 --- a/code/game/objects/items/weapons/implants/implantpad.dm +++ b/code/game/objects/items/weapons/implants/implantpad.dm @@ -4,7 +4,7 @@ icon = 'icons/obj/items.dmi' icon_state = "implantpad-0" item_state = "electronic" - throw_speed = 1 + throw_speed = 3 throw_range = 5 w_class = 2.0 var/obj/item/weapon/implantcase/case = null diff --git a/code/game/objects/items/weapons/kitchen.dm b/code/game/objects/items/weapons/kitchen.dm index 72c6621261e..f3d581475b7 100644 --- a/code/game/objects/items/weapons/kitchen.dm +++ b/code/game/objects/items/weapons/kitchen.dm @@ -20,7 +20,7 @@ force = 5.0 w_class = 1.0 throwforce = 0 - throw_speed = 2 + throw_speed = 3 throw_range = 5 flags = CONDUCT origin_tech = "materials=1" @@ -107,8 +107,8 @@ flags = CONDUCT force = 10.0 w_class = 3.0 - throwforce = 6.0 - throw_speed = 2 + throwforce = 10.0 + throw_speed = 3 throw_range = 6 m_amt = 12000 origin_tech = "materials=1" @@ -138,7 +138,7 @@ force = 15.0 w_class = 2.0 throwforce = 8.0 - throw_speed = 2 + throw_speed = 3 throw_range = 6 m_amt = 12000 origin_tech = "materials=1" @@ -155,7 +155,7 @@ icon_state = "rolling_pin" force = 8.0 throwforce = 5.0 - throw_speed = 1 + 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. @@ -201,7 +201,7 @@ icon_state = "tray" desc = "A metal tray to lay food on." throwforce = 10.0 - throw_speed = 1 + throw_speed = 3 throw_range = 5 w_class = 3.0 flags = CONDUCT diff --git a/code/game/objects/items/weapons/melee/energy.dm b/code/game/objects/items/weapons/melee/energy.dm index b866b42e76b..cf72273e175 100644 --- a/code/game/objects/items/weapons/melee/energy.dm +++ b/code/game/objects/items/weapons/melee/energy.dm @@ -16,7 +16,7 @@ force = 40.0 throwforce = 25.0 hitsound = 'sound/weapons/bladeslice.ogg' - throw_speed = 1 + throw_speed = 3 throw_range = 5 w_class = 3.0 flags = CONDUCT | NOSHIELD @@ -51,7 +51,7 @@ force = 3.0 throwforce = 5.0 hitsound = "swing_hit" //it starts deactivated - throw_speed = 1 + throw_speed = 3 throw_range = 5 w_class = 2.0 flags = NOSHIELD @@ -166,7 +166,7 @@ force = 70.0//Normal attacks deal very high damage. hitsound = 'sound/weapons/blade1.ogg' throwforce = 1//Throwing or dropping the item deletes it. - throw_speed = 1 + throw_speed = 3 throw_range = 1 w_class = 4.0//So you can't hide it in your pocket or some such. flags = NOSHIELD diff --git a/code/game/objects/items/weapons/shields.dm b/code/game/objects/items/weapons/shields.dm index 6a182bd67a4..5c0baebd24d 100644 --- a/code/game/objects/items/weapons/shields.dm +++ b/code/game/objects/items/weapons/shields.dm @@ -9,7 +9,7 @@ slot_flags = SLOT_BACK force = 5.0 throwforce = 5.0 - throw_speed = 1 + throw_speed = 2 throw_range = 4 w_class = 4.0 g_amt = 7500 @@ -43,7 +43,7 @@ icon_state = "eshield0" // eshield1 for expanded force = 3.0 throwforce = 5.0 - throw_speed = 1 + throw_speed = 2 throw_range = 4 w_class = 1 origin_tech = "materials=4;magnets=3;syndicate=4" diff --git a/code/game/objects/items/weapons/storage/bible.dm b/code/game/objects/items/weapons/storage/bible.dm index 3d720b1c4d0..ec845fe45a1 100644 --- a/code/game/objects/items/weapons/storage/bible.dm +++ b/code/game/objects/items/weapons/storage/bible.dm @@ -2,7 +2,7 @@ name = "bible" desc = "Apply to head repeatedly." icon_state ="bible" - throw_speed = 1 + throw_speed = 2 throw_range = 5 w_class = 3.0 var/mob/affecting = null diff --git a/code/game/objects/items/weapons/storage/briefcase.dm b/code/game/objects/items/weapons/storage/briefcase.dm index 1503c518aba..11a730b576e 100644 --- a/code/game/objects/items/weapons/storage/briefcase.dm +++ b/code/game/objects/items/weapons/storage/briefcase.dm @@ -4,7 +4,7 @@ icon_state = "briefcase" flags = CONDUCT force = 8.0 - throw_speed = 1 + throw_speed = 2 throw_range = 4 w_class = 4.0 max_w_class = 3 diff --git a/code/game/objects/items/weapons/storage/firstaid.dm b/code/game/objects/items/weapons/storage/firstaid.dm index e709a5e9320..1608364398b 100644 --- a/code/game/objects/items/weapons/storage/firstaid.dm +++ b/code/game/objects/items/weapons/storage/firstaid.dm @@ -12,7 +12,7 @@ name = "first-aid kit" desc = "It's an emergency medical kit for those serious boo-boos." icon_state = "firstaid" - throw_speed = 1 + throw_speed = 3 throw_range = 8 var/empty = 0 diff --git a/code/game/objects/items/weapons/storage/secure.dm b/code/game/objects/items/weapons/storage/secure.dm index aac2ed48915..cf6abd60802 100644 --- a/code/game/objects/items/weapons/storage/secure.dm +++ b/code/game/objects/items/weapons/storage/secure.dm @@ -147,7 +147,7 @@ item_state = "sec-case" desc = "A large briefcase with a digital locking system." force = 8.0 - throw_speed = 1 + throw_speed = 2 throw_range = 4 w_class = 4.0 max_w_class = 3 diff --git a/code/game/objects/items/weapons/storage/toolbox.dm b/code/game/objects/items/weapons/storage/toolbox.dm index 5d2447231d4..ed1f1e4090e 100644 --- a/code/game/objects/items/weapons/storage/toolbox.dm +++ b/code/game/objects/items/weapons/storage/toolbox.dm @@ -7,7 +7,7 @@ flags = CONDUCT force = 10.0 throwforce = 10.0 - throw_speed = 1 + throw_speed = 2 throw_range = 7 w_class = 4.0 origin_tech = "combat=1" diff --git a/code/game/objects/items/weapons/teleportation.dm b/code/game/objects/items/weapons/teleportation.dm index 83a771002f4..691ad67d395 100644 --- a/code/game/objects/items/weapons/teleportation.dm +++ b/code/game/objects/items/weapons/teleportation.dm @@ -128,9 +128,9 @@ Frequency: icon = 'icons/obj/device.dmi' icon_state = "hand_tele" item_state = "electronic" - throwforce = 5 + throwforce = 0 w_class = 2.0 - throw_speed = 2 + throw_speed = 3 throw_range = 5 m_amt = 10000 origin_tech = "magnets=1;bluespace=3" diff --git a/code/game/objects/items/weapons/tools.dm b/code/game/objects/items/weapons/tools.dm index a9ac68e2a41..fa0136eaaa2 100644 --- a/code/game/objects/items/weapons/tools.dm +++ b/code/game/objects/items/weapons/tools.dm @@ -42,7 +42,7 @@ force = 5.0 w_class = 1.0 throwforce = 5.0 - throw_speed = 2 + throw_speed = 3 throw_range = 5 g_amt = 0 m_amt = 75 @@ -101,7 +101,7 @@ flags = CONDUCT slot_flags = SLOT_BELT force = 6.0 - throw_speed = 1 + throw_speed = 3 throw_range = 9 w_class = 2.0 m_amt = 80 @@ -135,7 +135,7 @@ force = 3 throwforce = 5 hitsound = "swing_hit" - throw_speed = 1 + throw_speed = 3 throw_range = 5 w_class = 2 m_amt = 70 diff --git a/code/game/objects/items/weapons/twohanded.dm b/code/game/objects/items/weapons/twohanded.dm index 24e5af6ed74..b8f2f5b7751 100644 --- a/code/game/objects/items/weapons/twohanded.dm +++ b/code/game/objects/items/weapons/twohanded.dm @@ -186,7 +186,7 @@ obj/item/weapon/twohanded/ desc = "Handle with care." force = 3 throwforce = 5.0 - throw_speed = 1 + throw_speed = 3 throw_range = 5 w_class = 2.0 force_unwielded = 3 diff --git a/code/game/objects/items/weapons/weaponry.dm b/code/game/objects/items/weapons/weaponry.dm index c17a6ee46a6..b976e482cfe 100644 --- a/code/game/objects/items/weapons/weaponry.dm +++ b/code/game/objects/items/weapons/weaponry.dm @@ -27,7 +27,7 @@ item_state = "nullrod" slot_flags = SLOT_BELT force = 15 - throw_speed = 1 + throw_speed = 3 throw_range = 4 throwforce = 10 w_class = 1 diff --git a/code/modules/assembly/assembly.dm b/code/modules/assembly/assembly.dm index 2fd83440eb1..94e106fb5f9 100644 --- a/code/modules/assembly/assembly.dm +++ b/code/modules/assembly/assembly.dm @@ -8,7 +8,7 @@ m_amt = 100 g_amt = 0 throwforce = 2 - throw_speed = 2 + throw_speed = 3 throw_range = 10 origin_tech = "magnets=1" diff --git a/code/modules/assembly/bomb.dm b/code/modules/assembly/bomb.dm index ee67c265d55..ed66e22a18f 100644 --- a/code/modules/assembly/bomb.dm +++ b/code/modules/assembly/bomb.dm @@ -4,7 +4,7 @@ item_state = "assembly" throwforce = 5 w_class = 3.0 - throw_speed = 1 + throw_speed = 2 throw_range = 4 flags = CONDUCT var/status = 0 //0 - not readied //1 - bomb finished with welder diff --git a/code/modules/hydroponics/hydroitemdefines.dm b/code/modules/hydroponics/hydroitemdefines.dm index fb9f26dd1e2..38f402febc9 100644 --- a/code/modules/hydroponics/hydroitemdefines.dm +++ b/code/modules/hydroponics/hydroitemdefines.dm @@ -24,7 +24,7 @@ slot_flags = SLOT_BELT throwforce = 0 w_class = 2.0 - throw_speed = 1 + throw_speed = 3 throw_range = 10 var/toxicity = 4 var/WeedKillStr = 2 @@ -43,7 +43,7 @@ slot_flags = SLOT_BELT throwforce = 0 w_class = 2.0 - throw_speed = 1 + throw_speed = 3 throw_range = 10 var/toxicity = 4 var/PestKillStr = 2 diff --git a/code/modules/library/lib_items.dm b/code/modules/library/lib_items.dm index 1321ef099a1..ddce2d7cc18 100644 --- a/code/modules/library/lib_items.dm +++ b/code/modules/library/lib_items.dm @@ -303,7 +303,7 @@ name = "barcode scanner" icon = 'icons/obj/library.dmi' icon_state ="scanner" - throw_speed = 1 + throw_speed = 3 throw_range = 5 w_class = 1.0 var/obj/machinery/librarycomp/computer //Associated computer - Modes 1 to 3 use this diff --git a/code/modules/mob/living/carbon/brain/brain_item.dm b/code/modules/mob/living/carbon/brain/brain_item.dm index 4d0de30550d..45c4ee7b62f 100644 --- a/code/modules/mob/living/carbon/brain/brain_item.dm +++ b/code/modules/mob/living/carbon/brain/brain_item.dm @@ -6,7 +6,7 @@ force = 1.0 w_class = 2.0 throwforce = 0 - throw_speed = 2 + throw_speed = 3 throw_range = 5 origin_tech = "biotech=3" attack_verb = list("attacked", "slapped", "whacked") diff --git a/code/modules/mob/living/carbon/metroid/metroid.dm b/code/modules/mob/living/carbon/metroid/metroid.dm index f7e7fe4f12c..1d71be2490f 100644 --- a/code/modules/mob/living/carbon/metroid/metroid.dm +++ b/code/modules/mob/living/carbon/metroid/metroid.dm @@ -576,7 +576,7 @@ mob/living/carbon/slime/var/temperature_resistance = T0C+75 force = 1.0 w_class = 1.0 throwforce = 0 - throw_speed = 2 + throw_speed = 3 throw_range = 6 origin_tech = "biotech=4" var/Uses = 1 // uses before it goes inert diff --git a/code/modules/paperwork/clipboard.dm b/code/modules/paperwork/clipboard.dm index 50b7a29d5d5..895170f6f6f 100644 --- a/code/modules/paperwork/clipboard.dm +++ b/code/modules/paperwork/clipboard.dm @@ -5,7 +5,7 @@ item_state = "clipboard" throwforce = 0 w_class = 2.0 - throw_speed = 2 + throw_speed = 3 throw_range = 10 var/obj/item/weapon/pen/haspen //The stored pen. var/obj/item/weapon/paper/toppaper //The topmost piece of paper. diff --git a/code/modules/paperwork/paperbin.dm b/code/modules/paperwork/paperbin.dm index 26e01456000..9e2f00b5c9c 100644 --- a/code/modules/paperwork/paperbin.dm +++ b/code/modules/paperwork/paperbin.dm @@ -5,7 +5,7 @@ item_state = "sheet-metal" throwforce = 0 w_class = 3 - throw_speed = 2 + throw_speed = 3 throw_range = 7 pressure_resistance = 10 var/amount = 30 //How much paper is in the bin. diff --git a/code/modules/power/cable.dm b/code/modules/power/cable.dm index 277fbfaf31d..5aa9b557944 100644 --- a/code/modules/power/cable.dm +++ b/code/modules/power/cable.dm @@ -204,7 +204,7 @@ desc = "A coil of power cable." throwforce = 0 w_class = 2.0 - throw_speed = 1 + throw_speed = 3 throw_range = 5 m_amt = 50 g_amt = 20 diff --git a/code/modules/reagents/grenade_launcher.dm b/code/modules/reagents/grenade_launcher.dm index eb596caf35e..392c4deb898 100644 --- a/code/modules/reagents/grenade_launcher.dm +++ b/code/modules/reagents/grenade_launcher.dm @@ -5,7 +5,7 @@ icon_state = "riotgun" item_state = "riotgun" w_class = 4.0 - throw_speed = 1 + throw_speed = 2 throw_range = 10 force = 5.0 var/list/grenades = new/list() diff --git a/code/modules/reagents/reagent_containers/food/drinks/bottle.dm b/code/modules/reagents/reagent_containers/food/drinks/bottle.dm index 194a701f9d4..a50c3690d39 100644 --- a/code/modules/reagents/reagent_containers/food/drinks/bottle.dm +++ b/code/modules/reagents/reagent_containers/food/drinks/bottle.dm @@ -119,7 +119,7 @@ icon_state = "broken_bottle" force = 9.0 throwforce = 5.0 - throw_speed = 2 + throw_speed = 3 throw_range = 5 item_state = "beer" hitsound = 'sound/weapons/bladeslice.ogg' diff --git a/code/modules/reagents/reagent_containers/spray.dm b/code/modules/reagents/reagent_containers/spray.dm index 90543197070..4a89bfe6418 100644 --- a/code/modules/reagents/reagent_containers/spray.dm +++ b/code/modules/reagents/reagent_containers/spray.dm @@ -8,7 +8,7 @@ slot_flags = SLOT_BELT throwforce = 0 w_class = 2.0 - throw_speed = 1 + throw_speed = 3 throw_range = 10 amount_per_transfer_from_this = 10 volume = 250 diff --git a/code/modules/reagents/syringe_gun.dm b/code/modules/reagents/syringe_gun.dm index 81d8d7586a1..ab500385249 100644 --- a/code/modules/reagents/syringe_gun.dm +++ b/code/modules/reagents/syringe_gun.dm @@ -4,7 +4,7 @@ icon_state = "syringegun" item_state = "syringegun" w_class = 3 - throw_speed = 1 + throw_speed = 3 throw_range = 10 force = 4 m_amt = 2000 diff --git a/code/modules/surgery/tools.dm b/code/modules/surgery/tools.dm index bc51b0bf43a..f0b26de217c 100644 --- a/code/modules/surgery/tools.dm +++ b/code/modules/surgery/tools.dm @@ -65,7 +65,7 @@ force = 10.0 w_class = 1.0 throwforce = 5.0 - throw_speed = 2 + throw_speed = 3 throw_range = 5 m_amt = 10000 g_amt = 5000 diff --git a/code/modules/telesci/telepad.dm b/code/modules/telesci/telepad.dm index e1eaf1f19eb..9051b819d78 100644 --- a/code/modules/telesci/telepad.dm +++ b/code/modules/telesci/telepad.dm @@ -103,7 +103,7 @@ flags = CONDUCT force = 10.0 throwforce = 10.0 - throw_speed = 1 + throw_speed = 2 throw_range = 5 var/rcharges = 10 var/obj/machinery/pad = null diff --git a/code/unused/disease2/cureimplanter.dm b/code/unused/disease2/cureimplanter.dm index 56d6a5af111..4bd0ff71305 100644 --- a/code/unused/disease2/cureimplanter.dm +++ b/code/unused/disease2/cureimplanter.dm @@ -6,7 +6,7 @@ var/works = 0 var/datum/disease2/disease/virus2 = null item_state = "syringe_0" - throw_speed = 1 + throw_speed = 3 throw_range = 5 w_class = 2.0 diff --git a/code/unused/scrap.dm b/code/unused/scrap.dm index 1ba9403c3eb..a18981e46e5 100644 --- a/code/unused/scrap.dm +++ b/code/unused/scrap.dm @@ -18,7 +18,7 @@ var/blood = 0 // 0=none, 1=blood-stained, 2=bloody throwforce = 8.0 - throw_speed = 1 + throw_speed = 2 throw_range = 4 w_class = 1 flags = FPRINT | TABLEPASS | CONDUCT