From 3a6c4dacd6820569c1ce0bb680f308aa5c989ae0 Mon Sep 17 00:00:00 2001
From: PsiOmega <git@psiomega.se>
Date: Tue, 10 Feb 2015 22:38:40 +0100
Subject: [PATCH] Adds 9mm gun with silencer, 5TC, with the option to acquire
 additional ammo, 2TC.

---
 code/defines/obj/weapon.dm                             | 2 +-
 code/game/gamemodes/game_mode.dm                       | 2 ++
 code/game/objects/items/weapons/storage/uplink_kits.dm | 9 +++++++++
 code/modules/projectiles/ammunition/boxes.dm           | 6 ++++--
 code/modules/projectiles/guns/projectile/pistol.dm     | 2 +-
 5 files changed, 17 insertions(+), 4 deletions(-)

diff --git a/code/defines/obj/weapon.dm b/code/defines/obj/weapon.dm
index 0addd22a3c4..37fb0e732f1 100644
--- a/code/defines/obj/weapon.dm
+++ b/code/defines/obj/weapon.dm
@@ -100,7 +100,7 @@
 
 /obj/item/weapon/cane/concealed/attack_self(mob/user)
     user.visible_message("<span class='warning'>[user] has unsheathed a blade from \his [src]!</span>", "You unsheathe the blade from \the [src].")
-    var/blade = new/obj/item/weapon/butterfly/concealed
+    var/blade = new/obj/item/weapon/kitchenknife/concealed
     user.drop_from_inventory(src)
     user.put_in_hands(blade)
     del(src)
diff --git a/code/game/gamemodes/game_mode.dm b/code/game/gamemodes/game_mode.dm
index db90cc9795f..e12b9bb021a 100644
--- a/code/game/gamemodes/game_mode.dm
+++ b/code/game/gamemodes/game_mode.dm
@@ -33,10 +33,12 @@
 	var/uplink_uses = 10
 	var/list/datum/uplink_item/uplink_items = list(
 		"Highly Visible and Dangerous Weapons" = list(
+			 new/datum/uplink_item(/obj/item/ammo_magazine/mc9mm, 2, "Ammo-9mm", "R9"),
 			 new/datum/uplink_item(/obj/item/ammo_magazine/a357, 2, "Ammo-357", "RA"),
 			 new/datum/uplink_item(/obj/item/weapon/storage/box/emps, 3, "5 EMP Grenades", "EM"),
 			 new/datum/uplink_item(/obj/item/weapon/melee/energy/sword, 4, "Energy Sword", "ES"),
 			 new/datum/uplink_item(/obj/item/weapon/gun/energy/crossbow, 5, "Energy Crossbow", "XB"),
+			 new/datum/uplink_item(/obj/item/weapon/storage/box/syndie_kit/g9mm, 5, "Silenced 9mm", "S9"),
 			 new/datum/uplink_item(/obj/item/mecha_parts/mecha_equipment/weapon/energy/riggedlaser, 6, "Exosuit Rigged Laser", "RL"),
 			 new/datum/uplink_item(/obj/item/weapon/gun/projectile, 6, "Revolver", "RE"),
 			 new/datum/uplink_item(/obj/item/weapon/storage/box/syndicate, 10, "Mercenary Bundle", "BU")
diff --git a/code/game/objects/items/weapons/storage/uplink_kits.dm b/code/game/objects/items/weapons/storage/uplink_kits.dm
index 98dc33e69f3..c4ce3253bfb 100644
--- a/code/game/objects/items/weapons/storage/uplink_kits.dm
+++ b/code/game/objects/items/weapons/storage/uplink_kits.dm
@@ -163,3 +163,12 @@
 	new /obj/item/device/spy_bug(src)
 	new /obj/item/device/spy_bug(src)
 	new /obj/item/device/spy_monitor(src)
+
+/obj/item/weapon/storage/box/syndie_kit/g9mm
+	name = "Smooth operator"
+	desc = "9mm with silencer kit."
+
+/obj/item/weapon/storage/box/syndie_kit/g9mm/New()
+	..()
+	new /obj/item/weapon/gun/projectile/pistol(src)
+	new /obj/item/weapon/silencer(src)
diff --git a/code/modules/projectiles/ammunition/boxes.dm b/code/modules/projectiles/ammunition/boxes.dm
index b4ae141cd74..ed33bbfe48e 100644
--- a/code/modules/projectiles/ammunition/boxes.dm
+++ b/code/modules/projectiles/ammunition/boxes.dm
@@ -66,8 +66,10 @@
 	max_ammo = 10
 	multiple_sprites = 1
 
-/obj/item/ammo_magazine/mc9mm/empty
-	max_ammo = 0
+/obj/item/ammo_magazine/mc9mm/empty/New()
+	..()
+	stored_ammo = list()
+	update_icon()
 
 /obj/item/ammo_magazine/c9mm
 	name = "Ammunition Box (9mm)"
diff --git a/code/modules/projectiles/guns/projectile/pistol.dm b/code/modules/projectiles/guns/projectile/pistol.dm
index f12420f7dce..a0c6b0e5cb7 100644
--- a/code/modules/projectiles/guns/projectile/pistol.dm
+++ b/code/modules/projectiles/guns/projectile/pistol.dm
@@ -85,7 +85,7 @@
 	origin_tech = "combat=2;materials=2;syndicate=2"
 	ammo_type = "/obj/item/ammo_casing/c9mm"
 	load_method = MAGAZINE
-	mag_type = /obj/item/ammo_magazine/mc9mm/empty
+	mag_type = /obj/item/ammo_magazine/mc9mm
 
 /obj/item/weapon/gun/projectile/pistol/afterattack(atom/target as mob|obj|turf|area, mob/living/user as mob|obj, flag)
 	..()