Merge pull request #9930 from Novacat/nova-basicfixes

Slightly nerfs cold adaptation

code/game/gamemodes/technomancer/spells/apportation.dm

@@ -44,7 +44,7 @@
 			src.loc = null
 			user.put_in_hands(I)
 			user.visible_message("<span class='notice'>\A [I] appears in \the [user]'s hand!</span>")
-			log_and_message_admins("has stolen [I] with [src].")
+			add_attack_logs(user,I,"Stolen with [src]")
 			qdel(src)
 		//Now let's try to teleport a living mob.
 		else if(istype(hit_atom, /mob/living))

code/game/gamemodes/technomancer/spells/blink.dm

@@ -68,7 +68,7 @@
 			else
 				safe_blink(AM, calculate_spell_power(3))
 			adjust_instability(3)
-			log_and_message_admins("has blinked [AM] away.")
+			add_attack_logs(user,AM,"Blinked")
 		else
 			to_chat(user, "<span class='warning'>You need more energy to blink [AM] away!</span>")
 
@@ -82,7 +82,7 @@
 		else
 			safe_blink(user, calculate_spell_power(6))
 		adjust_instability(1)
-		log_and_message_admins("has blinked themselves away.")
+		add_attack_logs(user,user,"Blinked")
 	else
 		to_chat(user, "<span class='warning'>You need more energy to blink yourself away!</span>")
 
@@ -99,6 +99,6 @@
 			else
 				safe_blink(AM, 6)
 			adjust_instability(2)
-			log_and_message_admins("has blinked [AM] away.")
+			add_attack_logs(user,AM,"Blinked")
 		else
 			to_chat(user, "<span class='warning'>You need more energy to blink [AM] away!</span>")

code/game/gamemodes/technomancer/spells/condensation.dm

@@ -36,9 +36,9 @@
 								var/turf/simulated/frozen = desired_turf
 								frozen.freeze_floor()
 			if(check_for_scepter())
-				log_and_message_admins("has iced the floor with [src] at [T.x],[T.y],[T.z].")
+				add_attack_logs(user,hit_atom,"Iced the floor with [src] at [T.x],[T.y],[T.z]")
 			else
-				log_and_message_admins("has wetted the floor with [src] at [T.x],[T.y],[T.z].")
+				add_attack_logs(user,hit_atom,"Wetted the floor with [src] at [T.x],[T.y],[T.z]")
 		else if(hit_atom.reagents && !ismob(hit_atom))		//TODO: Something for the scepter
 			hit_atom.reagents.add_reagent(id = "water", amount = 60, data = null, safety = 0)
 		adjust_instability(5)

code/game/gamemodes/technomancer/spells/control.dm

@@ -125,7 +125,7 @@
 				return 0
 			if(pay_energy(25 * controlled_mobs.len))
 				attack_all(L)
-				log_and_message_admins("has commanded their army of [controlled_mobs.len] to attack [L].")
+				add_attack_logs(user,L,"Commanded their army of [controlled_mobs.len]")
 				to_chat(user, "<span class='notice'>You command your [controlled_mobs.len > 1 ? "entities" : "[controlled_mobs[1]]"] to \
 				attack \the [L].</span>")
 				//This is to stop someone from controlling beepsky and getting him to stun someone 5 times a second.

code/game/gamemodes/technomancer/spells/energy_siphon.dm

@@ -57,7 +57,7 @@
 			return 0
 		siphoning = AM
 		update_icon()
-		log_and_message_admins("is siphoning energy from \a [AM].")
+		add_attack_logs(user,AM,"Siphoned energy from [src]")
 	else
 		stop_siphoning()
 

code/game/gamemodes/technomancer/spells/flame_tongue.dm

@@ -46,7 +46,7 @@
 			visible_message("<span class='danger'>\The [user] reaches out towards \the [L] with the flaming hand, and they ignite!</span>")
 			to_chat(L, "<span class='danger'>You ignite!</span>")
 			L.fire_act()
-			log_and_message_admins("has ignited [L] with [src].")
+			add_attack_logs(user,L,"Ignited with [src]")
 			adjust_instability(12)
 	else
 		//This is needed in order for the welder to work, and works similarly to grippers.

code/game/gamemodes/technomancer/spells/insert/insert.dm

@@ -45,7 +45,7 @@
 					return
 		var/obj/item/weapon/inserted_spell/inserted = new inserting(L,user,src)
 		inserted.spell_power_at_creation = calculate_spell_power(1.0)
-		log_and_message_admins("has casted [src] on [L].")
+		add_attack_logs(user,L,"Casted [src]")
 		qdel(src)
 
 /obj/item/weapon/spell/insert/on_melee_cast(atom/hit_atom, mob/user)

code/game/gamemodes/technomancer/spells/projectile/projectile.dm

@@ -14,7 +14,7 @@
 		var/obj/item/projectile/new_projectile = make_projectile(spell_projectile, user)
 		new_projectile.old_style_target(hit_atom)
 		new_projectile.fire()
-		log_and_message_admins("has casted [src] at \the [hit_atom].")
+		add_attack_logs(user,hit_atom,"Casted [src]")
 		if(fire_sound)
 			playsound(src, fire_sound, 75, 1)
 		adjust_instability(instability_per_shot)
@@ -39,4 +39,4 @@
 					return TRUE
 				return FALSE // We got dropped before the firing occured.
 			return TRUE // No delay, no need to check.
-	return FALSE
+	return FALSE

code/game/gamemodes/technomancer/spells/reflect.dm

@@ -62,7 +62,7 @@
 				spark_system.start()
 				playsound(src, 'sound/weapons/blade1.ogg', 50, 1)
 				// now send a log so that admins don't think they're shooting themselves on purpose.
-				log_and_message_admins("[user] reflected [attacker]'s attack back at them.")
+				add_attack_logs(user,attacker,"Reflected [attacker]'s attack")
 
 				if(!reflecting)
 					reflecting = 1
@@ -82,7 +82,7 @@
 				spark_system.start()
 				playsound(src, 'sound/weapons/blade1.ogg', 50, 1)
 
-				log_and_message_admins("[user] reflected [attacker]'s attack back at them.")
+				add_attack_logs(user,attacker,"Reflected [attacker]'s attack")
 
 				if(!reflecting)
 					reflecting = 1

code/game/gamemodes/technomancer/spells/warp_strike.dm

@@ -76,5 +76,5 @@
 				I.afterattack(chosen_target, user)
 		else
 			chosen_target.attack_hand(user)
-		log_and_message_admins("has warp striked [chosen_target].")
+		add_attack_logs(user,chosen_target,"Warp striked")