Merge remote-tracking branch 'origin/master' into magrifles_again

code/modules/projectiles/ammunition/caseless/rocket.dm

@@ -9,7 +9,7 @@
 	name = "\improper PM-9HEDP"
 	desc = "An 84mm High Explosive Dual Purpose rocket. Pointy end toward mechs."
 	caliber = "84mm"
-	icon_state = "s-casing-live"
+	icon_state = "84mm-hedp"
 	projectile_type = /obj/item/projectile/bullet/a84mm
 
 /obj/item/ammo_casing/caseless/a75

code/modules/projectiles/ammunition/energy/laser.dm

@@ -59,6 +59,9 @@
 /obj/item/ammo_casing/energy/laser/redtag/hitscan
 	projectile_type = /obj/item/projectile/beam/lasertag/redtag/hitscan
 
+/obj/item/ammo_casing/energy/laser/redtag/hitscan/holy
+	projectile_type = /obj/item/projectile/beam/lasertag/redtag/hitscan/holy
+
 /obj/item/ammo_casing/energy/xray
 	projectile_type = /obj/item/projectile/beam/xray
 	e_cost = 50
@@ -68,3 +71,9 @@
 	projectile_type = /obj/item/projectile/beam/mindflayer
 	select_name = "MINDFUCK"
 	fire_sound = 'sound/weapons/laser.ogg'
+
+/obj/item/ammo_casing/energy/laser/weak
+	projectile_type = /obj/item/projectile/beam/weak/minigun
+	e_cost = 10
+	fire_sound = 'sound/weapons/gatling.ogg'
+	click_cooldown_override = 1

code/modules/projectiles/ammunition/energy/special.dm

@@ -62,3 +62,8 @@
 	e_cost = 200
 	select_name = "stun"
 	projectile_type = /obj/item/projectile/energy/tesla/revolver
+
+/obj/item/ammo_casing/energy/emitter
+	fire_sound = 'sound/weapons/emitter.ogg'
+	e_cost = 2000 //20,000 is in the cell making this 10 shots before reload
+	projectile_type = /obj/item/projectile/beam/emitter

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

@@ -25,3 +25,6 @@
 	fire_sound = 'sound/weapons/taser2.ogg'
 	harmful = FALSE
 	click_cooldown_override = 3.5
+
+/obj/item/ammo_casing/energy/disabler/secborg
+	e_cost = 50

code/modules/projectiles/boxes_magazines/internal/grenade.dm

@@ -11,7 +11,7 @@
 	max_ammo = 1
 
 /obj/item/ammo_box/magazine/internal/rocketlauncher
-	name = "grenade launcher internal magazine"
+	name = "rocket launcher internal magazine"
 	ammo_type = /obj/item/ammo_casing/caseless/rocket
 	caliber = "84mm"
 	max_ammo = 1

code/modules/projectiles/gun.dm

@@ -32,10 +32,11 @@
 	var/fire_delay = 0					//rate of fire for burst firing and semi auto
 	var/firing_burst = 0				//Prevent the weapon from firing again while already firing
 	var/semicd = 0						//cooldown handler
-	var/weapon_weight = WEAPON_LIGHT
+	var/weapon_weight = WEAPON_LIGHT	//currently only used for inaccuracy
 	var/spread = 0						//Spread induced by the gun itself.
 	var/burst_spread = 0				//Spread induced by the gun itself during burst fire per iteration. Only checked if spread is 0.
 	var/randomspread = 1				//Set to 0 for shotguns. This is used for weapons that don't fire all their bullets at once.
+	var/inaccuracy_modifier = 1
 
 	lefthand_file = 'icons/mob/inhands/weapons/guns_lefthand.dmi'
 	righthand_file = 'icons/mob/inhands/weapons/guns_righthand.dmi'
@@ -543,3 +544,13 @@
 	if(A == chambered)
 		chambered = null
 		update_icon()
