Merge pull request #7420 from Steelpoint/HoSGun

Head of Security's Personal Firearm

code/game/gamemodes/objective_items.dm

@@ -17,6 +17,12 @@ datum/objective_item/steal/caplaser
 	difficulty = 5
 	excludefromjob = list("Captain")
 
+datum/objective_item/steal/hoslaser
+	name = "the head of security's recreated antique laser gun"
+	targetitem = /obj/item/weapon/gun/energy/gun/hos
+	difficulty = 10
+	excludefromjob = list("Head Of Security")
+
 datum/objective_item/steal/handtele
 	name = "a hand teleporter"
 	targetitem = /obj/item/weapon/hand_tele

code/game/objects/structures/crates_lockers/closets/secure/security.dm

@@ -86,8 +86,8 @@
 	new /obj/item/clothing/mask/gas/sechailer/swat(src)
 	new /obj/item/weapon/shield/riot/tele(src)
 	new /obj/item/weapon/melee/baton/loaded(src)
-	new /obj/item/weapon/gun/energy/gun/advtaser(src)
 	new /obj/item/weapon/storage/belt/security/full(src)
+	new /obj/item/weapon/gun/energy/gun/hos(src)
 	return
 
 

code/modules/projectiles/ammunition/energy.dm

@@ -17,6 +17,9 @@
 	e_cost = 83
 	select_name = "kill"
 
+/obj/item/ammo_casing/energy/laser/hos
+	e_cost = 100
+
 /obj/item/ammo_casing/energy/laser/practice
 	projectile_type = /obj/item/projectile/beam/practice
 	select_name = "practice"
@@ -62,6 +65,9 @@
 	fire_sound = 'sound/weapons/gunshot.ogg'
 	e_cost = 100
 
+/obj/item/ammo_casing/energy/electrode/hos
+	e_cost = 200
+
 /obj/item/ammo_casing/energy/ion
 	projectile_type = /obj/item/projectile/ion
 	select_name = "ion"

code/modules/projectiles/guns/energy/nuclear.dm

@@ -12,6 +12,13 @@
 	select_fire(user)
 	update_icon()
 
+/obj/item/weapon/gun/energy/gun/hos
+	desc = "This is a modern recreation of the antique laser gun. This gun has several unique firemodes, but lacks the ability to recharge over time, its also expensive."
+	icon_state = "hoslaser"
+	item_state = null
+	force = 10
+	ammo_type = list(/obj/item/ammo_casing/energy/electrode/hos, /obj/item/ammo_casing/energy/laser/hos, /obj/item/ammo_casing/energy/disabler)
+
 /obj/item/weapon/gun/energy/gun/nuclear
 	name = "advanced energy gun"
 	desc = "An energy gun with an experimental miniaturized nuclear reactor that automatically charges the internal power cell."
@@ -119,4 +126,4 @@
 	trigger_guard = 0
 
 obj/item/weapon/gun/energy/gun/turret/update_icon()
-	icon_state = initial(icon_state)
+	icon_state = initial(icon_state)

html/changelogs/Steelpoint-7420.yml

@@ -0,0 +1,39 @@
+################################
+# 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
+#   rscdel (general adding of nice things)
+#   rscadd (general deleting of nice things)
+#   imageadd
+#   imagedel
+#   spellcheck (typo fixes)
+#   experiment
+#   tgs (TG-ported fixes?)
+#################################
+
+# Your name.  
+author: Steelpoint
+
+# 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, this gets changed to [] after reading.  Just remove the brackets when you add new shit.
+# Please surround your changes in single (') or double quotes ("). It works without them, but if you use certain characters it screws up compiling. The quotes will not show up in the changelog.
+changes: 
+  - rscadd: SS13's Head of Security has received a new attempted 1:1 recreation of a Old Earth weapon, the Captain's Antique Laser Gun.
+  - rscadd: This gun features three firing modes, Tase, Laser and Breach. However this gun lacks the capability to recharge in the field, and is extreamly expensive.
+  - rscadd: The gun's Breach setting fires a low powered Pulse round, it consumes a large amount of power, has a limited range of two tiles and deals the same damage as a laser does. However it is effective in destroying walls, hence the Breach title.
+  - rscadd: INTERCEPTED TRANSMISSION REPORT: The Syndicate have expressed a interest in this new weapon, and have instructed field agents to do whatever they can to steal this weapon.