BALANCE: Reworking a lot of projectiles stats, and something else

code/__DEFINES/guns.dm

@@ -105,6 +105,9 @@
 #define SHOTGUN_SLOWDOWN 0.4
 #define HEAVY_SHOTGUN_SLOWDOWN 0.45
 #define LIGHT_RIFLE_SLOWDOWN 0.45
+// [CELADON-ADD] - GUN_BALANCE
+#define F4_SLOWDOWN 0.5
+// [/CELADON-ADD]
 #define RIFLE_SLOWDOWN 0.55
 #define HEAVY_RIFLE_SLOWDOWN 0.6
 #define DMR_SLOWDOWN 0.6

code/game/objects/items/melee/energy.dm

@@ -135,7 +135,7 @@
 	sharpness = SHARP_EDGED
 	embedding = list("embed_chance" = 75, "impact_pain_mult" = 10)
 	armour_penetration = 35
-	block_chance = 50
+	block_chance = 40 //[CELADON EDIT] - GUN_BALANCE <- Origin block_chance = 50
 
 /obj/item/melee/energy/sword/hit_reaction(mob/living/carbon/human/owner, atom/movable/hitby, attack_text = "the attack", final_block_chance = 0, damage = 0, attack_type = MELEE_ATTACK)
 	if(HAS_TRAIT(src, TRAIT_TRANSFORM_ACTIVE))

code/game/objects/items/storage/filled_guncases.dm

@@ -143,7 +143,7 @@
 
 /obj/item/storage/guncase/saw80
 	gun_type = /obj/item/gun/ballistic/automatic/assault/hydra/lmg
-	mag_type = /obj/item/ammo_box/magazine/m556_42_hydra/extended
+	mag_type = /obj/item/ammo_box/magazine/m556_42_hydra // [CELADON-EDIT] Original: /obj/item/ammo_box/magazine/m556_42_hydra/extended
 
 /obj/item/storage/guncase/hydra80
 	gun_type = /obj/item/gun/ballistic/automatic/assault/hydra/indie

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

@@ -4,7 +4,7 @@
 
 	burst_size = 2
 	actions_types = list()
-	fire_delay = 0.1 SECONDS
+	fire_delay = 0.09 SECONDS // [CELADON-EDIT] Original: fire_delay = 0.1 SECONDS
 
 	spread = 6
 	spread_unwielded = 10

code/modules/research/techweb/all_nodes.dm

@@ -721,7 +721,7 @@
 	// [CELADON-EDIT] - CELADON_WEAPONS - Новое пушки и патроны
 	// design_ids = list("ap9mm", "ap10mm", "ap45", "hp9mm", "hp10mm", "hp45", "ap556mmHITP", "hp556mmHITP") // CELADON-EDIT - ORIGINAL
 	// research_costs = list(TECHWEB_POINT_TYPE_GENERIC = 2500) // CELADON-EDIT - ORIGINAL
-	design_ids = list("ap9mm", "ap10mm", "ap45", "hp9mm", "hp10mm", "hp45", "ap556mmHITP", "hp556mmHITP","a556surp","a308_brak")
+	design_ids = list("ap9mm", "ap10mm", "ap45", "hp9mm", "hp10mm", "hp45", "ap556mmHITP", "hp556mmHITP","a308_brak")
 	research_costs = list(TECHWEB_POINT_TYPE_GENERIC = 7500)
 	// [/CELADON-EDIT]
 

mod_celadon/economy/code/exports/weapons.dm

@@ -60,7 +60,7 @@
 
 /datum/export/weapon/g36
 	unit_name = "G36M Rifle"
-	desc = "An extremely powerful modified G36 to satisfy every gun need a pro mercenary can have. Chambered in 5.56x45"
+	desc = "An extremely powerful modified G36 to satisfy every gun need a pro mercenary can have. Chambered in 5.56x42"
 	export_types = list(/obj/item/gun/ballistic/automatic/assault/g36/inteq)
 	cost = 800
 

mod_celadon/mobs/code/simple_animal/faction/solfed.dm

@@ -86,7 +86,7 @@
 	ranged = 1
 	retreat_distance = 3
 	minimum_distance = 5
-	casingtype = /obj/item/ammo_casing/caseless/c556mm
+	casingtype = /obj/item/ammo_casing/a556_42
 	rapid = 3
 	mob_spawner = /obj/effect/mob_spawn/human/corpse/solfed/marine/pistol
 	armor_base = /obj/item/clothing/suit/armor/vest/marine
