Merge pull request #466 from melandor0/paradise

supermatter drill
This commit is contained in:
Fox-McCloud
2014-11-23 21:49:06 -05:00
6 changed files with 22 additions and 1 deletions
+9 -1
View File
@@ -285,7 +285,7 @@ var/list/uplink_items = list()
item = /obj/mecha/combat/marauder/mauler/loaded
cost = 140
gamemodes = list("nuclear emergency")
/datum/uplink_item/dangerous/syndieborg
name = "Syndicate Cyborg"
desc = "A cyborg designed and programmed for systematic extermination of non-Syndicate personnel."
@@ -438,6 +438,14 @@ var/list/uplink_items = list()
item = /obj/item/weapon/storage/backpack/satchel_flat
cost = 2
/* Commented out until a balance fix is found -Mel
/datum/uplink_item/stealthy_tools/smdrill
name = "Supermatter Drill"
desc = "A pocket-sized drill tipped with nanoscopic supermatter crystals, able to cut through reinforced walls."
item = /obj/item/weapon/pickaxe/diamonddrill/traitor
cost = 6
*/
// DEVICE AND TOOLS
/datum/uplink_item/device_tools
+6
View File
@@ -42,6 +42,12 @@
has_sensor = 1 // Just to make sure it has a sensor
armor = list(melee = 0, bullet = 0, laser = 0,energy = 0, bomb = 0, bio = 0, rad = 0) // Standar Jumpsuit stats
/obj/item/clothing/head/fluff/sparkyninja_beret //Sparkyninja: Neil Wilkinson
name = "royal marines commando beret"
desc = "Dark Green beret with an old insignia on it."
icon_state = "sparkyninja_beret"
flags = FPRINT | TABLEPASS
//////////////////////////////////
////////// Fluff Items ///////////
//////////////////////////////////
+7
View File
@@ -131,6 +131,13 @@
origin_tech = "materials=6;powerstorage=4;engineering=5"
desc = "Yours is the drill that will pierce the heavens!"
traitor //Pocket-sized traitor diamond drill.
name = "supermatter drill"
icon_state = "smdrill"
origin_tech = "materials=6;powerstorage=4;engineering=5;syndicate=3"
desc = "Microscopic supermatter crystals cover the head of this tiny drill."
w_class = 2.0
borgdrill
name = "cyborg mining drill"
icon_state = "diamonddrill"