Merge remote-tracking branch 'citadel/master' into unarmed_parry

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/ammunition/energy/laser.dm

@@ -12,15 +12,6 @@
 	e_cost = 200
 	select_name = "kill"
 
-/obj/item/ammo_casing/energy/lasergun/improvised
-	projectile_type = /obj/item/projectile/beam/weak/improvised
-	e_cost = 200
-	select_name = "kill"
-
-/obj/item/ammo_casing/energy/lasergun/improvised/upgraded
-	projectile_type = /obj/item/projectile/beam/weak
-	e_cost = 100
-
 /obj/item/ammo_casing/energy/laser/hos
 	e_cost = 100
 

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/bow.dm

@@ -59,7 +59,7 @@
 
 /obj/item/gun/ballistic/bow/pipe
 	name = "pipe bow"
-	desc = "Some sort of pipe made projectile weapon made of a durathread string and lots of bending. Used to fire arrows."
+	desc = "Some sort of pipe-based projectile weapon made of string and lots of bending. Used to fire arrows."
 	icon_state = "pipebow"
 	item_state = "pipebow"
-	force = 0
+	force = 2

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/guns/ballistic/revolver.dm

@@ -319,11 +319,11 @@
 
 /obj/item/gun/ballistic/revolver/doublebarrel/improvised
 	name = "improvised shotgun"
-	desc = "A shoddy break-action breechloaded shotgun. Its lacklustre construction will probably result in it hurting people less than a normal shotgun."
+	desc = "A shoddy break-action breechloaded shotgun. Its lacklustre construction shows in its lesser effectiveness."
 	icon_state = "ishotgun"
 	item_state = "shotgun"
 	w_class = WEIGHT_CLASS_BULKY
-	weapon_weight = WEAPON_MEDIUM
+	weapon_weight = WEAPON_MEDIUM // prevents shooting 2 at once, but doesn't require 2 hands
 	force = 10
 	slot_flags = null
 	mag_type = /obj/item/ammo_box/magazine/internal/shot/improvised
@@ -331,12 +331,11 @@
 	unique_reskin = null
 	projectile_damage_multiplier = 0.9
 	var/slung = FALSE
-	weapon_weight = WEAPON_HEAVY
 
 /obj/item/gun/ballistic/revolver/doublebarrel/improvised/attackby(obj/item/A, mob/user, params)
 	..()
 	if(istype(A, /obj/item/stack/cable_coil) && !sawn_off)
-		if(A.use_tool(src, user, 0, 10, max_level = JOB_SKILL_BASIC))
+		if(A.use_tool(src, user, 0, 10, skill_gain_mult = EASY_USE_TOOL_MULT))
 			slot_flags = ITEM_SLOT_BACK
 			to_chat(user, "<span class='notice'>You tie the lengths of cable to the shotgun, making a sling.</span>")
 			slung = TRUE
@@ -358,7 +357,7 @@
 
 /obj/item/gun/ballistic/revolver/doublebarrel/improvised/sawn
 	name = "sawn-off improvised shotgun"
-	desc = "The barrel and stock have been sawn and filed down; it can fit in backpacks. You still need two hands to fire this, if you value unbroken wrists."
+	desc = "The barrel and stock have been sawn and filed down; it can fit in backpacks. You wont want to shoot two of these at once if you value your wrists."
 	icon_state = "ishotgun"
 	item_state = "gun"
 	w_class = WEIGHT_CLASS_NORMAL

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

@@ -156,7 +156,7 @@
 /obj/item/gun/ballistic/shotgun/boltaction/improvised/attackby(obj/item/A, mob/user, params)
 	..()
 	if(istype(A, /obj/item/stack/cable_coil) && !sawn_off)
-		if(A.use_tool(src, user, 0, 10, max_level = JOB_SKILL_BASIC))
+		if(A.use_tool(src, user, 0, 10, skill_gain_mult = EASY_USE_TOOL_MULT))
 			slot_flags = ITEM_SLOT_BACK
 			to_chat(user, "<span class='notice'>You tie the lengths of cable to the rifle, making a sling.</span>")
 			slung = TRUE

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

@@ -240,20 +240,3 @@
 		chambered.BB.damage *= 5
 
 	process_fire(target, user, TRUE, params)
-
-////////////////
-// IMPROVISED //
-////////////////
-
-/obj/item/gun/energy/e_gun/old/improvised
-	name = "improvised energy rifle"
-	desc = "A crude imitation of an energy gun. It works, however the beams are poorly focused and most of the energy is wasted before it reaches the target. Welp, it still burns things."
-	icon_state = "improvised"
-	ammo_x_offset = 1
-	shaded_charge = 1
-	ammo_type = list(/obj/item/ammo_casing/energy/lasergun/improvised)
-
-/obj/item/gun/energy/e_gun/old/improvised/upgraded
-	name = "makeshift energy rifle"
-	desc = "The new lens and upgraded parts gives this a higher capacity and more energy output, however, the shoddy construction still leaves it inferior to Nanotrasen's own energy weapons."
-	ammo_type = list(/obj/item/ammo_casing/energy/lasergun/improvised/upgraded)

code/modules/projectiles/projectile/beams.dm

@@ -39,9 +39,6 @@
 /obj/item/projectile/beam/weak
 	damage = 15
 
-/obj/item/projectile/beam/weak/improvised
-	damage = 10
-
 /obj/item/projectile/beam/weak/penetrator
 	armour_penetration = 50
 

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