Merge branch 'master' into patch-28

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

@@ -51,17 +51,3 @@
 	desc = "A .50AE bullet casing."
 	caliber = ".50"
 	projectile_type = /obj/item/projectile/bullet/a50AE
-
-// .32 ACP (Improvised Pistol)
-
-/obj/item/ammo_casing/c32acp
-	name = ".32 bullet casing"
-	desc = "A .32 bullet casing."
-	caliber = "c32acp"
-	projectile_type = /obj/item/projectile/bullet/c32acp
-
-/obj/item/ammo_casing/r32acp
-	name = ".32 rubber bullet casing"
-	desc = "A .32 rubber bullet casing."
-	caliber = "c32acp"
-	projectile_type = /obj/item/projectile/bullet/r32acp

code/modules/projectiles/boxes_magazines/ammo_boxes.dm

@@ -55,18 +55,6 @@
 	desc = "Designed to quickly reload revolvers. These rounds are manufactured within extremely tight tolerances, making them easy to show off trickshots with."
 	ammo_type = /obj/item/ammo_casing/c38/match
 
-/obj/item/ammo_box/c32mm
-	name = "ammo box (.32 acp)"
-	desc = "Lethal .32 acp bullets, there's forty in the box."
-	ammo_type = /obj/item/ammo_casing/c32acp
-	max_ammo = 40
-
-/obj/item/ammo_box/r32mm
-	name = "ammo box (rubber .32 acp)"
-	desc = "Non-lethal .32 acp bullets, there's forty in the box."
-	ammo_type = /obj/item/ammo_casing/r32acp
-	max_ammo = 40
-
 /obj/item/ammo_box/c9mm
 	name = "ammo box (9mm)"
 	icon_state = "9mmbox"

code/modules/projectiles/boxes_magazines/external/pistol.dm

@@ -66,15 +66,3 @@
 	caliber = ".50"
 	max_ammo = 7
 	multiple_sprites = 1
-
-/obj/item/ammo_box/magazine/m32acp
-	name = "pistol magazine (.32)"
-	desc = "A crudely construction pistol magazine that holds .32 ACP rounds. It looks like it can only fit eight bullets."
-	icon_state = "32acp"
-	ammo_type = /obj/item/ammo_casing/c32acp
-	caliber = "c32acp"
-	max_ammo = 8
-	multiple_sprites = 2
-
-/obj/item/ammo_box/magazine/m32acp/empty
-	start_empty = 1

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

@@ -156,19 +156,3 @@
 	name = "Syndicate Anti Tank Pistol"
 	desc = "A massively impractical and silly monstrosity of a pistol that fires .50 calliber rounds. The recoil is likely to dislocate a variety of joints without proper bracing."
 	pin = /obj/item/firing_pin/implant/pindicate
-
-////////////Improvised Pistol////////////
-
-/obj/item/gun/ballistic/automatic/pistol/improvised
-	name = "Improvised Pistol"
-	desc = "An improvised pocket-sized pistol that fires .32 calibre rounds. It looks incredibly flimsy."
-	icon_state = "ipistol"
-	item_state = "pistol"
-	mag_type = /obj/item/ammo_box/magazine/m32acp
-	fire_delay = 7.5
-	can_suppress = FALSE
-	w_class = WEIGHT_CLASS_SMALL
-	spread = 15		// Keep the spread between 15 and 20. This hardlocks it into being a mid-range pistol, the magazine size means you're allowed to miss. Fills the mid-range niche that slugs/rifle and buckshot doesn't fill.
-
-/obj/item/gun/ballistic/automatic/pistol/improvised/nomag
-	spawnwithmagazine = FALSE // For crafting as you shouldn't get eight bullets for free otherwise people will reaper reload.

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

@@ -48,15 +48,3 @@
 			L.Sleeping(300)
 		else
 			L.adjustStaminaLoss(25)
-
-// .32 ACP (Improvised Pistol)
-
-/obj/item/projectile/bullet/c32acp
-	name = ".32 bullet"
-	damage = 13
-
-/obj/item/projectile/bullet/r32acp
-	name = ".32 rubber bullet"
-	damage = 3
-	eyeblur = 1
-	stamina = 20

code/modules/research/designs/autolathe_desings/autolathe_designs_sec_and_hacked.dm

@@ -30,14 +30,6 @@
 	build_path = /obj/item/ammo_box/c38
 	category = list("initial", "Security")
 
-/datum/design/r32acp
-	name = "Rubber Pistol Bullet (.32)"
-	id = "r32acp"
-	build_type = AUTOLATHE
-	materials = list(/datum/material/iron = 250)
-	build_path = /obj/item/ammo_casing/r32acp
-	category = list("initial", "Security")
-
 /////////////////
 ///Hacked Gear //
 /////////////////
@@ -206,22 +198,3 @@
 	build_path = /obj/item/clothing/head/foilhat
 	category = list("hacked", "Misc")
 
-/datum/design/c32acp
-	name = "Pistol Bullet (.32)"
-	id = "c32acp"
-	build_type = AUTOLATHE
-	materials = list(/datum/material/iron = 500)
-	build_path = /obj/item/ammo_casing/c32acp
-	category = list("hacked", "Security")
-
-/////////////////
-//  Magazines  //
-/////////////////
-
-/datum/design/m32acp
-	name = "Empty .32 Magazine"
-	id = "m32acp"
-	build_type = AUTOLATHE
-	materials = list(/datum/material/iron = 10000)
-	build_path = /obj/item/ammo_box/magazine/m32acp/empty
-	category = list("hacked", "Security")

code/modules/research/designs/autolathe_desings/autolathe_designs_tcomms_and_misc.dm

@@ -289,11 +289,3 @@
 	materials = list(/datum/material/iron = 6500, /datum/material/glass = 50)
 	build_path = /obj/item/weaponcrafting/improvised_parts/trigger_assembly
 	category = list("initial", "Misc")
-
-/datum/design/focusing_lens
-	name = "Makeshift Lens"
-	id = "makeshift_lens"
-	build_type = AUTOLATHE
-	materials = list(/datum/material/iron = 2000, /datum/material/glass = 4000)
-	build_path = /obj/item/weaponcrafting/improvised_parts/makeshift_lens
-	category = list("initial", "Misc")