From e17eccae934cbf2f844458ae063a36697a11fe1f Mon Sep 17 00:00:00 2001 From: Anewbe Date: Thu, 20 Apr 2017 20:04:21 -0500 Subject: [PATCH] Adds ion pistol to uplink, allows holstering --- code/datums/uplink/visible_weapons.dm | 5 +++++ code/modules/projectiles/guns/energy/special.dm | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/code/datums/uplink/visible_weapons.dm b/code/datums/uplink/visible_weapons.dm index 41a1779322..34b20a9f48 100644 --- a/code/datums/uplink/visible_weapons.dm +++ b/code/datums/uplink/visible_weapons.dm @@ -100,6 +100,11 @@ item_cost = 40 path = /obj/item/weapon/gun/energy/ionrifle +/datum/uplink_item/item/visible_weapons/ionpistol + name = "Ion Pistol" + item_cost = 25 + path = /obj/item/weapon/gun/energy/ionrifle/pistol + /datum/uplink_item/item/visible_weapons/xray name = "Xray Gun" item_cost = 85 diff --git a/code/modules/projectiles/guns/energy/special.dm b/code/modules/projectiles/guns/energy/special.dm index faafd2e8c9..7d2d5f0e1c 100644 --- a/code/modules/projectiles/guns/energy/special.dm +++ b/code/modules/projectiles/guns/energy/special.dm @@ -21,7 +21,7 @@ item_state = null w_class = ITEMSIZE_NORMAL force = 5 - slot_flags = SLOT_BELT + slot_flags = SLOT_HOLSTER charge_cost = 480 projectile_type = /obj/item/projectile/ion