Adds two new augments to Traitor uplink

code/datums/uplink/implants.dm

@@ -73,3 +73,13 @@
 	name = "Integrated Surge Implant"
 	item_cost = 40
 	path = /obj/item/weapon/storage/box/syndie_kit/imp_aug/surge
+	
+/datum/uplink_item/item/implants/imp_armblade
+	name = "Integrated Armblade Implant"
+	item_cost = 40
+	path = /obj/item/weapon/storage/box/syndie_kit/imp_aug/armblade
+
+/datum/uplink_item/item/implants/imp_handblade
+	name = "Integrated Handblade Implant"
+	item_cost = 25
+	path = /obj/item/weapon/storage/box/syndie_kit/imp_aug/handblade

code/game/objects/items/weapons/augment_items.dm

@@ -0,0 +1,37 @@
+// **For augment items that aren't subtypes of other things.**
+
+/obj/item/weapon/melee/augment
+	name = "integrated item"
+	desc = "A surprisingly non-descript item, integrated into its user. You probably shouldn't be seeing this."
+	icon = 'icons/obj/surgery.dmi'
+	icon_state = "augment_box"
+
+
+/obj/item/weapon/melee/augment/blade
+	name = "handblade"
+	desc = "A sleek-looking telescopic blade that fits inside the hand. Favored by infiltration specialists and assassins."
+	icon_state = "augment_handblade"
+	item_icons = list(
+			slot_l_hand_str = 'icons/mob/items/lefthand_melee.dmi',
+			slot_r_hand_str = 'icons/mob/items/righthand_melee.dmi',
+			)
+	w_class = ITEMSIZE_SMALL
+	force = 15
+	armor_penetration = 25
+	sharp = 1
+	attack_verb = list("attacked", "slashed", "stabbed", "sliced", "torn", "ripped", "diced", "cut")
+	defend_chance = 10
+	projectile_parry_chance = 5
+	hitsound = 'sound/weapons/bladeslice.ogg'
+
+/obj/item/weapon/melee/augment/blade/arm
+	name = "armblade"
+	desc = "A sleek-looking cybernetic blade that cleaves through people like butter. Favored by psychopaths and assassins."
+	icon_state = "augment_armblade"
+	w_class = ITEMSIZE_HUGE
+	force = 30
+	armor_penetration = 15
+	edge = 1
+	pry = 1
+	defend_chance = 40
+	projectile_parry_chance = 20

code/game/objects/items/weapons/implants/implantaugment.dm

@@ -169,6 +169,10 @@
 	organ_to_implant = /obj/item/organ/internal/augment/armmounted/hand/sword
 	organ_display_name = "weapon augment"
 
+/obj/item/weapon/implant/organ/limbaugment/wrist/blade
+	organ_to_implant = /obj/item/organ/internal/augment/armmounted/hand/blade
+	organ_display_name = "weapon augment"
+
 // Fore-arm
 /obj/item/weapon/implant/organ/limbaugment/laser
 	organ_to_implant = /obj/item/organ/internal/augment/armmounted
@@ -185,6 +189,10 @@
 /obj/item/weapon/implant/organ/limbaugment/upperarm/surge
 	organ_to_implant = /obj/item/organ/internal/augment/armmounted/shoulder/surge
 
+/obj/item/weapon/implant/organ/limbaugment/upperarm/blade
+	organ_to_implant = /obj/item/organ/internal/augment/armmounted/shoulder/blade
+	organ_display_name = "weapon augment"
+
 /*
  * Others
  */

code/game/objects/items/weapons/implants/implantcase.dm

@@ -279,3 +279,23 @@
 	src.imp = new /obj/item/weapon/implant/organ/pelvic( src )
 	..()
 	return
+
+/obj/item/weapon/implantcase/armblade
+	name = "glass case - 'Armblade'"
+	desc = "A case containing a nanite fabricator implant."
+	icon_state = "implantcase-b"
+
+/obj/item/weapon/implantcase/armblade/New()
+	src.imp = new /obj/item/weapon/implant/organ/limbaugment/upperarm/blade( src )
+	..()
+	return
+
+/obj/item/weapon/implantcase/handblade
+	name = "glass case - 'Handblade'"
+	desc = "A case containing a nanite fabricator implant."
+	icon_state = "implantcase-b"
+
+/obj/item/weapon/implantcase/handblade/New()
+	src.imp = new /obj/item/weapon/implant/organ/limbaugment/wrist/blade( src )
+	..()
+	return