@@ -99,7 +99,7 @@
 	rapid = 3
 	mob_spawner = /obj/effect/mob_spawn/human/corpse/solfed/marine
 	armor_base = /obj/item/clothing/suit/armor/vest/marine
-	casingtype = /obj/item/ammo_casing/a556_45
+	casingtype = /obj/item/ammo_casing/a556_42
 	r_hand = /obj/item/gun/ballistic/automatic/assault/g36
 	projectilesound = 'mod_celadon/_storage_sounds/sound/gun/g36.ogg'
 

mod_celadon/outpost_console/code/supply_pack/independent/security/ammo.dm

@@ -20,8 +20,7 @@
 > 5.7x39
 > 5.56 caseless
 > 12 Gauge
-> 5.56x42 (Hydra)
-> [-] 5.56x45 (G36)
+> 5.56x42 (Hydra)/obj/item/ammo_casing/a556_42
 > 7.62
 > .45-70
 > .300
@@ -96,7 +95,7 @@ match
 	damage = 20
 	armour_penetration = -10
 */
-- Используют: 
+- Используют:
 - Револьверы: HP Detective
 - Винтовки: Flaming Arrow Lever Action
 
@@ -111,7 +110,7 @@ hp
 	damage = 50
 	armour_penetration = -20
 */
-- Используют: 
+- Используют:
 - Авто-пистолеты: CM-357 (SF)
 - Револьверы: Firebrand / Viper-23 /  Horizon-X (IQ) / Rhino (NT) / R-23 'Viper' (S)
 - Винтовки: Absolution Lever Action
@@ -124,8 +123,8 @@ hp
 	damage = 50
 	armour_penetration = 0
 */
-- Используют: 
-- Револьверы: Shadow / Montagne 
+- Используют:
+- Револьверы: Shadow / Montagne
 - Пистолеты: M20 Auto Elite / Pinscher Heavy Pistol (IQ)
 - SMG: Firestorm
 
@@ -140,7 +139,7 @@ hp
 	damage = 70
 	armour_penetration = -10
 */
-- Используют: 
+- Используют:
 - Револьвер: Ashhand Hunting
 - Винтовки: Beacon Break Action
 
@@ -157,7 +156,7 @@ hp
 	damage = 35
 	armour_penetration = 10
 */
-- Используют: 
+- Используют:
 - Штурмовые: CM-82 / SMR-80 (S) / SAW-80 (S)
 - Снапер-DMR: SBR-80 (S)
 
@@ -172,8 +171,8 @@ hp
 	damage = 50
 	armour_penetration = 10
 */
-- Используют: 
-- Винтовки: Illestren / Model 23 'Woodsman' / 
+- Используют:
+- Винтовки: Illestren / Model 23 'Woodsman' /
 
 
 /* MARK: 7.62x40mm
@@ -187,7 +186,7 @@ hp
 	damage = 40
 	armour_penetration = 10
 */
-- Используют: 
+- Используют:
 - Винтовки: Super Sporter
 - Штурмовые: SKM-24 / SKM-44 (IQ) / CM-24 (SF)
 - LMG: CM-40 (SF)
@@ -203,26 +202,12 @@ hp
 	damage = 60
 	armour_penetration = -10
 */
-- Используют: 
+- Используют:
 - Винтовки:
 - Штурмовые: Morita Mk.I
 - LMG: KM-05 Rottweiler (IQ)
 - Снайпер: SsG-04 (IQ) / CM-F4 (SF)
 
-/* MARK: 5.56x45mm
-bullet
-	damage = 25
-	armour_penetration = 20
-a856
-	damage = 30
-	armour_penetration = 25
-m903
-	damage = 20
-	armour_penetration = 40
-*/
-- Используют:
-- Штурмовые: G36M (IQ)
-
 // SMG
 
 /* MARK: 5.7x39mm
@@ -283,7 +268,7 @@ bullet
 	damage = 40
 	armour_penetration = 50
 */
-- Используют: 
+- Используют:
 - Снайпер: Boomslang-90 / SSG-08 Saluki (IQ) / CM-F90 (SF) / MSR-90 'Boomslang' (S)
 
 /* MARK: 7.62x54mm
@@ -297,7 +282,7 @@ bullet
 	damage = 50
 	armour_penetration = 40
 */
-- Используют: 
+- Используют:
 - Снайпер: Scout Sniper
 
 // Гаусс
@@ -668,22 +653,6 @@ MARK: .22lr
 	cost = 1000
 */
 