+
+/obj/item/gun/proc/getinaccuracy(mob/living/user)
+	if(!iscarbon(user))
+		return FALSE
+	else
+		var/mob/living/carbon/holdingdude = user
+		if(istype(holdingdude) && holdingdude.combatmode)
+			return (max((holdingdude.lastdirchange + weapon_weight * 25) - world.time,0) * inaccuracy_modifier)
+		else
+			return ((weapon_weight * 25) * inaccuracy_modifier)

code/modules/projectiles/guns/ballistic/launchers.dm

@@ -86,6 +86,7 @@
 	pin = /obj/item/firing_pin/implant/pindicate
 	burst_size = 1
 	fire_delay = 0
+	inaccuracy_modifier = 0.7
 	casing_ejector = FALSE
 	weapon_weight = WEAPON_HEAVY
 	magazine_wording = "rocket"
@@ -108,34 +109,33 @@
 /obj/item/gun/ballistic/rocketlauncher/can_shoot()
 	return chambered?.BB
 
-/obj/item/gun/ballistic/rocketlauncher/process_chamber()
-	if(chambered)
-		chambered = null
-	if(magazine)
-		QDEL_NULL(magazine)
-	update_icon()
-
 /obj/item/gun/ballistic/rocketlauncher/attack_self_tk(mob/user)
 	return //too difficult to remove the rocket with TK
 
 /obj/item/gun/ballistic/rocketlauncher/attack_self(mob/living/user)
 	if(magazine)
-		if(chambered)
-			chambered.forceMove(magazine)
-			magazine.stored_ammo.Insert(1, chambered)
+		var/obj/item/ammo_casing/AC = chambered
+		if(AC)
+			if(!user.put_in_hands(AC))
+				AC.bounce_away(FALSE, NONE)
+			to_chat(user, "<span class='notice'>You remove \the [AC] from \the [src]!</span>")
+			playsound(src, 'sound/weapons/gun_magazine_remove_full.ogg', 70, TRUE)
 			chambered = null
 		else
-			stack_trace("Removed [magazine] from [src] without a chambered round")
-		magazine.forceMove(drop_location())
-		if(user.is_holding(src))
-			user.put_in_hands(magazine)
-		playsound(src, 'sound/weapons/gun_magazine_remove_full.ogg', 70, TRUE)
-		to_chat(user, "<span class='notice'>You work the [magazine] out from [src].</span>")
-		magazine = null
-	else
-		to_chat(user, "<span class='notice'>There's no rocket in [src].</span>")
+			to_chat(user, "<span class='notice'>There's no [magazine_wording] in [src].</span>")
 	update_icon()
 
+/obj/item/gun/ballistic/rocketlauncher/attackby(obj/item/A, mob/user, params)
+	if(magazine && istype(A, /obj/item/ammo_casing))
+		if(chambered)
+			to_chat(user, "<span class='notice'>[src] already has a [magazine_wording] chambered.</span>")
+			return
+		if(magazine.attackby(A, user, silent = TRUE))
+			to_chat(user, "<span class='notice'>You load a new [A] into \the [src].</span>")
+			playsound(src, "gun_insert_full_magazine", 70, 1)
+			chamber_round()
+			update_icon()
+
 /obj/item/gun/ballistic/rocketlauncher/update_icon()
 	icon_state = "[initial(icon_state)]-[chambered ? "1" : "0"]"
 

code/modules/projectiles/guns/ballistic/revolver.dm

@@ -277,12 +277,12 @@
 	..()
 	if(istype(A, /obj/item/ammo_box) || istype(A, /obj/item/ammo_casing))
 		chamber_round()
+	if(A.tool_behaviour == TOOL_SAW || istype(A, /obj/item/gun/energy/plasmacutter))
+		sawoff(user)
 	if(istype(A, /obj/item/melee/transforming/energy))
 		var/obj/item/melee/transforming/energy/W = A
 		if(W.active)
 			sawoff(user)
