Merge pull request #10707 from KorPhaeron/fixes

Fixes

code/game/machinery/vending.dm

@@ -720,7 +720,7 @@ IF YOU MODIFY THE PRODUCTS LIST OF A MACHINE, MAKE SURE TO UPDATE ITS RESUPPLY C
 	product_ads = "Float like an astronaut, sting like a bullet!;Express your second ammendment today!;Guns don't kill people, but you can!;Who needs responsibilities when you have guns?"
 	vend_reply = "Remember the name: Liberation Station!"
 	products = list(/obj/item/weapon/gun/projectile/automatic/pistol/deagle/gold = 2,/obj/item/weapon/gun/projectile/automatic/pistol/deagle/camo = 2,
-					/obj/item/weapon/gun/projectile/automatic/pistol/m1911 = 2,/obj/item/weapon/gun/projectile/automatic/proto = 2,
+					/obj/item/weapon/gun/projectile/automatic/pistol/m1911 = 2,/obj/item/weapon/gun/projectile/automatic/proto/unrestricted = 2,
 					/obj/item/weapon/gun/projectile/shotgun/automatic/combat = 2,/obj/item/weapon/gun/projectile/automatic/gyropistol = 1,
 					/obj/item/weapon/gun/projectile/shotgun = 2,/obj/item/weapon/gun/projectile/automatic/ar = 2)
 	premium = list(/obj/item/ammo_box/magazine/smgm9mm = 2,/obj/item/ammo_box/magazine/m50 = 4,/obj/item/ammo_box/magazine/m45 = 2,/obj/item/ammo_box/magazine/m75 = 2)

code/game/objects/structures/statues.dm

@@ -199,10 +199,20 @@
 
 
 /obj/structure/statue/plasma/bullet_act(obj/item/projectile/Proj)
+	var/burn = FALSE
 	if(istype(Proj,/obj/item/projectile/beam))
 		PlasmaBurn(2500)
+		burn = TRUE
 	else if(istype(Proj,/obj/item/projectile/ion))
 		PlasmaBurn(500)
+		burn = TRUE
+	if(burn)
+		if(Proj.firer)
+			message_admins("Plasma statue ignited by [key_name_admin(Proj.firer)](<A HREF='?_src_=holder;adminmoreinfo=\ref[Proj.firer]'>?</A>) (<A HREF='?_src_=holder;adminplayerobservefollow=\ref[Proj.firer]'>FLW</A>) in ([x],[y],[z] - <A HREF='?_src_=holder;adminplayerobservecoodjump=1;X=[x];Y=[y];Z=[z]'>JMP</a>)",0,1)
+			log_game("Plasma statue ignited by [key_name(Proj.firer)] in ([x],[y],[z])")
+		else
+			message_admins("Plasma statue ignited by [Proj]. No known firer.(<A HREF='?_src_=holder;adminmoreinfo=\ref[Proj.firer]'>?</A>) (<A HREF='?_src_=holder;adminplayerobservefollow=\ref[Proj.firer]'>FLW</A>) in ([x],[y],[z] - <A HREF='?_src_=holder;adminplayerobservecoodjump=1;X=[x];Y=[y];Z=[z]'>JMP</a>)",0,1)
+			log_game("Plasma statue ignited by [Proj] in ([x],[y],[z]). No known firer.")	
 	..()
 
 /obj/structure/statue/plasma/attackby(obj/item/weapon/W, mob/user, params)

code/modules/mob/living/carbon/alien/humanoid/alien_powers.dm

@@ -94,7 +94,7 @@ Doesn't work on other aliens/AI.*/
 	action_icon_state = "alien_whisper"
 
 /obj/effect/proc_holder/alien/whisper/fire(mob/living/carbon/alien/user)
-	var/mob/M = input("Select who to whisper to:","Whisper to?",null) as mob in oview(user)
+	var/mob/living/M = input("Select who to whisper to:","Whisper to?",null) as mob in oview(user)
 	if(!M)
 		return 0
 	var/msg = sanitize(input("Message:", "Alien Whisper") as text|null)

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

@@ -15,6 +15,9 @@
 	mag_type = /obj/item/ammo_box/magazine/smgm9mm
 	pin = null
 
+/obj/item/weapon/gun/projectile/automatic/proto/unrestricted
+	pin = /obj/item/device/firing_pin
+
 /obj/item/weapon/gun/projectile/automatic/update_icon()
 	..()
 	overlays.Cut()
@@ -130,6 +133,10 @@
 	fire_delay = 3
 	pin = /obj/item/device/firing_pin/implant/pindicate
 
+/obj/item/weapon/gun/projectile/automatic/l6_saw/unrestricted
+	pin = /obj/item/device/firing_pin
+
+
 /obj/item/weapon/gun/projectile/automatic/l6_saw/attack_self(mob/user)
 	cover_open = !cover_open
 	user << "<span class='notice'>You [cover_open ? "open" : "close"] [src]'s cover.</span>"

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

@@ -262,6 +262,9 @@
 	pin = /obj/item/device/firing_pin/implant/pindicate
 	action_button_name = null
 
+/obj/item/weapon/gun/projectile/automatic/shotgun/bulldog/unrestricted
+	pin = /obj/item/device/firing_pin
+
 /obj/item/weapon/gun/projectile/automatic/shotgun/bulldog/New()
 	..()
 	update_icon()