From 2134add41b8ffa5965b8763904d0ceee4222e80d Mon Sep 17 00:00:00 2001 From: Hornygranny Date: Mon, 17 Feb 2014 15:44:07 -0800 Subject: [PATCH] Items with throw_range over 7 reduced to throw_range 7. This does not affect players as there's no way to extend your vision range. --- code/defines/obj.dm | 2 +- code/defines/obj/weapon.dm | 4 ++-- code/game/gamemodes/nuclear/pinpointer.dm | 2 +- code/game/gamemodes/wizard/artefact.dm | 2 +- code/game/mecha/mecha_parts.dm | 2 +- code/game/objects/items/devices/flash.dm | 2 +- code/game/objects/items/devices/multitool.dm | 2 +- code/game/objects/items/devices/radio/radio.dm | 2 +- code/game/objects/items/devices/scanners.dm | 6 +++--- code/game/objects/items/devices/traitordevices.dm | 2 +- code/game/objects/items/latexballoon.dm | 2 +- code/game/objects/items/stacks/medical.dm | 2 +- code/game/objects/items/stacks/rods.dm | 2 +- code/game/objects/items/stacks/sheets/light.dm | 2 +- code/game/objects/items/stacks/tiles/light.dm | 2 +- code/game/objects/items/stacks/tiles/plasteel.dm | 2 +- code/game/objects/items/stacks/tiles/tile_types.dm | 6 +++--- code/game/objects/items/toys.dm | 8 ++++---- code/game/objects/items/weapons/AI_modules.dm | 2 +- code/game/objects/items/weapons/extinguisher.dm | 2 +- code/game/objects/items/weapons/grenades/ghettobomb.dm | 2 +- code/game/objects/items/weapons/grenades/grenade.dm | 2 +- code/game/objects/items/weapons/mop.dm | 2 +- code/game/objects/items/weapons/scrolls.dm | 2 +- code/game/objects/items/weapons/singularityhammer.dm | 2 +- code/game/objects/items/weapons/storage/firstaid.dm | 2 +- code/game/objects/items/weapons/teleportation.dm | 2 +- code/game/objects/items/weapons/tools.dm | 2 +- code/game/objects/items/weapons/weaponry.dm | 2 +- code/modules/assembly/assembly.dm | 2 +- code/modules/assembly/holder.dm | 2 +- code/modules/hydroponics/growninedible.dm | 4 ++-- code/modules/hydroponics/hydroitemdefines.dm | 4 ++-- code/modules/paperwork/clipboard.dm | 2 +- code/modules/paperwork/pen.dm | 2 +- code/modules/paperwork/stamps.dm | 2 +- code/modules/projectiles/ammunition.dm | 2 +- code/modules/reagents/grenade_launcher.dm | 2 +- code/modules/reagents/reagent_containers/spray.dm | 2 +- code/modules/reagents/syringe_gun.dm | 2 +- code/unused/assemblies.dm | 2 +- code/unused/asteroiddevice.dm | 2 +- code/unused/gamemodes/ruby.dm | 2 +- code/unused/new_year.dm | 2 +- 44 files changed, 54 insertions(+), 54 deletions(-) diff --git a/code/defines/obj.dm b/code/defines/obj.dm index 6e12d340ae6..989b16c800a 100644 --- a/code/defines/obj.dm +++ b/code/defines/obj.dm @@ -74,7 +74,7 @@ force = 0.0 throwforce = 0.0 throw_speed = 2 - throw_range = 20 + throw_range = 7 afterattack(atom/target as mob|obj|turf|area, mob/user as mob) user.drop_item() src.throw_at(target, throw_range, throw_speed) diff --git a/code/defines/obj/weapon.dm b/code/defines/obj/weapon.dm index 60a0082dd5e..e6216cca035 100644 --- a/code/defines/obj/weapon.dm +++ b/code/defines/obj/weapon.dm @@ -75,7 +75,7 @@ w_class = 1.0 throwforce = 0 throw_speed = 3 - throw_range = 20 + throw_range = 7 /obj/item/weapon/soap/nanotrasen desc = "A Nanotrasen brand bar of soap. Smells of plasma." @@ -99,7 +99,7 @@ hitsound = null //To prevent tap.ogg playing, as the item lacks of force w_class = 1.0 throw_speed = 3 - throw_range = 15 + throw_range = 7 attack_verb = list("HONKED") var/spam_flag = 0 diff --git a/code/game/gamemodes/nuclear/pinpointer.dm b/code/game/gamemodes/nuclear/pinpointer.dm index 7d71a391f85..6f1413fb71c 100644 --- a/code/game/gamemodes/nuclear/pinpointer.dm +++ b/code/game/gamemodes/nuclear/pinpointer.dm @@ -7,7 +7,7 @@ w_class = 2.0 item_state = "electronic" throw_speed = 3 - throw_range = 20 + throw_range = 7 m_amt = 500 var/obj/item/weapon/disk/nuclear/the_disk = null var/active = 0 diff --git a/code/game/gamemodes/wizard/artefact.dm b/code/game/gamemodes/wizard/artefact.dm index 9a440ba8c2a..5e4cd0b0052 100644 --- a/code/game/gamemodes/wizard/artefact.dm +++ b/code/game/gamemodes/wizard/artefact.dm @@ -85,7 +85,7 @@ icon = 'icons/obj/projectiles.dmi' icon_state ="bluespace" throw_speed = 3 - throw_range = 15 + throw_range = 7 throwforce = 15 damtype = BURN force = 15 diff --git a/code/game/mecha/mecha_parts.dm b/code/game/mecha/mecha_parts.dm index 003f2ec3fe3..1e5821862dc 100644 --- a/code/game/mecha/mecha_parts.dm +++ b/code/game/mecha/mecha_parts.dm @@ -409,7 +409,7 @@ w_class = 2.0 throwforce = 0 throw_speed = 3 - throw_range = 15 + throw_range = 7 ripley origin_tech = "programming=3" diff --git a/code/game/objects/items/devices/flash.dm b/code/game/objects/items/devices/flash.dm index 98714414a80..8292f2204e9 100644 --- a/code/game/objects/items/devices/flash.dm +++ b/code/game/objects/items/devices/flash.dm @@ -6,7 +6,7 @@ throwforce = 0 w_class = 1.0 throw_speed = 3 - throw_range = 10 + throw_range = 7 flags = CONDUCT origin_tech = "magnets=2;combat=1" diff --git a/code/game/objects/items/devices/multitool.dm b/code/game/objects/items/devices/multitool.dm index d752e5e8a32..a0436fa067d 100644 --- a/code/game/objects/items/devices/multitool.dm +++ b/code/game/objects/items/devices/multitool.dm @@ -11,7 +11,7 @@ force = 5.0 w_class = 2.0 throwforce = 0 - throw_range = 15 + throw_range = 7 throw_speed = 3 m_amt = 50 g_amt = 20 diff --git a/code/game/objects/items/devices/radio/radio.dm b/code/game/objects/items/devices/radio/radio.dm index a4050faaae2..04e26786580 100644 --- a/code/game/objects/items/devices/radio/radio.dm +++ b/code/game/objects/items/devices/radio/radio.dm @@ -30,7 +30,7 @@ var/GLOBAL_RADIO_TYPE = 1 // radio type to use flags = CONDUCT slot_flags = SLOT_BELT throw_speed = 3 - throw_range = 9 + throw_range = 7 w_class = 2 g_amt = 25 m_amt = 75 diff --git a/code/game/objects/items/devices/scanners.dm b/code/game/objects/items/devices/scanners.dm index 7641f007e79..dd9476d3bb0 100644 --- a/code/game/objects/items/devices/scanners.dm +++ b/code/game/objects/items/devices/scanners.dm @@ -69,7 +69,7 @@ MASS SPECTROMETER throwforce = 3 w_class = 1.0 throw_speed = 3 - throw_range = 10 + throw_range = 7 m_amt = 200 origin_tech = "magnets=1;biotech=1" var/mode = 1; @@ -171,7 +171,7 @@ MASS SPECTROMETER slot_flags = SLOT_BELT throwforce = 0 throw_speed = 3 - throw_range = 20 + throw_range = 7 m_amt = 30 g_amt = 20 origin_tech = "magnets=1;engineering=1" @@ -238,7 +238,7 @@ MASS SPECTROMETER slot_flags = SLOT_BELT throwforce = 0 throw_speed = 3 - throw_range = 20 + throw_range = 7 m_amt = 30 g_amt = 20 origin_tech = "magnets=2;biotech=2" diff --git a/code/game/objects/items/devices/traitordevices.dm b/code/game/objects/items/devices/traitordevices.dm index a1da52ff952..695fd3105aa 100644 --- a/code/game/objects/items/devices/traitordevices.dm +++ b/code/game/objects/items/devices/traitordevices.dm @@ -21,7 +21,7 @@ effective or pretty fucking useless. throwforce = 5 w_class = 1.0 throw_speed = 3 - throw_range = 10 + throw_range = 7 flags = CONDUCT item_state = "electronic" origin_tech = "magnets=3;combat=3;syndicate=3" diff --git a/code/game/objects/items/latexballoon.dm b/code/game/objects/items/latexballoon.dm index 99afec53c3c..53db3c8f280 100644 --- a/code/game/objects/items/latexballoon.dm +++ b/code/game/objects/items/latexballoon.dm @@ -7,7 +7,7 @@ throwforce = 0 w_class = 1.0 throw_speed = 1 - throw_range = 15 + throw_range = 7 var/state var/datum/gas_mixture/air_contents = null diff --git a/code/game/objects/items/stacks/medical.dm b/code/game/objects/items/stacks/medical.dm index ed4f9f6d4da..d377e3a3190 100644 --- a/code/game/objects/items/stacks/medical.dm +++ b/code/game/objects/items/stacks/medical.dm @@ -6,7 +6,7 @@ max_amount = 5 w_class = 1 throw_speed = 3 - throw_range = 20 + throw_range = 7 var/heal_brute = 0 var/heal_burn = 0 diff --git a/code/game/objects/items/stacks/rods.dm b/code/game/objects/items/stacks/rods.dm index 07d11a2f472..1ff8951e80c 100644 --- a/code/game/objects/items/stacks/rods.dm +++ b/code/game/objects/items/stacks/rods.dm @@ -8,7 +8,7 @@ force = 9.0 throwforce = 10.0 throw_speed = 3 - throw_range = 20 + throw_range = 7 m_amt = 1875 max_amount = 60 attack_verb = list("hit", "bludgeoned", "whacked") diff --git a/code/game/objects/items/stacks/sheets/light.dm b/code/game/objects/items/stacks/sheets/light.dm index 0404ca6f187..a4d6fb1f920 100644 --- a/code/game/objects/items/stacks/sheets/light.dm +++ b/code/game/objects/items/stacks/sheets/light.dm @@ -7,7 +7,7 @@ force = 3.0 throwforce = 5.0 throw_speed = 3 - throw_range = 20 + throw_range = 7 flags = CONDUCT max_amount = 60 diff --git a/code/game/objects/items/stacks/tiles/light.dm b/code/game/objects/items/stacks/tiles/light.dm index 771427e5839..06a4049c127 100644 --- a/code/game/objects/items/stacks/tiles/light.dm +++ b/code/game/objects/items/stacks/tiles/light.dm @@ -7,7 +7,7 @@ force = 3.0 throwforce = 5.0 throw_speed = 3 - throw_range = 20 + throw_range = 7 flags = CONDUCT max_amount = 60 attack_verb = list("bashed", "battered", "bludgeoned", "thrashed", "smashed") diff --git a/code/game/objects/items/stacks/tiles/plasteel.dm b/code/game/objects/items/stacks/tiles/plasteel.dm index 4404b7524f4..fce3db65f83 100644 --- a/code/game/objects/items/stacks/tiles/plasteel.dm +++ b/code/game/objects/items/stacks/tiles/plasteel.dm @@ -8,7 +8,7 @@ m_amt = 937.5 throwforce = 10.0 throw_speed = 3 - throw_range = 20 + throw_range = 7 flags = CONDUCT max_amount = 60 diff --git a/code/game/objects/items/stacks/tiles/tile_types.dm b/code/game/objects/items/stacks/tiles/tile_types.dm index 16b5252d4f7..c44038b6638 100644 --- a/code/game/objects/items/stacks/tiles/tile_types.dm +++ b/code/game/objects/items/stacks/tiles/tile_types.dm @@ -17,7 +17,7 @@ force = 1.0 throwforce = 1.0 throw_speed = 3 - throw_range = 20 + throw_range = 7 max_amount = 60 origin_tech = "biotech=1" @@ -33,7 +33,7 @@ force = 1.0 throwforce = 1.0 throw_speed = 3 - throw_range = 20 + throw_range = 7 max_amount = 60 origin_tech = "biotech=1" /* @@ -48,5 +48,5 @@ force = 1.0 throwforce = 1.0 throw_speed = 3 - throw_range = 20 + throw_range = 7 max_amount = 60 diff --git a/code/game/objects/items/toys.dm b/code/game/objects/items/toys.dm index 0345e498609..aa58765700d 100644 --- a/code/game/objects/items/toys.dm +++ b/code/game/objects/items/toys.dm @@ -17,7 +17,7 @@ /obj/item/toy throwforce = 0 throw_speed = 3 - throw_range = 20 + throw_range = 7 force = 0 @@ -88,7 +88,7 @@ desc = "There is a tag on the back that reads \"FUK NT!11!\"." throwforce = 0 throw_speed = 3 - throw_range = 20 + throw_range = 7 force = 0 icon = 'icons/obj/weapons.dmi' icon_state = "syndballoon" @@ -573,7 +573,7 @@ obj/item/toy/cards var/card_force = 0 var/card_throwforce = 0 var/card_throw_speed = 3 - var/card_throw_range = 20 + var/card_throw_range = 7 var/list/card_attack_verb = list("attacked") obj/item/toy/cards/New() @@ -914,7 +914,7 @@ obj/item/toy/cards/deck/syndicate card_force = 5 card_throwforce = 10 card_throw_speed = 3 - card_throw_range = 20 + card_throw_range = 7 card_attack_verb = list("attacked", "sliced", "diced", "slashed", "cut") diff --git a/code/game/objects/items/weapons/AI_modules.dm b/code/game/objects/items/weapons/AI_modules.dm index 8aeafb5f8b9..5222fb5af81 100644 --- a/code/game/objects/items/weapons/AI_modules.dm +++ b/code/game/objects/items/weapons/AI_modules.dm @@ -17,7 +17,7 @@ AI MODULES w_class = 2.0 throwforce = 0 throw_speed = 3 - throw_range = 15 + throw_range = 7 origin_tech = "programming=3" var/list/laws = list() diff --git a/code/game/objects/items/weapons/extinguisher.dm b/code/game/objects/items/weapons/extinguisher.dm index d54af233904..73fae443335 100644 --- a/code/game/objects/items/weapons/extinguisher.dm +++ b/code/game/objects/items/weapons/extinguisher.dm @@ -9,7 +9,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") diff --git a/code/game/objects/items/weapons/grenades/ghettobomb.dm b/code/game/objects/items/weapons/grenades/ghettobomb.dm index d7def8a1572..cc0bd424161 100644 --- a/code/game/objects/items/weapons/grenades/ghettobomb.dm +++ b/code/game/objects/items/weapons/grenades/ghettobomb.dm @@ -22,7 +22,7 @@ icon_state = "improvised_grenade" item_state = "flashbang" throw_speed = 3 - throw_range = 20 + throw_range = 7 flags = CONDUCT slot_flags = SLOT_BELT var/assembled = 0 diff --git a/code/game/objects/items/weapons/grenades/grenade.dm b/code/game/objects/items/weapons/grenades/grenade.dm index 4d893e0e938..f3c581e7be9 100644 --- a/code/game/objects/items/weapons/grenades/grenade.dm +++ b/code/game/objects/items/weapons/grenades/grenade.dm @@ -6,7 +6,7 @@ icon_state = "grenade" item_state = "flashbang" throw_speed = 3 - throw_range = 20 + throw_range = 7 flags = CONDUCT slot_flags = SLOT_BELT var/active = 0 diff --git a/code/game/objects/items/weapons/mop.dm b/code/game/objects/items/weapons/mop.dm index 87dd779defe..98c3391877a 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 attack_verb = list("mopped", "bashed", "bludgeoned", "whacked") var/mopping = 0 diff --git a/code/game/objects/items/weapons/scrolls.dm b/code/game/objects/items/weapons/scrolls.dm index c00859f96de..38bf09ef99a 100644 --- a/code/game/objects/items/weapons/scrolls.dm +++ b/code/game/objects/items/weapons/scrolls.dm @@ -7,7 +7,7 @@ w_class = 2.0 item_state = "paper" throw_speed = 3 - throw_range = 20 + throw_range = 7 origin_tech = "bluespace=4" /obj/item/weapon/teleportation_scroll/apprentice diff --git a/code/game/objects/items/weapons/singularityhammer.dm b/code/game/objects/items/weapons/singularityhammer.dm index 52a75164cf3..d8aaeaf63db 100644 --- a/code/game/objects/items/weapons/singularityhammer.dm +++ b/code/game/objects/items/weapons/singularityhammer.dm @@ -81,7 +81,7 @@ force_unwielded = 5 force_wielded = 20 throwforce = 30 - throw_range = 10 + throw_range = 7 w_class = 5 //var/charged = 5 origin_tech = "combat=5, power=5" diff --git a/code/game/objects/items/weapons/storage/firstaid.dm b/code/game/objects/items/weapons/storage/firstaid.dm index 1608364398b..5ec7eb57173 100644 --- a/code/game/objects/items/weapons/storage/firstaid.dm +++ b/code/game/objects/items/weapons/storage/firstaid.dm @@ -13,7 +13,7 @@ desc = "It's an emergency medical kit for those serious boo-boos." icon_state = "firstaid" throw_speed = 3 - throw_range = 8 + throw_range = 7 var/empty = 0 diff --git a/code/game/objects/items/weapons/teleportation.dm b/code/game/objects/items/weapons/teleportation.dm index 691ad67d395..62f7a68cbb8 100644 --- a/code/game/objects/items/weapons/teleportation.dm +++ b/code/game/objects/items/weapons/teleportation.dm @@ -20,7 +20,7 @@ w_class = 2.0 item_state = "electronic" throw_speed = 3 - throw_range = 20 + throw_range = 7 m_amt = 400 origin_tech = "magnets=1" diff --git a/code/game/objects/items/weapons/tools.dm b/code/game/objects/items/weapons/tools.dm index fa0136eaaa2..5873003f450 100644 --- a/code/game/objects/items/weapons/tools.dm +++ b/code/game/objects/items/weapons/tools.dm @@ -102,7 +102,7 @@ slot_flags = SLOT_BELT force = 6.0 throw_speed = 3 - throw_range = 9 + throw_range = 7 w_class = 2.0 m_amt = 80 origin_tech = "materials=1;engineering=1" diff --git a/code/game/objects/items/weapons/weaponry.dm b/code/game/objects/items/weapons/weaponry.dm index b976e482cfe..f97827a7cfe 100644 --- a/code/game/objects/items/weapons/weaponry.dm +++ b/code/game/objects/items/weapons/weaponry.dm @@ -7,7 +7,7 @@ throwforce = 0 w_class = 1.0 throw_speed = 3 - throw_range = 15 + throw_range = 7 attack_verb = list("banned") /obj/item/weapon/banhammer/suicide_act(mob/user) diff --git a/code/modules/assembly/assembly.dm b/code/modules/assembly/assembly.dm index 94e106fb5f9..506a9a988cf 100644 --- a/code/modules/assembly/assembly.dm +++ b/code/modules/assembly/assembly.dm @@ -9,7 +9,7 @@ g_amt = 0 throwforce = 2 throw_speed = 3 - throw_range = 10 + throw_range = 7 origin_tech = "magnets=1" var/secured = 1 diff --git a/code/modules/assembly/holder.dm b/code/modules/assembly/holder.dm index f9d41911600..bc306f77c65 100644 --- a/code/modules/assembly/holder.dm +++ b/code/modules/assembly/holder.dm @@ -7,7 +7,7 @@ throwforce = 5 w_class = 2.0 throw_speed = 2 - throw_range = 10 + throw_range = 7 var/secured = 0 var/obj/item/device/assembly/a_left = null diff --git a/code/modules/hydroponics/growninedible.dm b/code/modules/hydroponics/growninedible.dm index 9c717ee198d..060f03b8409 100644 --- a/code/modules/hydroponics/growninedible.dm +++ b/code/modules/hydroponics/growninedible.dm @@ -178,7 +178,7 @@ w_class = 1.0 throwforce = 0 throw_speed = 3 - throw_range = 20 + throw_range = 7 /obj/item/weapon/grown/corncob name = "corn cob" @@ -189,4 +189,4 @@ w_class = 1.0 throwforce = 0 throw_speed = 3 - throw_range = 20 \ No newline at end of file + throw_range = 7 \ No newline at end of file diff --git a/code/modules/hydroponics/hydroitemdefines.dm b/code/modules/hydroponics/hydroitemdefines.dm index 38f402febc9..a86e06cadc5 100644 --- a/code/modules/hydroponics/hydroitemdefines.dm +++ b/code/modules/hydroponics/hydroitemdefines.dm @@ -25,7 +25,7 @@ throwforce = 0 w_class = 2.0 throw_speed = 3 - throw_range = 10 + throw_range = 7 var/toxicity = 4 var/WeedKillStr = 2 @@ -44,7 +44,7 @@ throwforce = 0 w_class = 2.0 throw_speed = 3 - throw_range = 10 + throw_range = 7 var/toxicity = 4 var/PestKillStr = 2 diff --git a/code/modules/paperwork/clipboard.dm b/code/modules/paperwork/clipboard.dm index 895170f6f6f..d71b89782c6 100644 --- a/code/modules/paperwork/clipboard.dm +++ b/code/modules/paperwork/clipboard.dm @@ -6,7 +6,7 @@ throwforce = 0 w_class = 2.0 throw_speed = 3 - throw_range = 10 + throw_range = 7 var/obj/item/weapon/pen/haspen //The stored pen. var/obj/item/weapon/paper/toppaper //The topmost piece of paper. slot_flags = SLOT_BELT diff --git a/code/modules/paperwork/pen.dm b/code/modules/paperwork/pen.dm index 86b6b495f45..ffa2ca5d801 100644 --- a/code/modules/paperwork/pen.dm +++ b/code/modules/paperwork/pen.dm @@ -19,7 +19,7 @@ throwforce = 0 w_class = 1.0 throw_speed = 3 - throw_range = 15 + throw_range = 7 m_amt = 10 pressure_resistance = 2 var/colour = "black" //what colour the ink is! diff --git a/code/modules/paperwork/stamps.dm b/code/modules/paperwork/stamps.dm index 1cad6ab7ea4..c6b16fc7d3e 100644 --- a/code/modules/paperwork/stamps.dm +++ b/code/modules/paperwork/stamps.dm @@ -7,7 +7,7 @@ throwforce = 0 w_class = 1.0 throw_speed = 3 - throw_range = 15 + throw_range = 7 m_amt = 60 item_color = "cargo" pressure_resistance = 2 diff --git a/code/modules/projectiles/ammunition.dm b/code/modules/projectiles/ammunition.dm index 2dfc205343f..edfca4eed66 100644 --- a/code/modules/projectiles/ammunition.dm +++ b/code/modules/projectiles/ammunition.dm @@ -48,7 +48,7 @@ throwforce = 2 w_class = 1.0 throw_speed = 3 - throw_range = 10 + throw_range = 7 var/list/stored_ammo = list() var/ammo_type = /obj/item/ammo_casing var/max_ammo = 7 diff --git a/code/modules/reagents/grenade_launcher.dm b/code/modules/reagents/grenade_launcher.dm index 392c4deb898..149712525d1 100644 --- a/code/modules/reagents/grenade_launcher.dm +++ b/code/modules/reagents/grenade_launcher.dm @@ -6,7 +6,7 @@ item_state = "riotgun" w_class = 4.0 throw_speed = 2 - throw_range = 10 + throw_range = 7 force = 5.0 var/list/grenades = new/list() var/max_grenades = 3 diff --git a/code/modules/reagents/reagent_containers/spray.dm b/code/modules/reagents/reagent_containers/spray.dm index 4a89bfe6418..579e74246e4 100644 --- a/code/modules/reagents/reagent_containers/spray.dm +++ b/code/modules/reagents/reagent_containers/spray.dm @@ -9,7 +9,7 @@ throwforce = 0 w_class = 2.0 throw_speed = 3 - throw_range = 10 + throw_range = 7 amount_per_transfer_from_this = 10 volume = 250 possible_transfer_amounts = null diff --git a/code/modules/reagents/syringe_gun.dm b/code/modules/reagents/syringe_gun.dm index ab500385249..55848e5d6f0 100644 --- a/code/modules/reagents/syringe_gun.dm +++ b/code/modules/reagents/syringe_gun.dm @@ -5,7 +5,7 @@ item_state = "syringegun" w_class = 3 throw_speed = 3 - throw_range = 10 + throw_range = 7 force = 4 m_amt = 2000 clumsy_check = 0 diff --git a/code/unused/assemblies.dm b/code/unused/assemblies.dm index 73d7c305ee9..e0290c877e4 100644 --- a/code/unused/assemblies.dm +++ b/code/unused/assemblies.dm @@ -6,7 +6,7 @@ throwforce = 10 w_class = 3.0 throw_speed = 3 - throw_range = 10 + throw_range = 7 /obj/item/assembly/a_i_a name = "Health-Analyzer/Igniter/Armor Assembly" diff --git a/code/unused/asteroiddevice.dm b/code/unused/asteroiddevice.dm index ab37e4a8071..50a6cf7aaeb 100644 --- a/code/unused/asteroiddevice.dm +++ b/code/unused/asteroiddevice.dm @@ -7,7 +7,7 @@ w_class = 2.0 item_state = "electronic" throw_speed = 3 - throw_range = 20 + throw_range = 7 m_amt = 500 var/obj/effect/ship_landing_beacon/beacon = null var/active = 0 diff --git a/code/unused/gamemodes/ruby.dm b/code/unused/gamemodes/ruby.dm index bd7600e1a4b..daf7fa37a0a 100644 --- a/code/unused/gamemodes/ruby.dm +++ b/code/unused/gamemodes/ruby.dm @@ -263,7 +263,7 @@ w_class = 3.0 throwforce = 60.0 throw_speed = 1 - throw_range = 20 + throw_range = 7 force = 24.0 var/mob/owner diff --git a/code/unused/new_year.dm b/code/unused/new_year.dm index 780fd48c507..4258bfaafcf 100644 --- a/code/unused/new_year.dm +++ b/code/unused/new_year.dm @@ -54,7 +54,7 @@ w_class = 2.0 item_state = "flashbang" throw_speed = 3 - throw_range = 20 + throw_range = 7 flags = FPRINT | TABLEPASS | CONDUCT slot_flags = SLOT_BELT