Buffs sg29. (#693)

* sg29 to sg25 ammo * Update rifles.dm
PMC-Unga-Marines · Nov 28, 2024 · 3f0fbaa · 3f0fbaa
1 parent bc081c8
commit 3f0fbaa
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 13 deletions.
diff --git a/code/modules/projectiles/ammo_datums/bullet/machinegun.dm b/code/modules/projectiles/ammo_datums/bullet/machinegun.dm
@@ -90,17 +90,6 @@
 	penetration = 10
 	sundering = 1
 
-/datum/ammo/bullet/sg29
-	name = "smartmachinegun bullet"
-	bullet_color = COLOR_SOFT_RED //Red bullets to indicate friendly fire restriction
-	hud_state = "smartgun"
-	hud_state_empty = "smartgun_empty"
-	flags_ammo_behavior = AMMO_BALLISTIC
-	accurate_range = 8
-	damage = 20
-	penetration = 5
-	additional_xeno_penetration = 20
-
 /datum/ammo/bullet/smart_minigun
 	name = "smartminigun bullet"
 	bullet_color = COLOR_SOFT_RED //Red bullets to indicate friendly fire restriction

diff --git a/code/modules/projectiles/guns/rifles.dm b/code/modules/projectiles/guns/rifles.dm
@@ -1355,7 +1355,8 @@
 	starting_attachment_types = list(/obj/item/attachable/stock/sgstock, /obj/item/attachable/sgbarrel)
 	gun_skill_category = SKILL_SMARTGUN //Uses SG skill for the penalties.
 	attachable_offset = list("muzzle_x" = 42, "muzzle_y" = 17,"rail_x" = 15, "rail_y" = 21, "under_x" = 24, "under_y" = 14, "stock_x" = 12, "stock_y" = 13)
-	fire_delay = 0.2 SECONDS
+
+	fire_delay = 0.15 SECONDS
 	burst_amount = 0
 	accuracy_mult_unwielded = 0.5
 	accuracy_mult = 1.1

diff --git a/code/modules/projectiles/magazines/rifles.dm b/code/modules/projectiles/magazines/rifles.dm
@@ -309,7 +309,7 @@
 	icon_state = "sg29"
 	icon_state_mini = "mag_sg29"
 	w_class = WEIGHT_CLASS_NORMAL
-	default_ammo = /datum/ammo/bullet/sg29
+	default_ammo = /datum/ammo/bullet/rifle/t25
 	max_rounds = 250
 	reload_delay = 1.3 SECONDS