code/game/objects/items/weapons/storage/uplink_kits.dm

@@ -128,6 +128,12 @@
 
 /obj/item/weapon/storage/box/syndie_kit/imp_aug/sprinter
 	case_type = /obj/item/weapon/implantcase/sprinter
+	
+/obj/item/weapon/storage/box/syndie_kit/imp_aug/armblade
+	case_type = /obj/item/weapon/implantcase/armblade
+
+/obj/item/weapon/storage/box/syndie_kit/imp_aug/handblade
+	case_type = /obj/item/weapon/implantcase/handblade
 
 /obj/item/weapon/storage/box/syndie_kit/space
 	name = "boxed space suit and helmet"

code/modules/organs/internal/augment/armmounted.dm

@@ -86,6 +86,13 @@
 
 	integrated_object_type = /obj/item/weapon/melee/energy/sword
 
+/obj/item/organ/internal/augment/armmounted/hand/blade
+	name = "handblade implant"
+	desc = "A small implant that fits neatly into the hand. It deploys a small, but dangerous blade."
+	icon_state = "augment_handblade"
+
+	integrated_object_type = /obj/item/weapon/melee/augment/blade
+
 /*
  * Shoulder augment.
  */
@@ -136,6 +143,14 @@
 	if(istype(owner, /mob/living/carbon/human))
 		var/mob/living/carbon/human/H = owner
 		H.add_modifier(/datum/modifier/melee_surge, 0.75 MINUTES)
+		
+/obj/item/organ/internal/augment/armmounted/shoulder/blade
+	name = "armblade implant"
+	desc = "A large implant that fits into a subject's arm. It deploys a large metal blade by some painful means."
+
+	icon_state = "augment_armblade"
+
+	integrated_object_type = /obj/item/weapon/melee/augment/blade/arm
 
 // The toolkit / multi-tool implant.
 

html/changelogs/SubberTheFabulous-PR-7642.yml

@@ -0,0 +1,36 @@
+################################
+# Example Changelog File
+#
+# Note: This file, and files beginning with ".", and files that don't end in ".yml" will not be read. If you change this file, you will look really dumb.
+#
+# Your changelog will be merged with a master changelog. (New stuff added only, and only on the date entry for the day it was merged.)
+# When it is, any changes listed below will disappear.
+#
+# Valid Prefixes: 
+#   bugfix
+#   wip (For works in progress)
+#   tweak
+#   soundadd
+#   sounddel
+#   rscadd (general adding of nice things)
+#   rscdel (general deleting of nice things)
+#   imageadd
+#   imagedel
+#   maptweak
+#   spellcheck (typo fixes)
+#   experiment
+#################################
+
+# Your name.  
+author: Subber
+
+# Optional: Remove this file after generating master changelog.  Useful for PR changelogs that won't get used again.
+delete-after: True
+
+# Any changes you've made.  See valid prefix list above.
+# INDENT WITH TWO SPACES.  NOT TABS.  SPACES.
+# SCREW THIS UP AND IT WON'T WORK.
+# Also, all entries are changed into a single [] after a master changelog generation. Just remove the brackets when you add new entries.
+# Please surround your changes in  double quotes ("), as certain characters otherwise screws up compiling. The quotes will not show up in the changelog.
+changes: 
+  - rscadd: "Added two new antag augments to traitor uplink: armblade and handblade."

vorestation.dme

@@ -1193,7 +1193,11 @@
 #include "code\game\objects\items\toys\toys.dm"
 #include "code\game\objects\items\toys\toys_vr.dm"
 #include "code\game\objects\items\weapons\AI_modules.dm"
+<<<<<<< HEAD:vorestation.dme
 #include "code\game\objects\items\weapons\AI_modules_vr.dm"
+=======
+#include "code\game\objects\items\weapons\augment_items.dm"
+>>>>>>> 3b1fe3f... Adds two new augments to Traitor uplink (#7642):polaris.dme
 #include "code\game\objects\items\weapons\autopsy.dm"
 #include "code\game\objects\items\weapons\bones.dm"
 #include "code\game\objects\items\weapons\candle.dm"