Merge branch 'master' into runtime-fix-2

code/modules/projectiles/guns/energy.dm

@@ -32,8 +32,8 @@
 /obj/item/gun/energy/get_cell()
 	return cell
 
-/obj/item/gun/energy/New()
-	..()
+/obj/item/gun/energy/Initialize(mapload, ...)
+	. = ..()
 	if(cell_type)
 		cell = new cell_type(src)
 	else

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

@@ -36,9 +36,9 @@
 	can_flashlight = 0 // Can't attach or detach the flashlight, and override it's icon update
 	actions_types = list(/datum/action/item_action/toggle_gunlight)
 
-/obj/item/gun/energy/gun/mini/New()
+/obj/item/gun/energy/gun/mini/Initialize(mapload, ...)
 	gun_light = new /obj/item/flashlight/seclite(src)
-	..()
+	. = ..()
 	cell.maxcharge = 600
 	cell.charge = 600
 

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

@@ -341,8 +341,8 @@
 	var/emagged = 0			//ups the temperature cap from 500 to 1000, targets hit by beams over 500 Kelvin will burst into flames
 	var/dat = ""
 
-/obj/item/gun/energy/temperature/New()
-	..()
+/obj/item/gun/energy/temperature/Initialize(mapload, ...)
+	. = ..()
 	update_icon()
 	START_PROCESSING(SSobj, src)
 

code/modules/projectiles/guns/magic.dm

@@ -40,7 +40,7 @@
 		chambered.newshot(params)
 	return
 
-/obj/item/gun/magic/process_fire()
+/obj/item/gun/magic/process_fire(atom/target as mob|obj|turf, mob/living/user as mob|obj, message = 1, params, zone_override, bonus_spread = 0)
 	newshot()
 	return ..()
 

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

@@ -51,7 +51,7 @@
 	user.visible_message("<span class='danger'>[user] zaps [user.p_them()]self with [src].</span>")
 	playsound(user, fire_sound, 50, 1)
 	user.create_attack_log("<b>[key_name(user)]</b> zapped [user.p_them()]self with a <b>[src]</b>")
-	add_attack_logs(null, user, "zapped [user.p_them()]self with a [src]")
+	add_attack_logs(null, user, "zapped [user.p_them()]self with a [src]", ATKLOG_ALL)
 
 /////////////////////////////////////
 //WAND OF DEATH

code/modules/projectiles/guns/medbeam.dm

@@ -106,7 +106,7 @@
 	target.adjustBruteLoss(-4)
 	target.adjustFireLoss(-4)
 	if(ishuman(target))
-		var/var/mob/living/carbon/human/H = target
+		var/mob/living/carbon/human/H = target
 		for(var/obj/item/organ/external/E in H.bodyparts)
 			if(prob(10))
 				E.mend_fracture()

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

@@ -43,7 +43,8 @@
 
 /obj/item/gun/projectile/automatic/sniper_rifle/compact //holds very little ammo, lacks zooming, and bullets are primarily damage dealers, but the gun lacks the downsides of the full size rifle
 	name = "compact sniper rifle"
-	desc = "a compact, unscoped version of the standard issue syndicate sniper rifle. Still capable of sending people crying."
+	desc = "A compact, unscoped version of the standard issue syndicate sniper rifle. Still capable of sending people crying."
+	icon_state = "snipercompact"
 	recoil = 0
 	weapon_weight = WEAPON_LIGHT
 	fire_delay = 0
@@ -52,6 +53,12 @@
 	can_suppress = FALSE
 	zoomable = FALSE
 
+/obj/item/gun/projectile/automatic/sniper_rifle/compact/update_icon()
+	if(magazine)
+		icon_state = "snipercompact-mag"
+	else
+		icon_state = "snipercompact"
+
 //Normal Boolets
 /obj/item/ammo_box/magazine/sniper_rounds
 	name = "sniper rounds (.50)"

code/modules/projectiles/projectile/magic.dm

@@ -263,7 +263,7 @@
 				return
 
 		M.create_attack_log("<font color='orange'>[key_name(M)] became [new_mob.real_name].</font>")
-		add_attack_logs(null, M, "became [new_mob.real_name]")
+		add_attack_logs(null, M, "became [new_mob.real_name]", ATKLOG_ALL)
 
 		new_mob.a_intent = INTENT_HARM
 		if(M.mind)
@@ -346,4 +346,4 @@
 			to_chat(target, "<span class='notice'>You get splatted by [src].</span>")
 			M.Weaken(slip_weaken)
 			M.Stun(slip_stun)
-	. = ..()
+	. = ..()