cyberpresidentvanellope/Bubberstation
1
0
Fork 0
mirror of https://github.com/Bubberstation/Bubberstation.git synced 2026-08-30 16:47:13 +01:00
Code Issues Packages Projects Releases Wiki Activity

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.

Browse Source
This commit is contained in:
Hornygranny
2014-02-17 15:44:07 -08:00
parent 1f7776a0ef
commit 2134add41b
44 changed files with 54 additions and 54 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/defines/obj.dm
+1 -1
View File
@@ -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)
code/defines/obj/weapon.dm
+2 -2
View File
@@ -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
code/game/gamemodes/nuclear/pinpointer.dm
+1 -1
View File
@@ -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
code/game/gamemodes/wizard/artefact.dm
+1 -1
View File
@@ -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
code/game/mecha/mecha_parts.dm
+1 -1
View File
@@ -409,7 +409,7 @@
w_class = 2.0
throwforce = 0
throw_speed = 3
throw_range = 15
throw_range = 7
ripley
origin_tech = "programming=3"
code/game/objects/items/devices/flash.dm
+1 -1
View File
@@ -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"
code/game/objects/items/devices/multitool.dm
+1 -1
View File
@@ -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
code/game/objects/items/devices/radio/radio.dm
+1 -1
View File
@@ -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
code/game/objects/items/devices/scanners.dm
+3 -3
View File
@@ -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"
code/game/objects/items/devices/traitordevices.dm
+1 -1
View File
@@ -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"
code/game/objects/items/latexballoon.dm
+1 -1
View File
@@ -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
code/game/objects/items/stacks/medical.dm
+1 -1
View File
@@ -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
code/game/objects/items/stacks/rods.dm
+1 -1
View File
@@ -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")
code/game/objects/items/stacks/sheets/light.dm
+1 -1
View File
@@ -7,7 +7,7 @@
force = 3.0
throwforce = 5.0
throw_speed = 3
throw_range = 20
throw_range = 7
flags = CONDUCT
max_amount = 60
code/game/objects/items/stacks/tiles/light.dm
+1 -1
View File
@@ -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")
code/game/objects/items/stacks/tiles/plasteel.dm
+1 -1
View File
@@ -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
code/game/objects/items/stacks/tiles/tile_types.dm
+3 -3
View File
@@ -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
code/game/objects/items/toys.dm
+4 -4
View File
@@ -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")
code/game/objects/items/weapons/AI_modules.dm
+1 -1
View File
@@ -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()
code/game/objects/items/weapons/extinguisher.dm
+1 -1
View File
@@ -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")
code/game/objects/items/weapons/grenades/ghettobomb.dm
+1 -1
View File
@@ -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
code/game/objects/items/weapons/grenades/grenade.dm
+1 -1
View File
@@ -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
code/game/objects/items/weapons/mop.dm
+1 -1
View File
@@ -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
code/game/objects/items/weapons/scrolls.dm
+1 -1
View File
@@ -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
code/game/objects/items/weapons/singularityhammer.dm
+1 -1
View File
@@ -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"
code/game/objects/items/weapons/storage/firstaid.dm
+1 -1
View File
@@ -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
code/game/objects/items/weapons/teleportation.dm
+1 -1
View File
@@ -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"
code/game/objects/items/weapons/tools.dm
+1 -1
View File
@@ -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"
code/game/objects/items/weapons/weaponry.dm
+1 -1
View File
@@ -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)
code/modules/assembly/assembly.dm
+1 -1
View File
@@ -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
code/modules/assembly/holder.dm
+1 -1
View File
@@ -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
code/modules/hydroponics/growninedible.dm
+2 -2
View File
@@ -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
throw_range = 7
code/modules/hydroponics/hydroitemdefines.dm
+2 -2
View File
@@ -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
code/modules/paperwork/clipboard.dm
+1 -1
View File
@@ -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
code/modules/paperwork/pen.dm
+1 -1
View File
@@ -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!
code/modules/paperwork/stamps.dm
+1 -1
View File
@@ -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
code/modules/projectiles/ammunition.dm
+1 -1
View File
@@ -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
code/modules/reagents/grenade_launcher.dm
+1 -1
View File
@@ -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
code/modules/reagents/reagent_containers/spray.dm
+1 -1
View File
@@ -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
code/modules/reagents/syringe_gun.dm
+1 -1
View File
@@ -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
code/unused/assemblies.dm
+1 -1
View File
@@ -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"
code/unused/asteroiddevice.dm
+1 -1
View File
@@ -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
code/unused/gamemodes/ruby.dm
+1 -1
View File
@@ -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
code/unused/new_year.dm
+1 -1
View File
@@ -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