Нерф СР 127 (#740)

* QOL passthrow marine with Hugger * make force tweak * move resist change now it works * fix * Нерф СР 127 * fix
PMC-Unga-Marines · Dec 5, 2024 · 8d06dc2 · 8d06dc2
1 parent 002ed22
commit 8d06dc2
Show file tree

Hide file tree

Showing 6 changed files with 12 additions and 10 deletions.
diff --git a/code/game/objects/effects/landmarks/landmarks.dm b/code/game/objects/effects/landmarks/landmarks.dm
@@ -389,7 +389,7 @@
 		/obj/item/weapon/gun/shotgun/pump/trenchgun,
 		/obj/item/weapon/gun/flamer/big_flamer,
 		/obj/item/weapon/gun/pistol/auto9,
-		/obj/item/weapon/gun/rifle/sniper/antimaterial/sr127,
+		/obj/item/weapon/gun/rifle/sr127,
 		/obj/item/weapon/gun/rifle/ar11,
 		/obj/item/weapon/gun/rifle/ar21,
 		/obj/item/weapon/gun/rifle/mkh,

diff --git a/code/game/objects/effects/spawners/random/random_set.dm b/code/game/objects/effects/spawners/random/random_set.dm
@@ -72,7 +72,7 @@
 			/obj/item/ammo_magazine/rifle/br64,
 			/obj/item/ammo_magazine/rifle/br64,
 		),
-		list(/obj/item/weapon/gun/rifle/sniper/antimaterial/sr127,
+		list(/obj/item/weapon/gun/rifle/sr127,
 			/obj/item/ammo_magazine/rifle/sr127,
 			/obj/item/ammo_magazine/rifle/sr127,
 			/obj/item/ammo_magazine/rifle/sr127,

diff --git a/code/game/objects/effects/spawners/random/weaponry.dm b/code/game/objects/effects/spawners/random/weaponry.dm
@@ -14,7 +14,7 @@
 		/obj/item/weapon/gun/rifle/type71,
 		/obj/item/weapon/gun/rifle/dmr37,
 		/obj/item/weapon/gun/rifle/br64,
-		/obj/item/weapon/gun/rifle/sniper/antimaterial/sr127,
+		/obj/item/weapon/gun/rifle/sr127,
 		/obj/item/weapon/gun/shotgun/pump/bolt/unscoped,
 		/obj/item/weapon/gun/shotgun/double/martini,
 		/obj/item/weapon/gun/pistol/p14,

diff --git a/code/game/objects/machinery/vending/marine_vending.dm b/code/game/objects/machinery/vending/marine_vending.dm
@@ -41,7 +41,7 @@
 		"Снайперские винтовки" = list(
 			/obj/item/weapon/gun/rifle/dmr37 = -1,
 			/obj/item/ammo_magazine/rifle/dmr37 = -1,
-			/obj/item/weapon/gun/rifle/sniper/antimaterial/sr127= -1,
+			/obj/item/weapon/gun/rifle/sr127= -1,
 			/obj/item/ammo_magazine/rifle/sr127 = -1,
 			/obj/item/weapon/gun/rifle/sniper/svd = -1,
 			/obj/item/ammo_magazine/sniper/svd = -1,
@@ -287,7 +287,7 @@
 		"Снайперские винтовки" = list(
 			/obj/item/weapon/gun/rifle/dmr37 = -1,
 			/obj/item/ammo_magazine/rifle/dmr37 = -1,
-			/obj/item/weapon/gun/rifle/sniper/antimaterial/sr127= -1,
+			/obj/item/weapon/gun/rifle/sr127= -1,
 			/obj/item/ammo_magazine/rifle/sr127 = -1,
 			/obj/item/weapon/gun/revolver/r44/coltrifle = -1,
 			/obj/item/ammo_magazine/revolver/rifle = -1,
@@ -499,7 +499,7 @@
 		"Снайперские винтовки" = list(
 			/obj/item/weapon/gun/rifle/dmr37 = -1,
 			/obj/item/ammo_magazine/rifle/dmr37 = -1,
-			/obj/item/weapon/gun/rifle/sniper/antimaterial/sr127= -1,
+			/obj/item/weapon/gun/rifle/sr127= -1,
 			/obj/item/ammo_magazine/rifle/sr127 = -1,
 			/obj/item/weapon/gun/rifle/sniper/svd = -1,
 			/obj/item/ammo_magazine/sniper/svd = -1,

diff --git a/code/modules/projectiles/ammo_datums/bullet/sniper.dm b/code/modules/projectiles/ammo_datums/bullet/sniper.dm
@@ -95,10 +95,10 @@
 	name = "high caliber rifle bullet"
 	hud_state = "sniper_heavy"
 	flags_ammo_behavior = AMMO_BALLISTIC|AMMO_SNIPER
-	damage = 75
+	damage = 80
 	penetration = 30
 	sundering = 0
-	additional_xeno_penetration = 15
+	additional_xeno_penetration = 0
 	damage_falloff = 0.25
 
 /datum/ammo/bullet/sniper/pfc/on_hit_mob(mob/M, obj/projectile/P)

diff --git a/code/modules/projectiles/guns/rifles.dm b/code/modules/projectiles/guns/rifles.dm
@@ -1510,7 +1510,7 @@
 //SR-127 bolt action sniper rifle
 
 
-/obj/item/weapon/gun/rifle/sniper/antimaterial/sr127 //its a subtype of antimaterial. A little complicated, but I don't want to copypast
+/obj/item/weapon/gun/rifle/sr127
 	name = "\improper SR-127 Bauer bolt action rifle"
 	desc = "The Bauer SR-127 is the standard issue bolt action rifle used by the TGMC. Known for its long range accuracy and use by marksmen despite its age and lack of IFF, though careful aim allows fire support from behind. It has an irremoveable scope. Uses 8.6×70mm box magazines."
 	icon = 'icons/Marine/gun64.dmi'
@@ -1530,6 +1530,7 @@
 	reload_sound =   'sound/weapons/guns/sniper/SR-127/SR127_clipin.ogg'
 	silenced_sound = 'sound/weapons/guns/sniper/SR-127/SR127_SIL.ogg'
 	wield_sound =    'sound/weapons/guns/dmr/Deploy_Wave_DMR.ogg'
+	cocked_sound = 'sound/weapons/guns/sniper/SR-127/SR127_boltpull.ogg'
 	caliber = CALIBER_86X70 //codex
 	max_shells = 10 //codex
 	default_ammo_type = /obj/item/ammo_magazine/rifle/sr127
@@ -1551,6 +1552,7 @@
 	)
 
 	flags_gun_features = GUN_WIELDED_FIRING_ONLY|GUN_AMMO_COUNTER|GUN_SMOKE_PARTICLES
+	reciever_flags = AMMO_RECIEVER_REQUIRES_UNIQUE_ACTION|AMMO_RECIEVER_MAGAZINES|AMMO_RECIEVER_UNIQUE_ACTION_LOCKS|AMMO_RECIEVER_AUTO_EJECT
 
 	cock_animation = "tl127_cock"
 	cocked_message = "You rack the bolt!"
@@ -1579,7 +1581,7 @@
 	movement_acc_penalty_mult = 6
 
 
-/obj/item/weapon/gun/rifle/sniper/antimaterial/sr127/unscoped
+/obj/item/weapon/gun/rifle/sr127/unscoped
 	starting_attachment_types = list(/obj/item/attachable/stock/sr127stock)
 
 //-------------------------------------------------------