This commit is contained in:
Fox-McCloud
2015-09-04 05:18:48 -04:00
parent 7c29e59784
commit a019934e9e
80 changed files with 254 additions and 329 deletions
+2 -3
View File
@@ -18,7 +18,7 @@ RCD
throw_speed = 3
throw_range = 5
w_class = 3.0
m_amt = 100000
materials = list(MAT_METAL=100000)
origin_tech = "engineering=4;materials=2"
var/datum/effect/effect/system/spark_spread/spark_system
var/max_matter = 100
@@ -206,8 +206,7 @@ RCD
density = 0
anchored = 0.0
origin_tech = "materials=2"
m_amt = 16000
g_amt = 8000
materials = list(MAT_METAL=16000, MAT_GLASS=8000)
var/ammoamt = 20
/obj/item/weapon/rcd_ammo/large
@@ -11,7 +11,7 @@
throw_speed = 2
throw_range = 7
force = 10
m_amt = 90
materials = list(MAT_METAL=90)
attack_verb = list("slammed", "whacked", "bashed", "thunked", "battered", "bludgeoned", "thrashed")
var/max_water = 50
var/last_use = 1.0
@@ -31,7 +31,7 @@
throwforce = 2
w_class = 2.0
force = 3.0
m_amt = 0
materials = list()
max_water = 30
sprite_name = "miniFE"
@@ -10,7 +10,7 @@
throw_speed = 1
throw_range = 5
w_class = 3.0
m_amt = 500
materials = list(MAT_METAL=500)
origin_tech = "combat=1;plasmatech=1"
var/status = 0
var/throw_amount = 100
+1 -1
View File
@@ -10,7 +10,7 @@
w_class = 2.0
throw_speed = 2
throw_range = 5
m_amt = 500
materials = list(MAT_METAL=500)
origin_tech = "materials=1"
var/breakouttime = 600 //Deciseconds = 60s = 1 minutes
var/cuffsound = 'sound/weapons/handcuffs.ogg'
+1 -2
View File
@@ -141,7 +141,7 @@
throwforce = 6.0
throw_speed = 3
throw_range = 6
m_amt = 12000
materials = list(MAT_METAL=12000)
origin_tech = "materials=1"
attack_verb = list("slashed", "stabbed", "sliced", "torn", "ripped", "diced", "cut")
@@ -183,7 +183,6 @@
throwforce = 8.0
throw_speed = 3
throw_range = 6
m_amt = 12000
origin_tech = "materials=1"
attack_verb = list("cleaved", "slashed", "stabbed", "sliced", "torn", "ripped", "diced", "cut")
sharp = 1
+1 -1
View File
@@ -31,7 +31,7 @@
force = 5.0
throwforce = 7.0
w_class = 2.0
m_amt = 50
materials = list(MAT_METAL=50)
attack_verb = list("bludgeoned", "whacked", "disciplined", "thrashed")
/obj/item/weapon/c_tube
+1 -2
View File
@@ -8,8 +8,7 @@ var/global/list/cached_icons = list()
icon = 'icons/obj/items.dmi'
icon_state = "paint_neutral"
item_state = "paintcan"
m_amt = 200
g_amt = 0
materials = list(MAT_METAL=200)
w_class = 3.0
amount_per_transfer_from_this = 10
possible_transfer_amounts = list(10,20,30,50,70)
+11 -14
View File
@@ -13,8 +13,7 @@
var/charge = 0 // note %age conveted to actual charge in New
var/maxcharge = 10000
rating = 1
m_amt = 700
g_amt = 50
materials = list(MAT_METAL=700, MAT_GLASS=50)
var/rigged = 0 // true if rigged to explode
var/minor_fault = 0 //If not 100% reliable, it will build up faults.
var/construction_cost = list("metal"=750,"glass"=75)
@@ -30,7 +29,7 @@
origin_tech = "powerstorage=0"
maxcharge = 5000
rating = 2
g_amt = 40
materials = list(MAT_GLASS=40)
/obj/item/weapon/stock_parts/cell/crap/empty/New()
..()
@@ -41,7 +40,7 @@
origin_tech = "powerstorage=0"
maxcharge = 6000 //6000 max charge / 1000 charge per shot = six shots
rating = 2.5
g_amt = 40
materials = list(MAT_GLASS=40)
/obj/item/weapon/stock_parts/cell/secborg/empty/New()
..()
@@ -53,7 +52,7 @@
icon_state = "hcell"
maxcharge = 15000
rating = 3
g_amt = 60
materials = list(MAT_GLASS=60)
/obj/item/weapon/stock_parts/cell/high/empty/New()
..()
@@ -64,7 +63,7 @@
origin_tech = "powerstorage=5"
icon_state = "scell"
maxcharge = 20000
g_amt = 70
materials = list(MAT_GLASS=70)
rating = 4
construction_cost = list("metal"=750,"glass"=100)
@@ -78,7 +77,7 @@
icon_state = "hpcell"
maxcharge = 30000
rating = 5
g_amt = 80
materials = list(MAT_GLASS=80)
construction_cost = list("metal"=500,"glass"=150,"gold"=200,"silver"=200)
/obj/item/weapon/stock_parts/cell/hyper/empty/New()
@@ -90,7 +89,7 @@
origin_tech = "powerstorage=7"
icon_state = "bscell"
maxcharge = 40000
g_amt = 80
materials = list(MAT_GLASS=80)
rating = 6
construction_cost = list("metal"=800,"gold"=300,"silver"=300,"glass"=160,"diamond"=160)
@@ -104,7 +103,7 @@
origin_tech = null
maxcharge = 30000
rating = 6
g_amt = 80
materials = list(MAT_GLASS=80)
use()
return 1
@@ -117,8 +116,7 @@
charge = 100
maxcharge = 3000
rating = 1
m_amt = 0
g_amt = 0
materials = list()
minor_fault = 1
@@ -130,8 +128,7 @@
icon_state = "yellow slime extract" //"potato_battery"
maxcharge = 10000
rating = 3
m_amt = 0
g_amt = 0
materials = list()
/obj/item/weapon/stock_parts/cell/pulse/carbine
name = "pulse carbine power cell"
@@ -146,7 +143,7 @@
desc = "A standard ninja-suit power cell."
maxcharge = 10000
rating = 3
g_amt = 60
materials = list(MAT_GLASS=60)
/obj/item/weapon/stock_parts/cell/emproof
name = "\improper EMP-proof cell"
+1 -1
View File
@@ -11,7 +11,7 @@
force = 5.0
throwforce = 10.0
item_state = "shard-glass"
g_amt = MINERAL_MATERIAL_AMOUNT
materials = list(MAT_GLASS=MINERAL_MATERIAL_AMOUNT)
attack_verb = list("stabbed", "slashed", "sliced", "cut")
hitsound = 'sound/weapons/bladeslice.ogg'
+1 -2
View File
@@ -12,8 +12,7 @@
throw_speed = 2
throw_range = 3
w_class = 4
g_amt = 7500
m_amt = 1000
materials = list(MAT_GLASS=7500, MAT_METAL=1000)
origin_tech = "materials=2"
attack_verb = list("shoved", "bashed")
var/cooldown = 0 //shield bash cooldown. based on world.time
+28 -45
View File
@@ -74,45 +74,42 @@
desc = "Used in the construction of computers and other devices with a interactive console."
icon_state = "screen"
origin_tech = "materials=1"
g_amt = 200
materials = list(MAT_GLASS=200)
/obj/item/weapon/stock_parts/capacitor
name = "capacitor"
desc = "A basic capacitor used in the construction of a variety of devices."
icon_state = "capacitor"
origin_tech = "powerstorage=1"
m_amt = 50
g_amt = 50
materials = list(MAT_METAL=50, MAT_GLASS=50)
/obj/item/weapon/stock_parts/scanning_module
name = "scanning module"
desc = "A compact, high resolution scanning module used in the construction of certain devices."
icon_state = "scan_module"
origin_tech = "magnets=1"
m_amt = 50
g_amt = 20
materials = list(MAT_METAL=50, MAT_GLASS=20)
/obj/item/weapon/stock_parts/manipulator
name = "micro-manipulator"
desc = "A tiny little manipulator used in the construction of certain devices."
icon_state = "micro_mani"
origin_tech = "materials=1;programming=1"
m_amt = 30
materials = list(MAT_METAL=30)
/obj/item/weapon/stock_parts/micro_laser
name = "micro-laser"
desc = "A tiny laser used in certain devices."
icon_state = "micro_laser"
origin_tech = "magnets=1"
m_amt = 10
g_amt = 20
materials = list(MAT_METAL=10, MAT_GLASS=20)
/obj/item/weapon/stock_parts/matter_bin
name = "matter bin"
desc = "A container for hold compressed matter awaiting re-construction."
icon_state = "matter_bin"
origin_tech = "materials=1"
m_amt = 80
materials = list(MAT_METAL=80)
//Rank 2
@@ -122,8 +119,7 @@
icon_state = "adv_capacitor"
origin_tech = "powerstorage=3"
rating = 2
m_amt = 50
g_amt = 50
materials = list(MAT_METAL=50, MAT_GLASS=50)
/obj/item/weapon/stock_parts/scanning_module/adv
name = "advanced scanning module"
@@ -131,8 +127,7 @@
icon_state = "adv_scan_module"
origin_tech = "magnets=3"
rating = 2
m_amt = 50
g_amt = 20
materials = list(MAT_METAL=50, MAT_GLASS=20)
/obj/item/weapon/stock_parts/manipulator/nano
name = "nano-manipulator"
@@ -140,7 +135,7 @@
icon_state = "nano_mani"
origin_tech = "materials=3,programming=2"
rating = 2
m_amt = 30
materials = list(MAT_METAL=30)
/obj/item/weapon/stock_parts/micro_laser/high
name = "high-power micro-laser"
@@ -148,8 +143,7 @@
icon_state = "high_micro_laser"
origin_tech = "magnets=3"
rating = 2
m_amt = 10
g_amt = 20
materials = list(MAT_METAL=10, MAT_GLASS=20)
/obj/item/weapon/stock_parts/matter_bin/adv
name = "advanced matter bin"
@@ -157,7 +151,7 @@
icon_state = "advanced_matter_bin"
origin_tech = "materials=3"
rating = 2
m_amt = 80
materials = list(MAT_METAL=80)
//Rating 3
@@ -167,8 +161,7 @@
icon_state = "super_capacitor"
origin_tech = "powerstorage=5;materials=4"
rating = 3
m_amt = 50
g_amt = 50
materials = list(MAT_METAL=50, MAT_GLASS=50)
/obj/item/weapon/stock_parts/scanning_module/phasic
name = "phasic scanning module"
@@ -176,8 +169,7 @@
icon_state = "super_scan_module"
origin_tech = "magnets=5"
rating = 3
m_amt = 50
g_amt = 20
materials = list(MAT_METAL=50, MAT_GLASS=20)
/obj/item/weapon/stock_parts/manipulator/pico
name = "pico-manipulator"
@@ -185,7 +177,7 @@
icon_state = "pico_mani"
origin_tech = "materials=5,programming=2"
rating = 3
m_amt = 30
materials = list(MAT_METAL=30)
/obj/item/weapon/stock_parts/micro_laser/ultra
name = "ultra-high-power micro-laser"
@@ -193,8 +185,7 @@
desc = "A tiny laser used in certain devices."
origin_tech = "magnets=5"
rating = 3
m_amt = 10
g_amt = 20
materials = list(MAT_METAL=10, MAT_GLASS=20)
/obj/item/weapon/stock_parts/matter_bin/super
name = "super matter bin"
@@ -202,7 +193,7 @@
icon_state = "super_matter_bin"
origin_tech = "materials=5"
rating = 3
m_amt = 80
materials = list(MAT_METAL=80)
//Rating 4
@@ -212,8 +203,7 @@
icon_state = "quadratic_capacitor"
origin_tech = "powerstorage=6;materials=5"
rating = 4
m_amt = 50
g_amt = 50
materials = list(MAT_METAL=50, MAT_GLASS=50)
/obj/item/weapon/stock_parts/scanning_module/triphasic
name = "triphasic scanning module"
@@ -221,8 +211,7 @@
icon_state = "triphasic_scan_module"
origin_tech = "magnets=6"
rating = 4
m_amt = 50
g_amt = 20
materials = list(MAT_METAL=50, MAT_GLASS=20)
/obj/item/weapon/stock_parts/manipulator/femto
name = "femto-manipulator"
@@ -230,7 +219,7 @@
icon_state = "femto_mani"
origin_tech = "materials=6;programming=3"
rating = 4
m_amt = 30
materials = list(MAT_METAL=30)
/obj/item/weapon/stock_parts/micro_laser/quadultra
name = "quad-ultra micro-laser"
@@ -238,8 +227,7 @@
desc = "A tiny laser used in certain devices."
origin_tech = "magnets=6"
rating = 4
m_amt = 10
g_amt = 20
materials = list(MAT_METAL=10, MAT_GLASS=20)
/obj/item/weapon/stock_parts/matter_bin/bluespace
name = "bluespace matter bin"
@@ -247,7 +235,7 @@
icon_state = "bluespace_matter_bin"
origin_tech = "materials=6"
rating = 4
m_amt = 80
materials = list(MAT_METAL=80)
// Subspace stock parts
@@ -256,54 +244,49 @@
icon_state = "subspace_ansible"
desc = "A compact module capable of sensing extradimensional activity."
origin_tech = "programming=2;magnets=3;materials=2;bluespace=1"
m_amt = 30
g_amt = 10
materials = list(MAT_METAL=30, MAT_GLASS=10)
/obj/item/weapon/stock_parts/subspace/filter
name = "hyperwave filter"
icon_state = "hyperwave_filter"
desc = "A tiny device capable of filtering and converting super-intense radiowaves."
origin_tech = "programming=2;magnets=1"
m_amt = 30
g_amt = 10
materials = list(MAT_METAL=30, MAT_GLASS=10)
/obj/item/weapon/stock_parts/subspace/amplifier
name = "subspace amplifier"
icon_state = "subspace_amplifier"
desc = "A compact micro-machine capable of amplifying weak subspace transmissions."
origin_tech = "programming=2;magnets=2;materials=1;bluespace=1"
m_amt = 30
g_amt = 10
materials = list(MAT_METAL=30, MAT_GLASS=10)
/obj/item/weapon/stock_parts/subspace/treatment
name = "subspace treatment disk"
icon_state = "treatment_disk"
desc = "A compact micro-machine capable of stretching out hyper-compressed radio waves."
origin_tech = "programming=2;magnets=1;materials=3;bluespace=1"
m_amt = 30
g_amt = 10
materials = list(MAT_METAL=30, MAT_GLASS=10)
/obj/item/weapon/stock_parts/subspace/analyzer
name = "subspace wavelength analyzer"
icon_state = "wavelength_analyzer"
desc = "A sophisticated analyzer capable of analyzing cryptic subspace wavelengths."
origin_tech = "programming=2;magnets=2;materials=2;bluespace=1"
m_amt = 30
g_amt = 10
materials = list(MAT_METAL=30, MAT_GLASS=10)
/obj/item/weapon/stock_parts/subspace/crystal
name = "ansible crystal"
icon_state = "ansible_crystal"
desc = "A crystal made from pure glass used to transmit laser databursts to subspace."
origin_tech = "magnets=2;materials=2;bluespace=1"
g_amt = 50
materials = list(MAT_GLASS=50)
/obj/item/weapon/stock_parts/subspace/transmitter
name = "subspace transmitter"
icon_state = "subspace_transmitter"
desc = "A large piece of equipment used to open a window into the subspace dimension."
origin_tech = "magnets=3;materials=3;bluespace=2"
m_amt = 50
materials = list(MAT_METAL=50)
/obj/item/weapon/research//Makes testing much less of a pain -Sieve
name = "research"
@@ -365,7 +365,7 @@
throw_range = 5
w_class = 4.0
flags = CONDUCT
m_amt = 3000
materials = list(MAT_METAL=3000)
/obj/item/weapon/storage/bag/tray/attack(mob/living/M as mob, mob/living/user as mob)
..()
@@ -133,7 +133,7 @@
/obj/item/weapon/storage/box/gauge
name = "box of 12 gauge slugs"
desc = "It has a picture of a gun and several warning symbols on the front."
m_amt = 50000
materials = list(MAT_METAL=28000)
New()
..()
@@ -14,7 +14,7 @@
item_state = "radio"
throw_speed = 4
throw_range = 20
m_amt = 100
materials = list(MAT_METAL=100)
origin_tech = "magnets=2;syndicate=3"*/
/obj/item/weapon/SWF_uplink
@@ -34,5 +34,5 @@
w_class = 2.0
throw_speed = 4
throw_range = 20
m_amt = 100
materials = list(MAT_METAL=100)
origin_tech = "magnets=1"
@@ -12,7 +12,7 @@
gender = PLURAL
icon = 'icons/obj/items.dmi'
icon_state = "table_parts"
m_amt = 3750
materials = list(MAT_METAL=3750)
flags = CONDUCT
attack_verb = list("slammed", "bashed", "battered", "bludgeoned", "thrashed", "whacked")
@@ -21,7 +21,7 @@
desc = "Hard table parts. Well...harder..."
icon = 'icons/obj/items.dmi'
icon_state = "reinf_tableparts"
m_amt = 7500
materials = list(MAT_METAL=7500)
flags = CONDUCT
/obj/item/weapon/table_parts/wood
@@ -42,7 +42,7 @@
icon = 'icons/obj/items.dmi'
icon_state = "rack_parts"
flags = CONDUCT
m_amt = 3750
materials = list(MAT_METAL=3750)
/*
* Table Parts
@@ -21,7 +21,7 @@
item_state = "electronic"
throw_speed = 4
throw_range = 20
m_amt = 400
materials = list(MAT_METAL=400)
origin_tech = "magnets=1"
/obj/item/weapon/locator/attack_self(mob/user as mob)
@@ -132,7 +132,7 @@ Frequency:
w_class = 2.0
throw_speed = 3
throw_range = 5
m_amt = 10000
materials = list(MAT_METAL=10000)
origin_tech = "magnets=1;bluespace=3"
var/active_portals = 0
+12 -17
View File
@@ -25,7 +25,7 @@
force = 5.0
throwforce = 7.0
w_class = 2.0
m_amt = 150
materials = list(MAT_METAL=150)
origin_tech = "materials=1;engineering=1"
attack_verb = list("bashed", "battered", "bludgeoned", "whacked")
@@ -35,7 +35,7 @@
*/
/obj/item/weapon/screwdriver
name = "screwdriver"
desc = "You can be totally screwwy with this."
desc = "You can be totally screwy with this."
icon = 'icons/obj/items.dmi'
icon_state = "screwdriver"
flags = CONDUCT
@@ -45,8 +45,7 @@
throwforce = 5.0
throw_speed = 3
throw_range = 5
g_amt = 0
m_amt = 75
materials = list(MAT_METAL=75)
attack_verb = list("stabbed")
hitsound = 'sound/weapons/bladeslice.ogg'
@@ -84,7 +83,7 @@
return
/obj/item/weapon/screwdriver/attack(mob/living/carbon/M as mob, mob/living/carbon/user as mob)
if(!istype(M) || user.a_intent == "help")
if(!istype(M) || user.a_intent == "help")
return ..()
if(user.zone_sel.selecting != "eyes" && user.zone_sel.selecting != "head")
return ..()
@@ -106,7 +105,7 @@
throw_speed = 3
throw_range = 7
w_class = 2.0
m_amt = 80
materials = list(MAT_METAL=80)
origin_tech = "materials=1;engineering=1"
attack_verb = list("pinched", "nipped")
hitsound = "sound/items/Wirecutter.ogg"
@@ -148,8 +147,7 @@
w_class = 2.0
//Cost to make in the autolathe
m_amt = 70
g_amt = 20
materials = list(MAT_METAL=70, MAT_GLASS=30)
//R&D tech level
origin_tech = "engineering=1"
@@ -409,24 +407,21 @@
/obj/item/weapon/weldingtool/largetank
name = "Industrial Welding Tool"
max_fuel = 40
m_amt = 70
g_amt = 60
materials = list(MAT_METAL=70, MAT_GLASS=60)
origin_tech = "engineering=2"
/obj/item/weapon/weldingtool/hugetank
name = "Upgraded Welding Tool"
max_fuel = 80
w_class = 3.0
m_amt = 70
g_amt = 120
materials = list(MAT_METAL=70, MAT_GLASS=120)
origin_tech = "engineering=3"
/obj/item/weapon/weldingtool/experimental
name = "Experimental Welding Tool"
max_fuel = 40
w_class = 3.0
m_amt = 70
g_amt = 120
materials = list(MAT_METAL=70, MAT_GLASS=120)
origin_tech = "engineering=4;plasma=3"
icon_state = "ewelder"
var/last_gen = 0
@@ -454,7 +449,7 @@
throwforce = 7.0
item_state = "crowbar"
w_class = 2.0
m_amt = 50
materials = list(MAT_METAL=50)
origin_tech = "engineering=1"
attack_verb = list("attacked", "bashed", "battered", "bludgeoned", "whacked")
@@ -470,7 +465,7 @@
w_class = 3
throw_speed = 3
throw_range = 3
m_amt = 66
materials = list(MAT_METAL=70)
icon_state = "crowbar_large"
/obj/item/weapon/weldingtool/attack(mob/M as mob, mob/user as mob)
@@ -478,7 +473,7 @@
var/mob/living/carbon/human/H = M
var/obj/item/organ/external/S = H.organs_by_name[user.zone_sel.selecting]
if (!S)
if (!S)
return
if(!(S.status & ORGAN_ROBOT) || user.a_intent != "help" || S.open == 2)
return ..()
+1 -1
View File
@@ -158,7 +158,7 @@ obj/item/weapon/wirerod
force = 9
throwforce = 10
w_class = 3
m_amt = 1875
materials = list(MAT_METAL=1875)
attack_verb = list("hit", "bludgeoned", "whacked", "bonked")
obj/item/weapon/wirerod/attackby(var/obj/item/I, mob/user as mob, params)
+1 -1
View File
@@ -8,7 +8,7 @@
var/amount = 1.0
var/laying = 0.0
var/old_lay = null
m_amt = 40
materials = list(MAT_METAL=40)
attack_verb = list("whipped", "lashed", "disciplined", "tickled")
suicide_act(mob/user)