-/*
-	MARK: 5.56x45
-*/
-
-// /datum/supply_pack/faction/independent/ammo/box556_box
-// 	name = "5.56x45mm Ammo Box"
-// 	desc = "A box of standard 5.56x45mm ammo."
-// 	contains = list(/obj/item/storage/box/ammo/a556_box)
-// 	cost = 500
-
-// /datum/supply_pack/faction/independent/ammo/box556/a856_box
-// 	name = "5.56x45mm EP Ammo Box"
-// 	desc = "A box of enhanced performance 5.56x45mm ammo."
-// 	contains = list(/obj/item/storage/box/ammo/a556_box/a856)
-// 	cost = 650
-
 /*
 	MARK: 7.62x40
 */

mod_celadon/outpost_console/code/supply_pack/independent/security/magazines.dm

@@ -188,21 +188,21 @@
 
 // /datum/supply_pack/faction/independent/magazine/g36_sh
 // 	name = "G36 Short Magazine Double Pack"
-// 	desc = "Contains two 5.56x45mm magazines for the G36 family rifles, with a capacity of 20 rounds."
+// 	desc = "Contains two 5.56x42mm magazines for the G36 family rifles, with a capacity of 20 rounds."
 // 	contains = list(/obj/item/ammo_box/magazine/g36/sh/empty,
 // 					/obj/item/ammo_box/magazine/g36/sh/empty)
 // 	cost = 1400
 
 // /datum/supply_pack/faction/independent/magazine/g36
 // 	name = "G36 Standard Magazine Double Pack"
-// 	desc = "Contains two 5.56x45mm magazines for the G36 family rifles, with a capacity of 30 rounds."
+// 	desc = "Contains two 5.56x42mm magazines for the G36 family rifles, with a capacity of 30 rounds."
 // 	contains = list(/obj/item/ammo_box/magazine/g36/empty,
 // 					/obj/item/ammo_box/magazine/g36/empty)
 // 	cost = 1950
 
 // /datum/supply_pack/faction/independent/magazine/g36_drum
 // 	name = "G36 Drum Magazine"
-// 	desc = "Contains 5.56x45mm drum magazine for the G36 family rifles, with a capacity of 75 rounds."
+// 	desc = "Contains 5.56x42mm drum magazine for the G36 family rifles, with a capacity of 75 rounds."
 // 	contains = list(/obj/item/ammo_box/magazine/g36/drum/empty)
 // 	cost = 5000
 

mod_celadon/outpost_console/code/supply_pack/inteq/security/ammo.dm

@@ -13,7 +13,6 @@
 > 12 Gauge
 > 7.62x40mm
 > .308
-> 5.56x45mm
 
 MARK: 9x18mm
 */
@@ -199,6 +198,29 @@ MARK: 9x18mm
 	contains = list(/obj/item/storage/box/ammo/a762_40/hp/inteq)
 	cost = 450
 
+/*
+MARK: 5.56x42mm
+*/
+
+/datum/supply_pack/faction/inteq/ammo/a556_ammo_box
+	name = "5.56x42mm Ammo Box"
+	desc = "Contains one 60-round 5.56x42mm box."
+	contains = list(/obj/item/storage/box/ammo/a556_42)
+	cost = 700
+
+/datum/supply_pack/faction/inteq/ammo/a556_ap
+	name = "5.56x42mm Armour Piercing Ammo Box"
+	desc = "Contains one 60-round 5.56x42mm Armour Piercing box."
+	contains = list(/obj/item/storage/box/ammo/a556_42/ap)
+	cost = 1000
+
+/datum/supply_pack/faction/inteq/ammo/a556_hp
+	name = "5.56x42mm Hollow Point Ammo Box"
+	desc = "Contains one 60-round 5.56x42mm Hollow Point box."
+	contains = list(/obj/item/storage/box/ammo/a556_42/hp)
+	cost = 1000
+
+
 /*
 	MARK: .308
 */
@@ -221,28 +243,6 @@ MARK: 9x18mm
 	contains = list(/obj/item/storage/box/ammo/a308/hp)
 	cost = 250
 
