Merge pull request #15775 from AnturK/fix1

Bunch of fixes

code/game/machinery/deployable.dm

@@ -137,7 +137,9 @@
 	actions_types = list(/datum/action/item_action/toggle_barrier_spread)
 	var/mode = SINGLE
 
-/obj/item/weapon/grenade/barrier/AltClick(mob/user)
+/obj/item/weapon/grenade/barrier/AltClick(mob/living/user)
+	if(!istype(user) || user.incapacitated())
+		return
 	toggle_mode(user)
 
 /obj/item/weapon/grenade/barrier/proc/toggle_mode(mob/user)

code/game/machinery/doppler_array.dm

@@ -48,9 +48,8 @@ var/list/doppler_arrays = list()
 	src.dir = turn(src.dir, 90)
 	return
 
-/obj/machinery/doppler_array/AltClick(mob/user)
-	..()
-	if(user.incapacitated())
+/obj/machinery/doppler_array/AltClick(mob/living/user)
+	if(!istype(user) || user.incapacitated())
 		user << "<span class='warning'>You can't do that right now!</span>"
 		return
 	if(!in_range(src, user))

code/game/objects/items/devices/geiger_counter.dm

@@ -132,8 +132,9 @@
 		return 1
 	..()
 
-/obj/item/device/geiger_counter/AltClick()
-	..()
+/obj/item/device/geiger_counter/AltClick(mob/living/user)
+	if(!istype(user) || user.incapacitated())
+		return ..()
 	if(!scanning)
 		usr << "<span class='warning'>[src] must be on to reset its radiation level!</span>"
 		return 0

code/game/objects/items/weapons/scrolls.dm

@@ -34,11 +34,11 @@
 	..()
 	if (usr.stat || usr.restrained() || src.loc != usr)
 		return
-	var/mob/living/carbon/human/H = usr
-	if (!( istype(H, /mob/living/carbon/human)))
+	if (!ishuman(usr))
 		return 1
-	if ((usr == src.loc || (in_range(src, usr) && istype(src.loc, /turf))))
-		usr.set_machine(src)
+	var/mob/living/carbon/human/H = usr
+	if ((H == src.loc || (in_range(src, H) && istype(src.loc, /turf))))
+		H.set_machine(src)
 		if (href_list["spell_teleport"])
 			if (src.uses >= 1)
 				teleportscroll(H)
@@ -50,7 +50,9 @@
 
 	var/A
 
-	A = input(user, "Area to jump to", "BOOYEA", A) in teleportlocs
+	A = input(user, "Area to jump to", "BOOYEA", A) in teleportlocs|null
+	if(!A)
+		return
 	var/area/thearea = teleportlocs[A]
 
 	if (!user || user.stat || user.restrained() || uses <= 0)

code/game/objects/structures/crates_lockers/closets.dm

@@ -238,10 +238,10 @@
 		else
 			togglelock(user)
 
-/obj/structure/closet/MouseDrop_T(atom/movable/O, mob/user)
+/obj/structure/closet/MouseDrop_T(atom/movable/O, mob/living/user)
 	if(!istype(O) || O.anchored || istype(O, /obj/screen))
 		return
-	if(user.incapacitated() || user.lying)
+	if(!istype(user) || user.incapacitated() || user.lying)
 		return
 	if(!Adjacent(user) || !user.Adjacent(O))
 		return

code/modules/admin/player_panel.dm

@@ -382,8 +382,8 @@
 				var/mob/M = N.current
 				if(M)
 					dat += "<tr><td><a href='?_src_=holder;adminplayeropts=\ref[M]'>[M.real_name]</a>[M.client ? "" : " <i>(ghost)</i>"][M.stat == 2 ? " <b><font color=red>(DEAD)</font></b>" : ""]</td>"
-					dat += "<td><A href='?priv_msg=[M.ckey]'>PM</A></td></tr>"
-					dat += "<td><A href='?_src_=holder;adminplayerobservefollow=\ref[M]'>FLW</a></td>"
+					dat += "<td><A href='?priv_msg=[M.ckey]'>PM</A></td>"
+					dat += "<td><A href='?_src_=holder;adminplayerobservefollow=\ref[M]'>FLW</a></td></tr>"
 			dat += "</table><table cellspacing=5><tr><td><B>Target(s)</B></td><td></td><td><B>Location</B></td></tr>"
 			for(var/datum/mind/N in ticker.mode.get_living_heads())
 				var/mob/M = N.current

