Merge branch 'master' into abductor-update

code/modules/projectiles/projectile/bullets/revolver.dm

@@ -13,16 +13,59 @@
 // .38 (Detective's Gun)
 
 /obj/item/projectile/bullet/c38
+	name = ".38 bullet"
+	damage = 25
+
+/obj/item/projectile/bullet/c38/rubber
 	name = ".38 rubber bullet"
 	damage = 15
 	stamina = 48
 
-/obj/item/projectile/bullet/c38lethal
-	name = ".38 bullet"
-	damage = 25
+/obj/item/projectile/bullet/c38/trac
+	name = ".38 TRAC bullet"
+	damage = 10
+
+/obj/item/projectile/bullet/c38/trac/on_hit(atom/target, blocked = FALSE)
+	. = ..()
+	var/mob/living/carbon/M = target
+	var/obj/item/implant/tracking/c38/imp
+	for(var/obj/item/implant/tracking/c38/TI in M.implants) //checks if the target already contains a tracking implant
+		imp = TI
+		return
+	if(!imp)
+		imp = new /obj/item/implant/tracking/c38(M)
+		imp.implant(M)
+
+/obj/item/projectile/bullet/c38/hotshot //similar to incendiary bullets, but do not leave a flaming trail
+	name = ".38 Hot Shot bullet"
+	damage = 20
+
+/obj/item/projectile/bullet/c38/hotshot/on_hit(atom/target, blocked = FALSE)
+	. = ..()
+	if(iscarbon(target))
+		var/mob/living/carbon/M = target
+		M.adjust_fire_stacks(6)
+		M.IgniteMob()
+
+/obj/item/projectile/bullet/c38/iceblox //see /obj/item/projectile/temp for the original code
+	name = ".38 Iceblox bullet"
+	damage = 20
+	var/temperature = 100
+
+/obj/item/projectile/bullet/c38/iceblox/on_hit(atom/target, blocked = FALSE)
+	. = ..()
+	if(isliving(target))
+		var/mob/living/M = target
+		M.adjust_bodytemperature(((100-blocked)/100)*(temperature - M.bodytemperature))
+
 
 // .357 (Syndie Revolver)
 
 /obj/item/projectile/bullet/a357
 	name = ".357 bullet"
 	damage = 60
+
+/obj/item/projectile/bullet/a357/ap
+	name = ".357 armor-piercing bullet"
+	damage = 45
+	armour_penetration = 45

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

@@ -38,3 +38,9 @@
 	dismemberment = 0 //It goes through you cleanly.
 	knockdown = 0
 	breakthings = FALSE
+
+/obj/item/projectile/bullet/p50/penetrator/shuttle //Nukeop Shuttle Variety
+	icon_state = "gaussstrong"
+	damage = 25
+	speed = 0.3
+	range = 16

code/modules/projectiles/projectile/magic.dm

@@ -221,7 +221,7 @@
 				new_mob =new hooman(M.loc)
 
 			var/datum/preferences/A = new()	//Randomize appearance for the human
-			A.copy_to(new_mob, icon_updates=0)
+			A.copy_to(new_mob, FALSE)
 
 			var/mob/living/carbon/human/H = new_mob
 			H.update_body()