Merge branch 'master' of https://github.com/PolarisSS13/Polaris into 2/17/2018_make_AI_great_again

# Conflicts resolved:
#	icons/mob/modifier_effects.dmi

code/modules/projectiles/ammunition/magazines.dm

@@ -472,7 +472,7 @@
 
 /obj/item/ammo_magazine/m44
 	name = "magazine (.44)"
-	icon_state = "44"
+	icon_state = "m44"
 	origin_tech = list(TECH_COMBAT = 2)
 	mag_type = MAGAZINE
 	caliber = ".44"

code/modules/projectiles/effects.dm

@@ -267,4 +267,25 @@
 	icon_state = "impact_darkb"
 	light_range = 2
 	light_power = 0.5
-	light_color = "#8837A3"
+	light_color = "#8837A3"
+
+//----------------------------
+// Inversion / Cult
+//----------------------------
+/obj/effect/projectile/inversion/tracer
+	icon_state = "invert"
+	light_range = 2
+	light_power = -2
+	light_color = "#FFFFFF"
+
+/obj/effect/projectile/inversion/muzzle
+	icon_state = "muzzle_invert"
+	light_range = 2
+	light_power = -2
+	light_color = "#FFFFFF"
+
+/obj/effect/projectile/inversion/impact
+	icon_state = "impact_invert"
+	light_range = 2
+	light_power = -2
+	light_color = "#FFFFFF"

code/modules/projectiles/gun.dm

@@ -141,6 +141,10 @@
 		return 0
 	if(!user.IsAdvancedToolUser())
 		return 0
+	if(isanimal(user))
+		var/mob/living/simple_animal/S = user
+		if(!S.IsHumanoidToolUser(src))
+			return 0
 
 	var/mob/living/M = user
 	if(dna_lock && attached_lock.stored_dna)
@@ -709,7 +713,7 @@
 		recoil = initial(recoil)
 
 /obj/item/weapon/gun/examine(mob/user)
-	..()
+	. = ..()
 	if(firemodes.len > 1)
 		var/datum/firemode/current_mode = firemodes[sel_mode]
 		to_chat(user, "The fire selector is set to [current_mode.name].")

code/modules/projectiles/guns/energy.dm

@@ -144,7 +144,7 @@
 	return null
 
 /obj/item/weapon/gun/energy/examine(mob/user)
-	..(user)
+	. = ..()
 	if(power_supply)
 		var/shots_remaining = round(power_supply.charge / charge_cost)
 		user << "Has [shots_remaining] shot\s remaining."

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

@@ -41,6 +41,9 @@
 
 	update_icon()
 
+/obj/item/weapon/gun/projectile/shotgun/pump/slug
+	ammo_type = /obj/item/ammo_casing/a12g
+
 /obj/item/weapon/gun/projectile/shotgun/pump/combat
 	name = "combat shotgun"
 	desc = "Built for close quarters combat, the Hephaestus Industries KS-40 is widely regarded as a weapon of choice for repelling boarders. Uses 12g rounds."

code/modules/projectiles/projectile/special.dm

@@ -15,7 +15,7 @@
 	var/sev1_range = 0
 	var/sev2_range = 1
 	var/sev3_range = 1
-	var/sev4_range = 2
+	var/sev4_range = 1
 
 /obj/item/projectile/ion/on_hit(var/atom/target, var/blocked = 0)
 		empulse(target, sev1_range, sev2_range, sev3_range, sev4_range)