-	if(istype(A, /obj/item/circular_saw) || istype(A, /obj/item/gun/energy/plasmacutter))
-		sawoff(user)
 
 /obj/item/gun/ballistic/revolver/doublebarrel/attack_self(mob/living/user)
 	var/num_unloaded = 0

code/modules/projectiles/guns/ballistic/shotgun.dm

@@ -40,7 +40,7 @@
 	if(istype(user) && user.getStaminaLoss() >= STAMINA_SOFTCRIT)//CIT CHANGE - makes pumping shotguns impossible in stamina softcrit
 		to_chat(user, "<span class='warning'>You're too exhausted for that.</span>")//CIT CHANGE - ditto
 		return//CIT CHANGE - ditto
-	pump(user)
+	pump(user, TRUE)
 	recentpump = world.time + 10
 	if(istype(user))//CIT CHANGE - makes pumping shotguns cost a lil bit of stamina.
 		user.adjustStaminaLossBuffered(2) //CIT CHANGE - DITTO. make this scale inversely to the strength stat when stats/skills are added
@@ -52,7 +52,9 @@
 		process_fire(user, user, FALSE)
 		. = 1
 
-/obj/item/gun/ballistic/shotgun/proc/pump(mob/M)
+/obj/item/gun/ballistic/shotgun/proc/pump(mob/M, visible = TRUE)
+	if(visible)
+		M.visible_message("<span class='warning'>[M] racks [src].</span>", "<span class='warning'>You rack [src].</span>")
 	playsound(M, 'sound/weapons/shotgunpump.ogg', 60, 1)
 	pump_unload(M)
 	pump_reload(M)
@@ -93,7 +95,7 @@
 
 /obj/item/gun/ballistic/shotgun/riot/attackby(obj/item/A, mob/user, params)
 	..()
-	if(istype(A, /obj/item/circular_saw) || istype(A, /obj/item/gun/energy/plasmacutter))
+	if(A.tool_behaviour == TOOL_SAW || istype(A, /obj/item/gun/energy/plasmacutter))
 		sawoff(user)
 	if(istype(A, /obj/item/melee/transforming/energy))
 		var/obj/item/melee/transforming/energy/W = A
@@ -205,6 +207,7 @@
 	name = "combat shotgun"
 	desc = "A semi automatic shotgun with tactical furniture and a six-shell capacity underneath."
 	icon_state = "cshotgun"
+	fire_delay = 3
 	mag_type = /obj/item/ammo_box/magazine/internal/shot/com
 	w_class = WEIGHT_CLASS_HUGE
 	unique_reskin = list("Tatical" = "cshotgun",
@@ -212,14 +215,41 @@
 						)
 
 /obj/item/gun/ballistic/shotgun/automatic/combat/compact
-	name = "compact combat shotgun"
-	desc = "A compact version of the semi automatic combat shotgun. For close encounters."
+	name = "warden's combat shotgun"
+	desc = "A modified version of the semi automatic combat shotgun with a collapsible stock. For close encounters."
 	icon_state = "cshotgunc"
-	mag_type = /obj/item/ammo_box/magazine/internal/shot/com/compact
+	mag_type = /obj/item/ammo_box/magazine/internal/shot/com
 	w_class = WEIGHT_CLASS_NORMAL
-	unique_reskin = list("Tatical" = "cshotgunc",
-						"Slick" = "cshotgunc_slick"
-						)
+	var/stock = FALSE
+	recoil = 5
+	spread = 2
+
+/obj/item/gun/ballistic/shotgun/automatic/combat/compact/AltClick(mob/living/user)
+	if(!istype(user) || !user.canUseTopic(src, BE_CLOSE, ismonkey(user)))
+		return
+	toggle_stock(user)
+	. = ..()
+
+/obj/item/gun/ballistic/shotgun/automatic/combat/compact/examine(mob/user)
+	..()
+	to_chat(user, "<span class='notice'>Alt-click to toggle the stock.</span>")
+
+/obj/item/gun/ballistic/shotgun/automatic/combat/compact/proc/toggle_stock(mob/living/user)
+	stock = !stock
+	if(stock)
+		w_class = WEIGHT_CLASS_HUGE
+		to_chat(user, "You unfold the stock.")
+		recoil = 1
+		spread = 0
+	else
+		w_class = WEIGHT_CLASS_NORMAL
+		to_chat(user, "You fold the stock.")
+		recoil = 5
+		spread = 2
+	update_icon()
+
+/obj/item/gun/ballistic/shotgun/automatic/combat/compact/update_icon()
+	icon_state = "[current_skin ? unique_reskin[current_skin] : "cshotgun"][stock ? "" : "c"]"
 
 //Dual Feed Shotgun
 