code/modules/clothing/masks/gasmask.dm

@@ -62,20 +62,21 @@
 	flags_cover = MASKCOVERSEYES
 	burn_state = FLAMMABLE
 
-/obj/item/clothing/mask/gas/clown_hat/AltClick(mob/user)
-
-	var/mob/M = usr
+/obj/item/clothing/mask/gas/clown_hat/AltClick(mob/living/user)
+	if(!istype(user) || user.incapacitated())
+		return
+	
 	var/list/options = list()
 	options["True Form"] = "clown"
 	options["The Feminist"] = "sexyclown"
 	options["The Madman"] = "joker"
 	options["The Rainbow Color"] ="rainbow"
 
-	var/choice = input(M,"To what form do you wish to Morph this mask?","Morph Mask") in options
+	var/choice = input(user,"To what form do you wish to Morph this mask?","Morph Mask") in options
 
-	if(src && choice && !M.stat && in_range(M,src))
+	if(src && choice && !user.stat && in_range(user,src))
 		icon_state = options[choice]
-		M << "<span class='notice'>Your Clown Mask has now morphed into [choice], all praise the Honkmother!</span>"
+		user << "<span class='notice'>Your Clown Mask has now morphed into [choice], all praise the Honkmother!</span>"
 		return 1
 
 /obj/item/clothing/mask/gas/sexyclown

code/modules/paperwork/paperbin.dm

@@ -24,8 +24,8 @@
 	return
 
 /obj/item/weapon/paper_bin/MouseDrop(atom/over_object)
-	var/mob/M = usr
-	if(M.incapacitated() || !Adjacent(M))
+	var/mob/living/M = usr
+	if(!istype(M) || M.incapacitated() || !Adjacent(M))
 		return
 
 	if(over_object == M)

code/modules/projectiles/gun.dm

@@ -38,6 +38,7 @@
 	var/unique_rename = 0 //allows renaming with a pen
 	var/unique_reskin = 0 //allows one-time reskinning
 	var/reskinned = 0 //whether or not the gun has been reskinned
+	var/current_skin = null
 	var/list/options = list()
 
 	lefthand_file = 'icons/mob/inhands/guns_lefthand.dmi'
@@ -374,6 +375,7 @@ obj/item/weapon/gun/proc/newshot()
 			icon_state = options[choice] + "-sawn"
 		else
 			icon_state = options[choice]
+		current_skin = icon_state
 		M << "Your gun is now skinned as [choice]. Say hello to your new friend."
 		reskinned = 1
 		return

code/modules/projectiles/guns/projectile.dm

@@ -19,7 +19,10 @@
 
 /obj/item/weapon/gun/projectile/update_icon()
 	..()
-	icon_state = "[initial(icon_state)][suppressed ? "-suppressed" : ""]"
+	if(reskinned && current_skin)
+		icon_state = "[current_skin][suppressed ? "-suppressed" : ""]"
+	else
+		icon_state = "[initial(icon_state)][suppressed ? "-suppressed" : ""]"
 
 /obj/item/weapon/gun/projectile/process_chamber(eject_casing = 1, empty_chamber = 1)
 //	if(in_chamber)

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

@@ -286,6 +286,8 @@
 		name = "sawn-off [src.name]"
 		desc = sawn_desc
 		icon_state = "[icon_state]-sawn"
+		if(current_skin)
+			current_skin = "[current_skin]-sawn"
 		w_class = 3
 		item_state = "gun"
 		slot_flags &= ~SLOT_BACK	//you can't sling it on your back

code/orphaned procs/priority_announce.dm

@@ -39,6 +39,7 @@
 			P.info = text
 			C.messagetitle.Add("[title]")
 			C.messagetext.Add(text)
+			P.update_icon()
 
 /proc/minor_announce(message, title = "Attention:", alert)
 	if(!message)