Merge pull request #746 from jack-fractal/write-research-debug

R&D Research Levels Unification
This commit is contained in:
ZomgPonies
2015-04-06 23:28:27 -04:00
44 changed files with 152 additions and 74 deletions
@@ -87,6 +87,7 @@
icon_state = "stunshell"
projectile_type = "/obj/item/projectile/bullet/stunshot"
m_amt = 200
origin_tech="combat=3;materials=3"
/obj/item/ammo_casing/shotgun/meteorshot
@@ -143,6 +144,7 @@
desc = "A high-tech shotgun shell which can be loaded with materials to produce unique effects."
icon_state = "cshell"
projectile_type = null
origin_tech="combat=3;materials=3;powerstorage=4;magnets=3"
/obj/item/ammo_casing/shotgun/dart
name = "shotgun dart"
@@ -122,6 +122,7 @@
ammo_type = "/obj/item/ammo_casing/c9mm"
caliber = "9mm"
max_ammo = 20
origin_tech = "combat=4;materials=3"
/obj/item/ammo_box/magazine/smgm9mm/update_icon()
..()
@@ -105,7 +105,7 @@ obj/item/weapon/gun/energy/laser/retro
desc = "A high-power laser gun capable of expelling concentrated xray blasts."
icon_state = "xray"
fire_sound = 'sound/weapons/laser3.ogg'
origin_tech = "combat=5;materials=3;magnets=2;syndicate=2"
origin_tech = "combat=6;materials=5;biotech=5;powerstorage=4"
projectile_type = "/obj/item/projectile/beam/xray"
charge_cost = 500
@@ -42,7 +42,7 @@
name = "Advanced Energy Gun"
desc = "An energy gun with an experimental miniaturized reactor."
icon_state = "nucgun"
origin_tech = "combat=3;materials=5;powerstorage=3"
origin_tech = "combat=4;materials=5;powerstorage=3"
var/lightfail = 0
var/charge_tick = 0
can_flashlight = 0
@@ -19,7 +19,7 @@
desc = "The MK.II Prototype Ion Projector is a lightweight carbine version of the larger ion rifle, built to be ergonomic and efficient."
icon_state = "ioncarbine"
item_state = "ioncarbine"
origin_tech = "combat=4;magnets=4;materials=4"
origin_tech = "combat=5;magnets=4;materials=4"
w_class = 3
slot_flags = SLOT_BELT
@@ -28,7 +28,7 @@
desc = "A gun that discharges high amounts of controlled radiation to slowly break a target into component elements."
icon_state = "decloner"
fire_sound = 'sound/weapons/pulse3.ogg'
origin_tech = "combat=5;materials=4;powerstorage=3"
origin_tech = "combat=6;materials=7;biotech=5;powerstorage=6"
projectile_type = "/obj/item/projectile/energy/declone"
@@ -278,7 +278,7 @@ modules/mob/living/carbon/human/life.dm if you die, you will be zoomed out.
icon_state = "crossbowlarge"
w_class = 3
m_amt = 4000
origin_tech = "combat=2;magnets=2;syndicate=3" //can be further researched for more syndie tech
origin_tech = "combat=5;materials=5;engineering=3;biotech=4;syndicate=3" //can be further researched for more syndie tech
silenced = 0
projectile_type = "/obj/item/projectile/energy/bolt/large"
@@ -54,6 +54,7 @@
projectile_type = "/obj/item/projectile/energy/electrode"
cell_type = "/obj/item/weapon/stock_parts/cell"
fire_delay = 15
origin_tech="combat=3;materials=3;powerstorage=2"
+2 -1
View File
@@ -146,4 +146,5 @@
icon_state = "suppressor"
w_class = 2
var/oldsound = null
var/initial_w_class = null
var/initial_w_class = null
origin_tech="combat=6;engineering=5;syndicate=3"
@@ -3,7 +3,7 @@
desc = "A lightweight, prototype 9mm submachine gun, designated 'SABR'. Has a threaded barrel for suppressors."
icon_state = "saber"
w_class = 3.0
origin_tech = "combat=4;materials=2"
origin_tech = "combat=4;materials=3"
automatic = 1
mag_type = "/obj/item/ammo_box/magazine/smgm9mm"
var/alarmed = 0