@@ -235,6 +265,7 @@
 /obj/item/gun/ballistic/shotgun/automatic/dual_tube/examine(mob/user)
 	..()
 	to_chat(user, "<span class='notice'>Alt-click to pump it.</span>")
+	. = ..()
 
 /obj/item/gun/ballistic/shotgun/automatic/dual_tube/Initialize()
 	. = ..()

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

@@ -118,11 +118,11 @@
 		switch(fail_tick)
 			if(0 to 200)
 				fail_tick += (2*(fail_chance))
-				M.rad_act(40)
+				M.rad_act(400)
 				to_chat(M, "<span class='userdanger'>Your [name] feels warmer.</span>")
 			if(201 to INFINITY)
 				SSobj.processing.Remove(src)
-				M.rad_act(80)
+				M.rad_act(800)
 				crit_fail = 1
 				to_chat(M, "<span class='userdanger'>Your [name]'s reactor overloads!</span>")
 

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

@@ -159,3 +159,65 @@
 
 /obj/item/gun/energy/laser/redtag/hitscan
 	ammo_type = list(/obj/item/ammo_casing/energy/laser/redtag/hitscan)
+
+/obj/item/gun/energy/laser/redtag/hitscan/chaplain
+	name = "\improper holy lasrifle"
+	desc = "A lasrifle from the old Imperium. This one seems to be blessed by techpriests."
+	icon_state = "LaserAK"
+	item_state = null
+	force = 14
+	pin = /obj/item/firing_pin/holy
+	icon = 'modular_citadel/icons/obj/guns/VGguns.dmi'
+	ammo_x_offset = 4
+	ammo_type = list(/obj/item/ammo_casing/energy/laser/redtag/hitscan/holy)
+	lefthand_file = 'modular_citadel/icons/mob/citadel/guns_lefthand.dmi'
+	righthand_file = 'modular_citadel/icons/mob/citadel/guns_righthand.dmi'
+	var/chaplain_spawnable = TRUE
+	total_mass = TOTAL_MASS_MEDIEVAL_WEAPON
+	throw_speed = 3
+	throw_range = 4
+	throwforce = 10
+	obj_flags = UNIQUE_RENAME
+
+/obj/item/gun/energy/laser/redtag/hitscan/chaplain/Initialize()
+	. = ..()
+	AddComponent(/datum/component/anti_magic, TRUE, TRUE)
+
+/obj/item/gun/energy/laser/redtag/hitscan/chaplain/handle_suicide(mob/living/carbon/human/user, mob/living/carbon/human/target, params, bypass_timer)
+	if(!ishuman(user) || !ishuman(target))
+		return
+
+	if(semicd)
+		return
+
+	if(user == target)
+		target.visible_message("<span class='warning'>[user] sticks [src] in [user.p_their()] mouth, ready to pull the trigger...</span>", \
+			"<span class='userdanger'>You stick [src] in your mouth, ready to pull the trigger...</span>")
+	else
+		target.visible_message("<span class='warning'>[user] points [src] at [target]'s head, ready to pull the trigger...</span>", \
+			"<span class='userdanger'>[user] points [src] at your head, ready to pull the trigger...</span>")
+
+	semicd = TRUE
+
+	if(!bypass_timer && (!do_mob(user, target, 120) || user.zone_selected != BODY_ZONE_PRECISE_MOUTH))
+		if(user)
+			if(user == target)
+				user.visible_message("<span class='notice'>[user] decided not to shoot.</span>")
+			else if(target && target.Adjacent(user))
+				target.visible_message("<span class='notice'>[user] has decided to spare [target]</span>", "<span class='notice'>[user] has decided to spare your life!</span>")
+		semicd = FALSE
+		return
+
+	semicd = FALSE
+
+	target.visible_message("<span class='warning'>[user] pulls the trigger!</span>", "<span class='userdanger'>[user] pulls the trigger!</span>")
+
+	playsound('sound/weapons/dink.ogg', 30, 1)
+
+	if((iscultist(target)) || (is_servant_of_ratvar(target)))
+		chambered.BB.damage *= 1500
+
+	else if(chambered && chambered.BB)
+		chambered.BB.damage *= 5
+
+	process_fire(target, user, TRUE, params)

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

