Security / PseudoCargo Expansion

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

@@ -22,6 +22,12 @@
 	charge_cost = 400
 	recharge_time = 7 //Time it takes for shots to recharge (in ticks)
 
+/obj/item/weapon/gun/energy/taser/mounted/cyborg/swarm
+	name = "disabler"
+	desc = "An archaic device which attacks the target's nervous-system or control circuits."
+	projectile_type = /obj/item/projectile/beam/stun/disabler
+	charge_cost = 200
+	recharge_time = 0.5 SECONDS
 
 /obj/item/weapon/gun/energy/stunrevolver
 	name = "stun revolver"
@@ -32,7 +38,6 @@
 	projectile_type = /obj/item/projectile/energy/electrode/strong
 	charge_cost = 300
 
-
 /obj/item/weapon/gun/energy/crossbow
 	name = "mini energy-crossbow"
 	desc = "A weapon favored by many mercenary stealth specialists."

code/modules/projectiles/guns/magnetic/magnetic_railgun.dm

@@ -108,3 +108,89 @@
 		list(mode_name="semiauto", burst=1, fire_delay=0, move_delay=null, one_handed_penalty=15, burst_accuracy=null, dispersion=null),
 		list(mode_name="short bursts", burst=3, fire_delay=null, move_delay=5, one_handed_penalty=30, burst_accuracy=list(0,-15,-15), dispersion=list(0.0, 0.6, 1.0)),
 		)
+
+/obj/item/weapon/gun/magnetic/railgun/heater
+	name = "coil rifle"
+	desc = "A large rifle designed and produced after the Grey Hour."
+	description_info = "The MI-51B is a Martian weapon designed in the days after the Grey Hour, in preparation for the need for updated equipment by Solar forces.<br>\
+		The design is based upon a larger rail-type weapon design."
+	icon_state = "railgun_sec"
+	item_state = "cshotgun"
+
+	removable_components = TRUE
+
+	initial_cell_type = /obj/item/weapon/cell/high
+	initial_capacitor_type = /obj/item/weapon/stock_parts/capacitor
+
+	fire_delay = 8
+
+	slot_flags = SLOT_BACK
+
+	slowdown = 0
+	slowdown_held = 0
+	slowdown_worn = 0
+
+	power_cost = 400
+	projectile_type = /obj/item/projectile/bullet/magnetic/heated
+	loaded = null
+	empty_sound = 'sound/weapons/smg_empty_alarm.ogg'
+
+	firemodes = list(
+		list(mode_name="high power", power_cost = 400, projectile_type = /obj/item/projectile/bullet/magnetic/heated, burst=1, fire_delay=8, move_delay=null, one_handed_penalty=15),
+		list(mode_name="low power", power_cost = 150, projectile_type = /obj/item/projectile/bullet/magnetic/heated/weak, burst=1, fire_delay=5, move_delay=null, one_handed_penalty=15),
+		)
+
+/obj/item/weapon/gun/magnetic/railgun/heater/pistol
+	name = "coil pistol"
+	desc = "A large pistol designed and produced after the Grey Hour."
+	description_info = "The MI-60D `Peacemaker` is a Martian weapon designed in the days after the Grey Hour, in preparation for the need for updated equipment by Solar forces.<br>\
+		The design is based upon a larger rail-type hybrid weapon design, though much smaller in scale."
+	icon_state = "peacemaker"
+	item_state = "revolver"
+
+	w_class = ITEMSIZE_NORMAL
+
+	initial_cell_type = /obj/item/weapon/cell/high
+	initial_capacitor_type = /obj/item/weapon/stock_parts/capacitor
+
+	slot_flags = SLOT_BELT|SLOT_HOLSTER
+
+	firemodes = list(
+		list(mode_name="lethal", power_cost = 2000, projectile_type = /obj/item/projectile/bullet/magnetic/heated, burst=1, fire_delay=8, move_delay=null, one_handed_penalty=0),
+		list(mode_name="stun", power_cost = 1500, projectile_type = /obj/item/projectile/energy/electrode/stunshot, burst=1, fire_delay=5, move_delay=null, one_handed_penalty=0),
+		)
+
+/obj/item/weapon/gun/magnetic/railgun/heater/pistol/hos
+	name = "prototype peacemaker"
+
+	dna_lock = TRUE
+
+	description_antag = "This weapon starts with a DNA locking chip attached. Using an EMAG on the weapon will disarm it, and allow you to use the chip as your own."
+
+	firemodes = list(
+		list(mode_name="lethal", power_cost = 1500, projectile_type = /obj/item/projectile/bullet/magnetic/heated, burst=1, fire_delay=8, move_delay=null, one_handed_penalty=0),
+		list(mode_name="stun", power_cost = 1200, projectile_type = /obj/item/projectile/energy/electrode/stunshot, burst=1, fire_delay=5, move_delay=null, one_handed_penalty=0),
+		)
+
+/obj/item/weapon/gun/magnetic/railgun/flechette/sif
+	name = "shredder rifle"
+	desc = "The MI-12B Kaldr is a burst fire capable coilgun that fires modified slugs intended for damaging soft targets."
+	description_fluff = "The Kaldr is a weapon recently deployed to various outposts on Sif, as well as local hunting guilds for the rapid dispatching of invasive wildlife."
+	icon_state = "railgun_sifguard"
+	item_state = "z8carbine"
+
+	initial_cell_type = /obj/item/weapon/cell/high
+	initial_capacitor_type = /obj/item/weapon/stock_parts/capacitor/adv
+
+	slot_flags = SLOT_BACK
+
+	slowdown = 0.3
+
+	power_cost = 200
+	projectile_type = /obj/item/projectile/bullet/magnetic/flechette/hunting
+	empty_sound = 'sound/weapons/smg_empty_alarm.ogg'
+
+	firemodes = list(
+		list(mode_name="semiauto", burst=1, fire_delay=0, move_delay=null, one_handed_penalty=15, burst_accuracy=null, dispersion=null),
+		list(mode_name="short bursts", burst=3, fire_delay=null, move_delay=5, one_handed_penalty=30, burst_accuracy=list(0,-15,-15), dispersion=list(0.0, 0.6, 1.0)),
+		)

