hyeahhh

code/modules/mob/mob.dm

@@ -1203,6 +1203,8 @@
 		var/mob/living/carbon/human/H = src
 		if(istype(H.get_active_held_item(), /obj/item/gun))
 			shootahell = TRUE
+		if(H.discipline_ranged)
+			discipliner = TRUE
 //		for(var/atom/movable/screen/disciplines/DISCP in H.hud_used.static_inventory)
 //			if(DISCP)
 //				if(DISCP.active)
@@ -1221,6 +1223,8 @@
 		var/obj/vehicle/sealed/E = loc
 		if(E.mouse_pointer)
 			client.mouse_pointer_icon = E.mouse_pointer
+	else
+		client.mouse_pointer_icon = default_cursor_icon
 
 
 ///This mob is abile to read books

code/modules/mob/mob_defines.dm

@@ -43,6 +43,7 @@
 	/// A special action? No idea why this lives here
 	var/list/datum/action/chameleon_item_actions
 	///Cursor icon used when holding shift over things
+	var/default_cursor_icon = 'icons/effects/mouse_pointers/default.dmi'
 	var/examine_cursor_icon = 'icons/effects/mouse_pointers/examine_pointer.dmi'
 	var/pvp_cursor_icon = 'icons/effects/mouse_pointers/pvp.dmi'
 	var/discipline_cursor_icon = 'icons/effects/mouse_pointers/discipline.dmi'

code/modules/projectiles/ammunition/_firing.dm

@@ -73,18 +73,26 @@
 					if(P.linked_network == "police")
 						P.announce_crime("shooting", get_turf(user))
 		var/atom/A = new firing_effect_type(get_turf(src), firing_dir)
-		var/atom/movable/shit = new(A.loc)
-		if(ishuman(user))
-			var/mob/living/carbon/human/H = user
-			H.remove_overlay(FIRING_EFFECT_LAYER)
-			var/mutable_appearance/firing_overlay = mutable_appearance('code/modules/wod13/icons.dmi', "firing", -PROTEAN_LAYER)
-			H.overlays_standing[FIRING_EFFECT_LAYER] = firing_overlay
-			H.apply_overlay(FIRING_EFFECT_LAYER)
-			shit.set_light(3, 2, "#ffedbb")
+		var/matrix/M = matrix()
+		M.Turn(get_angle_raw(user.x, user.y, 0, 0, target.x, target.y, 0, 0))
+		A.transform = M
+		A.layer = ABOVE_LIGHTING_LAYER
+		A.plane = ABOVE_LIGHTING_PLANE
+//		var/atom/movable/shit = new(A.loc)
+		var/atom/movable/firing_overlay = new (get_turf(user))
+		firing_overlay.icon = 'icons/effects/light_overlays/firing_light.dmi'
+		firing_overlay.icon_state = "light"
+		firing_overlay.layer = O_LIGHTING_VISUAL_LAYER
+		firing_overlay.plane = O_LIGHTING_VISUAL_PLANE
+		firing_overlay.appearance_flags = RESET_COLOR | RESET_ALPHA | RESET_TRANSFORM
+		firing_overlay.color = "#ffedbb"
+		firing_overlay.pixel_x = -32
+		firing_overlay.pixel_y = -32
+//			shit.set_light(3, 2, "#ffedbb")
 //			animate(firing_overlay, alpha = 0, time = 2)
-			spawn(2)
-				H.remove_overlay(FIRING_EFFECT_LAYER)
-				qdel(shit)
+		spawn(5)
+			qdel(firing_overlay)
+//				qdel(shit)
 
 	var/direct_target
 	if(targloc == curloc)