diff --git a/code/datums/uplink_item.dm b/code/datums/uplink_item.dm index 89bfe35d7de..af75bdb538e 100644 --- a/code/datums/uplink_item.dm +++ b/code/datums/uplink_item.dm @@ -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 diff --git a/code/modules/customitems/item_defines.dm b/code/modules/customitems/item_defines.dm index faf039a6f23..740e5fd69c2 100644 --- a/code/modules/customitems/item_defines.dm +++ b/code/modules/customitems/item_defines.dm @@ -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 /////////// ////////////////////////////////// diff --git a/code/modules/mining/mine_items.dm b/code/modules/mining/mine_items.dm index 35be416e8f1..0c6fed16571 100644 --- a/code/modules/mining/mine_items.dm +++ b/code/modules/mining/mine_items.dm @@ -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" diff --git a/icons/mob/head.dmi b/icons/mob/head.dmi index 9184f11c095..e1b188300a6 100644 Binary files a/icons/mob/head.dmi and b/icons/mob/head.dmi differ diff --git a/icons/obj/clothing/hats.dmi b/icons/obj/clothing/hats.dmi index 935a230c74a..ad9f67bf5c1 100644 Binary files a/icons/obj/clothing/hats.dmi and b/icons/obj/clothing/hats.dmi differ diff --git a/icons/obj/items.dmi b/icons/obj/items.dmi index 5b70d7d8116..c7ce5d4d65c 100644 Binary files a/icons/obj/items.dmi and b/icons/obj/items.dmi differ