@@ -0,0 +1,149 @@
+//The ammo/gun is stored in a back slot item
+/obj/item/minigunpack2
+	name = " Laser Gatling Pack"
+	desc = "A massive battery pack with an attached laser gatling gun!"
+	icon = 'icons/obj/guns/minigun.dmi'
+	icon_state = "holstered"
+	item_state = "backpack"
+	lefthand_file = 'icons/mob/inhands/equipment/backpack_lefthand.dmi'
+	righthand_file = 'icons/mob/inhands/equipment/backpack_righthand.dmi'
+	slot_flags = ITEM_SLOT_BACK
+	w_class = WEIGHT_CLASS_HUGE
+	var/obj/item/gun/energy/minigun/gun
+	var/armed = 0 //whether the gun is attached, 0 is attached, 1 is the gun is wielded.
+	var/overheat = 0
+	var/overheat_max = 60
+	var/heat_diffusion = 5
+
+/obj/item/minigunpack2/Initialize()
+	. = ..()
+	gun = new(src)
+	START_PROCESSING(SSobj, src)
+
+/obj/item/minigunpack2/Destroy()
+	STOP_PROCESSING(SSobj, src)
+	return ..()
+
+/obj/item/minigunpack2/process()
+	overheat = max(0, overheat - heat_diffusion)
+
+//ATTACK HAND IGNORING PARENT RETURN VALUE
+/obj/item/minigunpack2/attack_hand(var/mob/living/carbon/user)
+	if(src.loc == user)
+		if(!armed)
+			if(user.get_item_by_slot(SLOT_BACK) == src)
+				armed = 1
+				if(!user.put_in_hands(gun))
+					armed = 0
+					to_chat(user, "<span class='warning'>You need a free hand to hold the gun!</span>")
+					return
+				update_icon()
+				user.update_inv_back()
+		else
+			to_chat(user, "<span class='warning'>You are already holding the gun!</span>")
+	else
+		..()
+
+/obj/item/minigunpack2/attackby(obj/item/W, mob/user, params)
+	if(W == gun) //Don't need armed check, because if you have the gun assume its armed.
+		user.dropItemToGround(gun, TRUE)
+	else
+		..()
+
+/obj/item/minigunpack2/dropped(mob/user)
+	if(armed)
+		user.dropItemToGround(gun, TRUE)
+
+/obj/item/minigunpack2/MouseDrop(atom/over_object)
+	. = ..()
+	if(armed)
+		return
+	if(iscarbon(usr))
+		var/mob/M = usr
+
+		if(!over_object)
+			return
+
+		if(!M.incapacitated())
+
+			if(istype(over_object, /obj/screen/inventory/hand))
+				var/obj/screen/inventory/hand/H = over_object
+				M.putItemFromInventoryInHandIfPossible(src, H.held_index)
+
+
+/obj/item/minigunpack2/update_icon()
+	if(armed)
+		icon_state = "notholstered"
+	else
+		icon_state = "holstered"
+
+/obj/item/minigunpack2/proc/attach_gun(var/mob/user)
+	if(!gun)
+		gun = new(src)
+	gun.forceMove(src)
+	armed = 0
+	if(user)
+		to_chat(user, "<span class='notice'>You attach the [gun.name] to the [name].</span>")
+	else
+		src.visible_message("<span class='warning'>The [gun.name] snaps back onto the [name]!</span>")
+	update_icon()
+	user.update_inv_back()
+
+
+/obj/item/gun/energy/minigun
+	name = "laser gatling gun"
+	desc = "An advanced laser cannon with an incredible rate of fire. Requires a bulky backpack power source to use."
+	icon = 'icons/obj/guns/minigun.dmi'
+	icon_state = "minigun_spin"
+	item_state = "minigun"
+	flags_1 = CONDUCT_1
+	force = 15
+	recoil = 2
+	slowdown = 1
+	slot_flags = null
+	w_class = WEIGHT_CLASS_HUGE
+	materials = list()
+	ammo_type = list(/obj/item/ammo_casing/energy/laser/weak)
+	burst_size = 2
+	automatic = 1
+	can_charge = 0
+	selfcharge = EGUN_SELFCHARGE
+	charge_tick = 2
+	charge_delay = 5
+	weapon_weight = WEAPON_HEAVY
+	item_flags = NEEDS_PERMIT | SLOWS_WHILE_IN_HAND
+	var/obj/item/minigunpack2/ammo_pack
+
+/obj/item/gun/energy/minigun/Initialize()
+	if(istype(loc, /obj/item/minigunpack2)) //We should spawn inside an ammo pack so let's use that one.
+		ammo_pack = loc
+	else
+		return INITIALIZE_HINT_QDEL //No pack, no gun
+
+	return ..()
+
+/obj/item/gun/energy/minigun/attack_self(mob/living/user)
+	return
+
+/obj/item/gun/energy/minigun/dropped(mob/user)
+	if(ammo_pack)
+		ammo_pack.attach_gun(user)
+	else
+		qdel(src)
+
+/obj/item/gun/energy/minigun/process_fire(atom/target, mob/living/user, message = TRUE, params = null, zone_override = "", bonus_spread = 0)
+	if(ammo_pack)
+		if(ammo_pack.overheat < ammo_pack.overheat_max)
+			ammo_pack.overheat += burst_size
+			..()
+		else
+			to_chat(user, "The gun's heat sensor locked the trigger to prevent lens damage.")
+
+/obj/item/gun/energy/minigun/afterattack(atom/target, mob/living/user, flag, params)
+	if(!ammo_pack || ammo_pack.loc != user)
+		to_chat(user, "You need the backpack power source to fire the gun!")
+	. = ..()
+
+/obj/item/gun/energy/minigun/dropped(mob/living/user)
+	ammo_pack.attach_gun(user)
+

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

