[SEMI-MODULAR] martini henry (#347)

* martini * memtini * MEMTINI --------- Co-authored-by: Blundir <[email protected]>
Cosmic-Overlord · Feb 8, 2024 · 643b1a0 · 643b1a0
1 parent 86fa5cb
commit 643b1a0
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 2 deletions.
diff --git a/code/modules/projectiles/guns/shotguns.dm b/code/modules/projectiles/guns/shotguns.dm
@@ -477,10 +477,11 @@
 
 	flags_gun_features = GUN_CAN_POINTBLANK|GUN_AMMO_COUNTER|GUN_SMOKE_PARTICLES
 	attachable_offset = list("muzzle_x" = 45, "muzzle_y" = 23,"rail_x" = 17, "rail_y" = 25, "under_x" = 19, "under_y" = 14, "stock_x" = 15, "stock_y" = 12)
-	actions_types = list(/datum/action/item_action/aim_mode)
+/* RU TGMC EDIT
+	actions_types = list(/datum/action/item_action/aim_mode) RU TGMC EDIT
 	aim_slowdown = 0.35
 	aim_time = 0.5 SECONDS
-
+RU TGMC EDIT */
 
 	fire_delay = 1 SECONDS
 

diff --git a/modular_RUtgmc/code/modules/projectiles/ammo_datums.dm b/modular_RUtgmc/code/modules/projectiles/ammo_datums.dm
@@ -109,6 +109,11 @@
 	hitscan_effect_icon = "beam_heavy_charge"
 	bullet_color = COLOR_DISABLER_BLUE
 
+/datum/ammo/bullet/sniper/martini
+	penetration = 40
+
+/datum/ammo/bullet/sniper/martini/on_hit_mob(mob/M, obj/projectile/P)
+	staggerstun(M, P, weaken = 0.5 SECONDS, stagger = 1 SECONDS, knockback = 2, slowdown = 0.5, max_range = 10)
 /*
 //================================================
 					SH-Q6 AMMO DATUMS

diff --git a/modular_RUtgmc/code/modules/projectiles/guns/shotguns.dm b/modular_RUtgmc/code/modules/projectiles/guns/shotguns.dm
@@ -91,3 +91,9 @@
 	hand_reload_sound = 'modular_RUtgmc/sound/weapons/guns/shotgun/SH-35/SH35_shell.ogg'
 	cocked_sound = 		'modular_RUtgmc/sound/weapons/guns/shotgun/SH-39/SH39_pump.ogg'
 	opened_sound = 		'modular_RUtgmc/sound/weapons/guns/shotgun/SH-39/SH39_pump.ogg'
+
+//------------------------------------------------------
+// Martini Henry
+
+/obj/item/weapon/gun/shotgun/double/martini
+	flags_gun_features = GUN_CAN_POINTBLANK|GUN_AMMO_COUNTER|GUN_SMOKE_PARTICLES|GUN_WIELDED_FIRING_ONLY