code/modules/projectiles/projectile/beams.dm

@@ -86,6 +86,19 @@
 	tracer_type = /obj/effect/projectile/tracer/xray
 	impact_type = /obj/effect/projectile/impact/xray
 
+/obj/item/projectile/beam/gamma
+	name = "gamma beam"
+	icon_state = "xray"
+	fire_sound = 'sound/weapons/eluger.ogg'
+	damage = 10
+	armor_penetration = 90
+	irradiate = 20
+	light_color = "#00CC33"
+
+	muzzle_type = /obj/effect/projectile/muzzle/xray
+	tracer_type = /obj/effect/projectile/tracer/xray
+	impact_type = /obj/effect/projectile/impact/xray
+
 /obj/item/projectile/beam/cyan
 	name = "cyan beam"
 	icon_state = "cyan"
@@ -215,6 +228,23 @@
 	icon_state = "stun"
 	agony = 30
 
+/obj/item/projectile/beam/stun/disabler
+	muzzle_type = /obj/effect/projectile/muzzle/laser_omni
+	tracer_type = /obj/effect/projectile/tracer/laser_omni
+	impact_type = /obj/effect/projectile/impact/laser_omni
+
+/obj/item/projectile/beam/stun/disabler/on_hit(atom/target, blocked = 0, def_zone)
+	. = ..(target, blocked, def_zone)
+
+	if(. && istype(target, /mob/living/silicon/robot) && prob(agony))
+		var/mob/living/silicon/robot/R = target
+		var/drainamt = agony * (rand(5, 15) / 10)
+		R.drain_power(0, 0, drainamt)
+		if(istype(firer, /mob/living/silicon/robot)) // Mischevious sappers, the swarm drones are.
+			var/mob/living/silicon/robot/A = firer
+			if(A.cell)
+				A.cell.give(drainamt * 2)
+
 /obj/item/projectile/beam/shock
 	name = "shock beam"
 	icon_state = "lightning"

code/modules/projectiles/projectile/magnetic.dm

@@ -22,6 +22,28 @@
 	damage = 20
 	armor_penetration = 100
 
+/obj/item/projectile/bullet/magnetic/flechette/hunting
+	name = "shredder slug"
+	armor_penetration = 30
+	SA_bonus_damage = 40
+	SA_vulnerability = SA_ANIMAL
+
+/obj/item/projectile/bullet/magnetic/heated
+	name = "slug"
+	icon_state = "gauss"
+	weaken = 0
+	stun = 0
+	damage = 30
+	damage_type = SEARING
+	embed_chance = 0
+
+/obj/item/projectile/bullet/magnetic/heated/weak
+	icon_state = "gauss_silenced"
+	damage = 15
+	agony = 5
+	embed_chance = 0
+	armor_penetration = 50
+
 /obj/item/projectile/bullet/magnetic/fuelrod
 	name = "fuel rod"
 	icon_state = "fuel-deuterium"