Merge pull request #3344 from Anewbe/ion_holster

Adds ion pistol to uplink, allows holstering

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

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_BELT|SLOT_HOLSTER
 	charge_cost = 480
 	projectile_type = /obj/item/projectile/ion
 

html/changelogs/Anewbe - Ion Pistol.yml

@@ -0,0 +1,37 @@
+################################
+# 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: Anewbe
+
+# 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: "Adds the ion pistol to the uplink."
+  - tweak: "The ion pistol can now be holstered.