@@ -304,3 +304,22 @@
 
 /obj/item/gun/energy/gravity_gun/security
 	pin = /obj/item/firing_pin
+
+//Emitter Gun
+
+/obj/item/gun/energy/emitter
+	name = "Emitter Carbine"
+	desc = "A small emitter fitted into a handgun case, do to size constraints and safety it can only shoot about ten times when fully charged."
+	icon_state = "emitter_carbine"
+	force = 12
+	w_class = WEIGHT_CLASS_SMALL
+	cell_type = /obj/item/stock_parts/cell/super
+	ammo_type = list(/obj/item/ammo_casing/energy/emitter)
+
+/obj/item/gun/energy/emitter/update_icon()
+	..()
+	var/obj/item/ammo_casing/energy/shot = ammo_type[select]
+	if(!QDELETED(cell) && (cell.charge > shot.e_cost))
+		add_overlay("emitter_carbine_empty")
+	else
+		add_overlay("emitter_carbine")

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

@@ -49,6 +49,7 @@
 	name = "cyborg disabler"
 	desc = "An integrated disabler that draws from a cyborg's power cell. This one contains a limiter to prevent the cyborg's power cell from overheating."
 	can_charge = FALSE
+	ammo_type = list(/obj/item/ammo_casing/energy/disabler/secborg)
 	selfcharge = EGUN_SELFCHARGE_BORG
 	cell_type = /obj/item/stock_parts/cell/secborg
 	charge_delay = 5

