Merge branch 'master' into abductor-update

code/modules/projectiles/ammunition/ballistic/revolver.dm

@@ -6,6 +6,11 @@
 	caliber = "357"
 	projectile_type = /obj/item/projectile/bullet/a357
 
+/obj/item/ammo_casing/a357/ap
+	name = ".357 armor-piercing bullet casing"
+	desc = "A .357 armor-piercing bullet casing."
+	projectile_type = /obj/item/projectile/bullet/a357/ap
+
 // 7.62x38mmR (Nagant Revolver)
 
 /obj/item/ammo_casing/n762
@@ -20,9 +25,26 @@
 	name = ".38 rubber bullet casing"
 	desc = "A .38 rubber bullet casing."
 	caliber = "38"
-	projectile_type = /obj/item/projectile/bullet/c38
+	projectile_type = /obj/item/projectile/bullet/c38/rubber
 
 /obj/item/ammo_casing/c38/lethal
 	name = ".38 bullet casing"
 	desc = "A .38 bullet casing"
-	projectile_type = /obj/item/projectile/bullet/c38lethal
+	projectile_type = /obj/item/projectile/bullet/c38
+
+/obj/item/ammo_casing/c38/trac
+	name = ".38 TRAC bullet casing"
+	desc = "A .38 \"TRAC\" bullet casing."
+	projectile_type = /obj/item/projectile/bullet/c38/trac
+
+/obj/item/ammo_casing/c38/hotshot
+	name = ".38 Hot Shot bullet casing"
+	desc = "A .38 Hot Shot bullet casing."
+	caliber = "38"
+	projectile_type = /obj/item/projectile/bullet/c38/hotshot
+
+/obj/item/ammo_casing/c38/iceblox
+	name = ".38 Iceblox bullet casing"
+	desc = "A .38 Iceblox bullet casing."
+	caliber = "38"
+	projectile_type = /obj/item/projectile/bullet/c38/iceblox

code/modules/projectiles/boxes_magazines/ammo_boxes.dm

@@ -3,13 +3,19 @@
 	desc = "Designed to quickly reload revolvers."
 	icon_state = "357"
 	ammo_type = /obj/item/ammo_casing/a357
+	caliber = "357"
 	max_ammo = 7
 	multiple_sprites = 1
 
+/obj/item/ammo_box/a357/ap
+	name = "speed loader (.357 AP)"
+	ammo_type = /obj/item/ammo_casing/a357/ap
+
 /obj/item/ammo_box/c38
 	name = "speed loader (.38 rubber)"
 	desc = "Designed to quickly reload revolvers."
 	icon_state = "38"
+	caliber = "38"
 	ammo_type = /obj/item/ammo_casing/c38
 	max_ammo = 6
 	multiple_sprites = 1
@@ -19,6 +25,21 @@
 	name = "speed loader (.38)"
 	ammo_type = /obj/item/ammo_casing/c38/lethal
 
+/obj/item/ammo_box/c38/trac
+	name = "speed loader (.38 TRAC)"
+	desc = "Designed to quickly reload revolvers. TRAC bullets embed a tracking implant within the target's body."
+	ammo_type = /obj/item/ammo_casing/c38/trac
+
+/obj/item/ammo_box/c38/hotshot
+	name = "speed loader (.38 Hot Shot)"
+	desc = "Designed to quickly reload revolvers. Hot Shot bullets contain an incendiary payload."
+	ammo_type = /obj/item/ammo_casing/c38/hotshot
+
+/obj/item/ammo_box/c38/iceblox
+	name = "speed loader (.38 Iceblox)"
+	desc = "Designed to quickly reload revolvers. Iceblox bullets contain a cryogenic payload."
+	ammo_type = /obj/item/ammo_casing/c38/iceblox
+
 /obj/item/ammo_box/c9mm
 	name = "ammo box (9mm)"
 	icon_state = "9mmbox"

code/modules/projectiles/guns/ballistic.dm

@@ -152,7 +152,7 @@
 
 #define BRAINS_BLOWN_THROW_RANGE 3
 #define BRAINS_BLOWN_THROW_SPEED 1
-/obj/item/gun/ballistic/suicide_act(mob/user)
+/obj/item/gun/ballistic/suicide_act(mob/living/user)
 	var/obj/item/organ/brain/B = user.getorganslot(ORGAN_SLOT_BRAIN)
 	if (B && chambered && chambered.BB && can_trigger_gun(user) && !chambered.BB.nodamage)
 		user.visible_message("<span class='suicide'>[user] is putting the barrel of [src] in [user.p_their()] mouth.  It looks like [user.p_theyre()] trying to commit suicide!</span>")
@@ -165,12 +165,10 @@
 			var/turf/target = get_ranged_target_turf(user, turn(user.dir, 180), BRAINS_BLOWN_THROW_RANGE)
 			B.Remove(user)
 			B.forceMove(T)
-			var/datum/dna/user_dna
 			if(iscarbon(user))
 				var/mob/living/carbon/C = user
-				user_dna = C.dna
-				B.add_blood_DNA(user_dna, C.diseases)
-			var/datum/callback/gibspawner = CALLBACK(GLOBAL_PROC, /proc/spawn_atom_to_turf, /obj/effect/gibspawner/generic, B, 1, FALSE, list(user_dna))
+				B.add_blood_DNA(C.dna, C.diseases)
+			var/datum/callback/gibspawner = CALLBACK(user, /mob/living/proc/spawn_gibs, FALSE, B)
 			B.throw_at(target, BRAINS_BLOWN_THROW_RANGE, BRAINS_BLOWN_THROW_SPEED, callback=gibspawner)
 			return(BRUTELOSS)
 		else

code/modules/projectiles/guns/ballistic/revolver.dm

@@ -167,6 +167,7 @@
 /obj/item/gun/ballistic/revolver/russian
 	name = "\improper Russian revolver"
 	desc = "A Russian-made revolver for drinking games. Uses .357 ammo, and has a mechanism requiring you to spin the chamber before each trigger pull."
+	icon_state = "russianrevolver"
 	mag_type = /obj/item/ammo_box/magazine/internal/cylinder/rus357
 	var/spun = FALSE
 

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()