-/*
-	MARK: 5.56x45mm
-*/
-
-/datum/supply_pack/faction/inteq/ammo/box556_box
-	name = "5.56x45mm Ammo Box"
-	desc = "Contains two 60-round 5.56x45mm ammo."
-	contains = list(/obj/item/storage/box/ammo/a556_box)
-	cost = 500
-
-/datum/supply_pack/faction/inteq/ammo/box556/a856_box
-	name = "5.56x45mm Enhanced Performance Ammo Box"
-	desc = "Contains one 60-round 5.56x45mm Enhanced Performance ammo."
-	contains = list(/obj/item/storage/box/ammo/a556_box/a856)
-	cost = 650
-
-/datum/supply_pack/faction/inteq/ammo/box556/m903_box
-	name = "5.56x45mm Armour Piercing Ammo Box"
-	desc = "Contains one 60-round 5.56x45mm Armour Piercing ammo."
-	contains = list(/obj/item/storage/box/ammo/a556_box/m903)
-	cost = 1300
-
 /*
 	MARK: 6.5mm / 6.5x57mm
 */

mod_celadon/outpost_console/code/supply_pack/inteq/security/gun.dm

@@ -147,8 +147,8 @@ hp
 */
 
 /datum/supply_pack/faction/inteq/gun/g36
-	name = "Assault-Rifle - G36M (5.56x45mm)"
-	desc = "An extremely powerful modified G36 to satisfy every gun need a pro mercenary can have. Chambered in 5.56x45mm"
+	name = "Assault-Rifle - G36M (5.56x42mm)"
+	desc = "An extremely powerful modified G36 to satisfy every gun need a pro mercenary can have. Chambered in 5.56x42mm"
 	contains = list(/obj/item/storage/guncase/g36/inteq)
 	cost = 8000
 /* MARK: 5.56x45mm

mod_celadon/outpost_console/code/supply_pack/inteq/security/magazines.dm

@@ -97,23 +97,23 @@
 	contains = list(/obj/item/ammo_box/magazine/f4_308/empty)
 	cost = 500
 
-/* 5.56x45mm */
+/* 5.56x42mm */
 
 /datum/supply_pack/faction/inteq/magazine/g36_sh
-	name = "G36 - Short Magazine (5.56x45mm)"
-	desc = "Contains two 5.56x45mm magazines for the G36 family rifles, with a capacity of 20 rounds."
+	name = "G36 - Short Magazine (5.56x42mm)"
+	desc = "Contains two 5.56x42mm magazines for the G36 family rifles, with a capacity of 20 rounds."
 	contains = list(/obj/item/ammo_box/magazine/g36/sh/empty)
 	cost = 500
 
 /datum/supply_pack/faction/inteq/magazine/g36
-	name = "G36 - Standard Magazine (5.56x45mm)"
-	desc = "Contains two 5.56x45mm magazines for the G36 family rifles, with a capacity of 30 rounds."
+	name = "G36 - Standard Magazine (5.56x42mm)"
+	desc = "Contains two 5.56x42mm magazines for the G36 family rifles, with a capacity of 30 rounds."
 	contains = list(/obj/item/ammo_box/magazine/g36/empty)
 	cost = 1000
 
 /datum/supply_pack/faction/inteq/magazine/g36_drum
-	name = "G36 - Drum Magazine (5.56x45mm)"
-	desc = "Contains 5.56x45mm drum magazine for the G36 family rifles, with a capacity of 75 rounds."
+	name = "G36 - Drum Magazine (5.56x42mm)"
+	desc = "Contains 5.56x42mm drum magazine for the G36 family rifles, with a capacity of 75 rounds."
 	contains = list(/obj/item/ammo_box/magazine/g36/drum/empty)
 	cost = 3000
 

mod_celadon/outpost_console/code/supply_pack/solfed/security/ammo.dm

@@ -69,28 +69,6 @@
 	contains = list(/obj/item/storage/box/ammo/c9mm_rubber)
 	cost = 200
 
-/*
-	MARK: 5.56x45mm
-*/
-
-/datum/supply_pack/faction/solfed/ammo/box556_box
-	name = "5.56x45mm Ammo Box"
-	desc = "Contains one 60-round 5.56x45mm ammo."
-	contains = list(/obj/item/storage/box/ammo/a556_box)
-	cost = 500
-
-/datum/supply_pack/faction/solfed/ammo/box556/a856_box
-	name = "5.56x45mm Enhanced Performance Ammo Box"
-	desc = "Contains one 60-round 5.56x45mm Enhanced Performance ammo."
-	contains = list(/obj/item/storage/box/ammo/a556_box/a856)
-	cost = 650
-
-/datum/supply_pack/faction/solfed/ammo/box556/m903_box
-	name = "5.56x45mm Armour Piercing Ammo Box"
-	desc = "Contains one 60-round 5.56x45mm Armour Piercing ammo."
-	contains = list(/obj/item/storage/box/ammo/a556_box/m903)
-	cost = 1300
-
 /*
 	MARK: 5.56 HITP Caseless
 */