code/modules/projectiles/guns/magic/wand.dm

@@ -131,7 +131,7 @@
 	no_den_usage = 1
 
 /obj/item/gun/magic/wand/teleport/zap_self(mob/living/user)
-	if(do_teleport(user, user, 10))
+	if(do_teleport(user, user, 10, channel = TELEPORT_CHANNEL_MAGIC))
 		var/datum/effect_system/smoke_spread/smoke = new
 		smoke.set_up(3, user.loc)
 		smoke.start()

code/modules/projectiles/guns/misc/syringe_gun.dm

@@ -122,3 +122,32 @@
 	else
 		to_chat(user, "<span class='notice'>You can't put the [A] into \the [src]!</span>")
 		return FALSE
+
+/obj/item/gun/syringe/dart/rapiddart
+	name = "Repeating dart gun"
+	icon_state = "rapiddartgun"
+	item_state = "rapiddartgun"
+
+/obj/item/gun/syringe/dart/rapiddart/CheckParts(list/parts_list)
+	var/obj/item/reagent_containers/glass/beaker/B = locate(/obj/item/reagent_containers/glass/beaker) in parts_list
+
+	if(istype(B, /obj/item/reagent_containers/glass/beaker/large))
+		desc = "[initial(desc)] A modification of the dart gun's pressure chamber has been perfomed using a [B], extending it's holding size to [max_syringes]."
+		max_syringes = 2
+		return
+	else if(istype(B, /obj/item/reagent_containers/glass/beaker/plastic))
+		desc = "[initial(desc)] A modification of the dart gun's pressure chamber has been perfomed using a [B], extending it's holding size to [max_syringes]."
+		max_syringes = 3
+		return
+	else if(istype(B, /obj/item/reagent_containers/glass/beaker/meta))
+		desc = "[initial(desc)] A modification of the dart gun's pressure chamber has been perfomed using a [B], extending it's holding size to [max_syringes]."
+		max_syringes = 4
+		return
+	else if(istype(B, /obj/item/reagent_containers/glass/beaker/bluespace))
+		desc = "[initial(desc)] A modification of the dart gun's pressure chamber has been perfomed using a [B], extending it's holding size to [max_syringes]."
+		max_syringes = 6
+		return
+	else
+		max_syringes = 1
+		desc = "[initial(desc)] It has a [B] strapped to it, but it doesn't seem to be doing anything."
+	..()

code/modules/projectiles/pins.dm

@@ -37,10 +37,12 @@
 				to_chat(user, "<span class ='notice'>This firearm already has a firing pin installed.</span>")
 
 /obj/item/firing_pin/emag_act(mob/user)
+	. = ..()
 	if(obj_flags & EMAGGED)
 		return
 	obj_flags |= EMAGGED
 	to_chat(user, "<span class='notice'>You override the authentication mechanism.</span>")
+	return TRUE
 
 /obj/item/firing_pin/proc/gun_insert(mob/living/user, obj/item/gun/G)
 	gun = G
@@ -186,6 +188,15 @@
 	desc = "This is a DNA-locked firing pin which only authorizes one user. Attempt to fire once to DNA-link. It has a small explosive charge on it."
 	selfdestruct = TRUE
 
+/obj/item/firing_pin/holy
+	name = "blessed pin"
+	desc = "A firing pin that only responds to those who are holier than thou."
+
+/obj/item/firing_pin/holy/pin_auth(mob/living/user)
+	if(user.mind.isholy)
+		return TRUE
+	return FALSE
+
 // Laser tag pins
 /obj/item/firing_pin/tag
 	name = "laser tag firing pin"

code/modules/projectiles/projectile/beams.dm

