Additional content and a bug fix. (#803)

modular_skyrat/master_files/readme.md

@@ -9,3 +9,5 @@ MASTER ICON FILES
 
 MASTER SOUND FILES
 - N/A
+
+MASTER CODE FILES

modular_skyrat/modules/blueshield/code/game/objects/structures/crates_lockers/closets/secure/security.dm

@@ -22,3 +22,4 @@
 	new /obj/item/clothing/suit/armor/vest/blueshield(src)
 	new /obj/item/clothing/shoes/laceup(src)
 	new /obj/item/clothing/under/rank/security/blueshield(src)
+	new /obj/item/choice_beacon/blueshield(src)

modular_skyrat/modules/blueshield/code/modules/jobs/job_types/blueshield.dm

@@ -48,3 +48,15 @@
 
 	head = /obj/item/clothing/head/helmet/space/plasmaman/blueshield
 	uniform = /obj/item/clothing/under/plasmaman/blueshield
+
+/obj/item/choice_beacon/blueshield
+	name = "blueshield's shotgun beacon"
+	desc = "A beacon, allowing the blueshield to select between two available models of personal shotguns."
+
+/obj/item/choice_beacon/blueshield/generate_display_names()
+	var/static/list/bshield
+	if(!bshield)
+		bshield = list()
+		bshield["Energy Revolver"] = /obj/item/gun/energy/e_gun/revolver
+		bshield["PDW-9"] = /obj/item/gun/energy/e_gun/revolver/pdw9
+	return bshield

modular_skyrat/modules/blueshield/code/modules/projectiles/guns/energy/special.dm

@@ -0,0 +1,44 @@
+/obj/item/gun/energy/e_gun/revolver //The virgin gun.
+	name = "energy revolver"
+	desc = "An advanced energy revolver with the capacity to shoot both electrodes and lasers."
+	force = 7
+	ammo_type = list(/obj/item/ammo_casing/energy/electrode, /obj/item/ammo_casing/energy/laser)
+	ammo_x_offset = 1
+	charge_sections = 4
+	fire_delay = 4
+	icon = 'modular_skyrat/modules/blueshield/icons/obj/guns/energy.dmi'
+	icon_state = "bsgun"
+	inhand_icon_state = "minidisable"
+	lefthand_file = 'modular_skyrat/modules/blueshield/icons/mob/inhands/weapons/guns_lefthand.dmi'
+	righthand_file = 'modular_skyrat/modules/blueshield/icons/mob/inhands/weapons/guns_righthand.dmi'
+	obj_flags = UNIQUE_RENAME
+	cell_type = /obj/item/stock_parts/cell/blueshield
+	pin = /obj/item/firing_pin/implant/mindshield
+
+/obj/item/stock_parts/cell/blueshield
+	name = "internal revolver power cell"
+	maxcharge = 1500
+	chargerate = 300
+
+/obj/item/gun/energy/e_gun/revolver/pdw9 //The chad gun.
+	name = "PDW-9 taser pistol"
+	desc = "A military grade energy sidearm, used by many militia forces throughout the local sector. It comes with an internally recharging battery which is slow to recharge."
+	ammo_x_offset = 2
+	icon_state = "pdw9pistol"
+	inhand_icon_state = null
+	cell_type = /obj/item/stock_parts/cell/pdw9
+
+/obj/item/stock_parts/cell/pdw9
+	name = "internal pistol power cell"
+	maxcharge = 1000
+	chargerate = 300
+	self_recharge = TRUE
+	var/obj/item/gun/energy/e_gun/revolver/pdw9/parent
+
+/obj/item/stock_parts/cell/pdw9/Initialize()
+	. = ..()
+	parent = loc
+
+/obj/item/stock_parts/cell/pdw9/process()
+	. = ..()
+	parent.update_icon()

tgstation.dme

@@ -3268,6 +3268,7 @@
 #include "modular_skyrat\modules\blueshield\code\modules\clothing\under\jobs\security.dm"
 #include "modular_skyrat\modules\blueshield\code\modules\clothing\under\jobs\Plasmaman\security.dm"
 #include "modular_skyrat\modules\blueshield\code\modules\jobs\job_types\blueshield.dm"
+#include "modular_skyrat\modules\blueshield\code\modules\projectiles\guns\energy\special.dm"
 #include "modular_skyrat\modules\horrorform\code\modules\antagonists\changeling\powers\horror_form.dm"
 #include "modular_skyrat\modules\horrorform\code\modules\mob\hostile\true_changeling.dm"
 #include "modular_skyrat\modules\icspawning\code\_onclick\observer.dm"