second pass

This commit is contained in:
Hornygranny
2014-02-15 20:11:12 -08:00
parent 9e14c22747
commit 9d3f8f6a2d
53 changed files with 79 additions and 79 deletions
+1 -1
View File
@@ -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
+1 -1
View File
@@ -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()
+7 -7
View File
@@ -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
+1 -1
View File
@@ -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
+1 -1
View File
@@ -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 = ""
+1 -1
View File
@@ -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
+1 -1
View File
@@ -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"
+2 -2
View File
@@ -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"
@@ -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
+1 -1
View File
@@ -408,7 +408,7 @@
force = 5.0
w_class = 2.0
throwforce = 0
throw_speed = 2
throw_speed = 3
throw_range = 15
ripley
@@ -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"
+1 -1
View File
@@ -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"
@@ -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
@@ -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
@@ -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
+1 -1
View File
@@ -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
@@ -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()
+1 -1
View File
@@ -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
@@ -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
@@ -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
+1 -1
View File
@@ -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"
@@ -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
@@ -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
@@ -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
+6 -6
View File
@@ -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
@@ -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
+2 -2
View File
@@ -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"
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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"
@@ -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"
+3 -3
View File
@@ -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
+1 -1
View File
@@ -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
+1 -1
View File
@@ -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
+1 -1
View File
@@ -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"
+1 -1
View File
@@ -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
+2 -2
View File
@@ -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
+1 -1
View File
@@ -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
@@ -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")
@@ -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
+1 -1
View File
@@ -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.
+1 -1
View File
@@ -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.
+1 -1
View File
@@ -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
+1 -1
View File
@@ -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()
@@ -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'
@@ -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
+1 -1
View File
@@ -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
+1 -1
View File
@@ -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
+1 -1
View File
@@ -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
+1 -1
View File
@@ -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
+1 -1
View File
@@ -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