@@ -39,6 +39,14 @@
 /obj/item/projectile/beam/weak
 	damage = 15
 
+/obj/item/projectile/beam/weak/minigun
+	damage = 12.5
+	armour_penetration = 40
+
+/obj/item/projectile/beam/weak/minigun/Initialize()
+	.=..()
+	speed = pick(0.7,0.75,0.8,0.85,0.9,0.95,1,1.05,1.1,1.15)
+
 /obj/item/projectile/beam/weak/penetrator
 	armour_penetration = 50
 
@@ -151,6 +159,11 @@
 /obj/item/projectile/beam/lasertag/redtag/hitscan
 	hitscan = TRUE
 
+/obj/item/projectile/beam/lasertag/redtag/hitscan/holy
+	name = "lasrifle beam"
+	damage = 0.1
+	damage_type = BURN
+
 /obj/item/projectile/beam/lasertag/bluetag
 	icon_state = "bluelaser"
 	suit_types = list(/obj/item/clothing/suit/redtag)

code/modules/projectiles/projectile/bullets/shotgun.dm

@@ -5,7 +5,7 @@
 /obj/item/projectile/bullet/shotgun_beanbag
 	name = "beanbag slug"
 	damage = 5
-	stamina = 80
+	stamina = 70
 
 /obj/item/projectile/bullet/incendiary/shotgun
 	name = "incendiary slug"
@@ -61,12 +61,12 @@
 
 /obj/item/projectile/bullet/pellet/shotgun_buckshot
 	name = "buckshot pellet"
-	damage = 12.5
+	damage = 10
 
 /obj/item/projectile/bullet/pellet/shotgun_rubbershot
 	name = "rubbershot pellet"
-	damage = 3
-	stamina = 25
+	damage = 2
+	stamina = 15
 
 /obj/item/projectile/bullet/pellet/Range()
 	..()

code/modules/projectiles/projectile/energy/net_snare.dm

@@ -42,10 +42,10 @@
 /obj/effect/nettingportal/proc/pop(teletarget)
 	if(teletarget)
 		for(var/mob/living/L in get_turf(src))
-			do_teleport(L, teletarget, 2)//teleport what's in the tile to the beacon
+			do_teleport(L, teletarget, 2, channel = TELEPORT_CHANNEL_BLUESPACE)//teleport what's in the tile to the beacon
 	else
 		for(var/mob/living/L in get_turf(src))
-			do_teleport(L, L, 15) //Otherwise it just warps you off somewhere.
+			do_teleport(L, L, 15, channel = TELEPORT_CHANNEL_BLUESPACE) //Otherwise it just warps you off somewhere.
 
 	qdel(src)
 

code/modules/projectiles/projectile/magic.dm

@@ -67,7 +67,7 @@
 		teleloc = target.loc
 	for(var/atom/movable/stuff in teleloc)
 		if(!stuff.anchored && stuff.loc)
-			if(do_teleport(stuff, stuff, 10))
+			if(do_teleport(stuff, stuff, 10, channel = TELEPORT_CHANNEL_MAGIC))
 				teleammount++
 				var/datum/effect_system/smoke_spread/smoke = new
 				smoke.set_up(max(round(4 - teleammount),0), stuff.loc) //Smoke drops off if a lot of stuff is moved for the sake of sanity

code/modules/projectiles/projectile/special/mindflayer.dm

@@ -5,5 +5,5 @@
 	. = ..()
 	if(ishuman(target))
 		var/mob/living/carbon/human/M = target
-		M.adjustBrainLoss(20)
+		M.adjustOrganLoss(ORGAN_SLOT_BRAIN, 20)
 		M.hallucination += 30

code/modules/projectiles/projectile/special/rocket.dm

@@ -16,6 +16,7 @@
 	var/anti_armour_damage = 200
 	armour_penetration = 100
 	dismemberment = 100
+	ricochets_max = 0
 
 /obj/item/projectile/bullet/a84mm/on_hit(atom/target, blocked = FALSE)
 	..()