Skip to content

Commit

Permalink
SH-46 Combat Shotgun (Cosmic-Overlord#352)
Browse files Browse the repository at this point in the history 
* SHQ6

* SH-46 combat shotgun

* sound & fix

* num

* tweak

* num

* num

* fix

* num

* num

* num

* num

* num

* num

* desc
  • Loading branch information
@fe-ed
fe-ed authored Jan 18, 2024
1 parent bf2f1ce commit b425d20
Show file tree
Hide file tree
Showing 11 changed files with 149 additions and 4 deletions.
11 changes: 7 additions & 4 deletions modular_RUtgmc/code/game/objects/machinery/vending/marine_vending.dm
View file
Original file line number Diff line number Diff line change
Expand Up @@ -484,14 +484,15 @@
"Shotgun" = list(
/obj/item/weapon/gun/shotgun/pump/t35 = -1,
/obj/item/weapon/gun/shotgun/combat/standardmarine = -1,
/obj/item/storage/holster/belt/ts34/full = 5,
/obj/item/weapon/gun/shotgun/combat/shq6 = -1,
/obj/item/ammo_magazine/shotgun = -1,
/obj/item/ammo_magazine/shotgun/buckshot = -1,
/obj/item/ammo_magazine/shotgun/flechette = -1,
/obj/item/ammo_magazine/shotgun/tracker = -1,
/obj/item/weapon/gun/rifle/standard_autoshotgun = -1,
/obj/item/ammo_magazine/rifle/tx15_flechette = -1,
/obj/item/ammo_magazine/rifle/tx15_slug = -1,
/obj/item/storage/holster/belt/ts34/full = 5,
),
"Machinegun" = list(
/obj/item/weapon/gun/rifle/standard_lmg = -1,
Expand Down Expand Up @@ -703,14 +704,15 @@
"Shotgun" = list(
/obj/item/weapon/gun/shotgun/pump/t35 = -1,
/obj/item/weapon/gun/shotgun/combat/standardmarine = -1,
/obj/item/storage/holster/belt/ts34/full = 5,
/obj/item/weapon/gun/shotgun/combat/shq6 = -1,
/obj/item/ammo_magazine/shotgun = -1,
/obj/item/ammo_magazine/shotgun/buckshot = -1,
/obj/item/ammo_magazine/shotgun/flechette = -1,
/obj/item/ammo_magazine/shotgun/tracker = -1,
/obj/item/weapon/gun/rifle/standard_autoshotgun = -1,
/obj/item/ammo_magazine/rifle/tx15_flechette = -1,
/obj/item/ammo_magazine/rifle/tx15_slug = -1,
/obj/item/storage/holster/belt/ts34/full = 5,
),
"Machinegun" = list(
/obj/item/weapon/gun/rifle/standard_lmg = -1,
Expand Down Expand Up @@ -910,15 +912,16 @@
"Shotgun" = list(
/obj/item/weapon/gun/shotgun/pump/t35 = -1,
/obj/item/weapon/gun/shotgun/combat/standardmarine = -1,
/obj/item/weapon/gun/shotgun/double/marine = -1,
/obj/item/storage/holster/belt/ts34/full = -1,
/obj/item/weapon/gun/shotgun/combat/shq6 = -1,
/obj/item/ammo_magazine/shotgun = -1,
/obj/item/ammo_magazine/shotgun/buckshot = -1,
/obj/item/ammo_magazine/shotgun/flechette = -1,
/obj/item/ammo_magazine/shotgun/tracker = -1,
/obj/item/weapon/gun/rifle/standard_autoshotgun = -1,
/obj/item/ammo_magazine/rifle/tx15_flechette = -1,
/obj/item/ammo_magazine/rifle/tx15_slug = -1,
/obj/item/weapon/gun/shotgun/double/marine = -1,
/obj/item/storage/holster/belt/ts34/full = -1,
),
"Machinegun" = list(
/obj/item/weapon/gun/rifle/standard_lmg = -1,
Expand Down
79 changes: 79 additions & 0 deletions modular_RUtgmc/code/modules/projectiles/ammo_datums.dm
View file
Original file line number Diff line number Diff line change
Expand Up @@ -109,6 +109,85 @@
hitscan_effect_icon = "beam_heavy_charge"
bullet_color = COLOR_DISABLER_BLUE

/*
//================================================
SH-Q6 AMMO DATUMS
//================================================
*/

/datum/ammo/bullet/shotgun/buckshot/shq6
name = "shotgun buckshot shell"
handful_icon_state = "shotgun buckshot shell"
icon_state = "buckshot"
hud_state = "shotgun_buckshot"
bonus_projectiles_type = /datum/ammo/bullet/shotgun/spread
bonus_projectiles_amount = 5
bonus_projectiles_scatter = 3
accuracy_var_low = 9
accuracy_var_high = 9
accurate_range = 4
max_range = 10
damage = 40
sundering = 2
damage_falloff = 4

/datum/ammo/bullet/shotgun/buckshot/shq6/on_hit_mob(mob/M,obj/projectile/P)
staggerstun(M, P, knockback = 1, slowdown = 1, max_range = 3)

/datum/ammo/bullet/shotgun/slug/shq6
name = "shotgun slug"
handful_icon_state = "shotgun slug"
hud_state = "shotgun_slug"
flags_ammo_behavior = AMMO_BALLISTIC|AMMO_SUNDERING
shell_speed = 3
max_range = 15
damage = 100
penetration = 30
sundering = 3
damage_falloff = 3

/datum/ammo/bullet/shotgun/slug/shq6/on_hit_mob(mob/M,obj/projectile/P)
staggerstun(M, P, slowdown = 2, max_range = 5)

/datum/ammo/bullet/shotgun/incendiary/shq6
name = "incendiary slug"
handful_icon_state = "incendiary slug"
hud_state = "shotgun_fire"
damage_type = BRUTE
flags_ammo_behavior = AMMO_BALLISTIC|AMMO_INCENDIARY|AMMO_SUNDERING
max_range = 15
damage = 70
penetration = 15
sundering = 1
bullet_color = COLOR_TAN_ORANGE

/datum/ammo/bullet/shotgun/incendiary/shq6/on_hit_mob(mob/M, obj/projectile/P)
staggerstun(M, P, knockback = 1)

/datum/ammo/bullet/shotgun/flechette/shq6
name = "shotgun flechette shell"
handful_icon_state = "shotgun flechette shell"
icon_state = "flechette"
hud_state = "shotgun_flechette"
flags_ammo_behavior = AMMO_BALLISTIC|AMMO_SUNDERING
bonus_projectiles_type = /datum/ammo/bullet/shotgun/flechette/flechette_spread/shq6
bonus_projectiles_amount = 2
bonus_projectiles_scatter = 3
accuracy_var_low = 8
accuracy_var_high = 8
max_range = 15
damage = 50
damage_falloff = 3
penetration = 40
sundering = 4

/datum/ammo/bullet/shotgun/flechette/flechette_spread/shq6
name = "additional flechette"
damage = 40
penetration = 40
sundering = 2
damage_falloff = 3

/*
//================================================
Xeno Spits
Expand Down
63 changes: 63 additions & 0 deletions modular_RUtgmc/code/modules/projectiles/guns/shotguns.dm
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,69 @@
slot_r_hand_str = 'icons/mob/items_righthand_1.dmi',
)

//-------------------------------------------------------
//SH-46 semi automatic shotgun.

/obj/item/weapon/gun/shotgun/combat/shq6
name = "\improper SH-46 combat shotgun"
desc = "The SH-46, is a semi-automatic, 12 Gauge, gas piston-operated shotgun, released for TGMC by CAU."
force = 20 //Has a stock already
flags_equip_slot = ITEM_SLOT_BACK
icon = 'modular_RUtgmc/icons/Marine/gun64.dmi'
icon_state = "shq6"
item_state = "shq6"
item_icons = list(
slot_s_store_str = 'modular_RUtgmc/icons/mob/suit_slot.dmi',
slot_back_str = 'modular_RUtgmc/icons/mob/clothing/back.dmi',
slot_l_hand_str = 'modular_RUtgmc/icons/mob/items_lefthand_1.dmi',
slot_r_hand_str = 'modular_RUtgmc/icons/mob/items_righthand_1.dmi',
)
fire_sound = 'modular_RUtgmc/sound/weapons/guns/shotgun/SH-46/SH46.ogg'
hand_reload_sound = 'modular_RUtgmc/sound/weapons/guns/shotgun/SH-46/SH46_shell.ogg'
cocked_sound = 'modular_RUtgmc/sound/weapons/guns/shotgun/SH-46/SH46_boltpull.ogg'
flags_gun_features = GUN_CAN_POINTBLANK|GUN_AMMO_COUNTER|GUN_SMOKE_PARTICLES|GUN_WIELDED_FIRING_ONLY
max_chamber_items = 5
default_ammo_type = /datum/ammo/bullet/shotgun/buckshot
attachable_allowed = list(
/obj/item/attachable/bayonet,
/obj/item/attachable/bayonetknife,
/obj/item/attachable/bayonetknife/som,
/obj/item/attachable/reddot,
/obj/item/attachable/verticalgrip,
/obj/item/attachable/angledgrip,
/obj/item/attachable/gyro,
/obj/item/attachable/flashlight,
/obj/item/attachable/flashlight/under,
/obj/item/attachable/extended_barrel,
/obj/item/attachable/heavy_barrel,
/obj/item/attachable/compensator,
/obj/item/attachable/magnetic_harness,
/obj/item/attachable/motiondetector,
)

starting_attachment_types = null
attachable_offset = list("muzzle_x" = 52, "muzzle_y" = 20,"rail_x" = 24, "rail_y" = 22, "under_x" = 35, "under_y" = 14, "stock_x" = 13, "stock_y" = 13)

fire_delay = 3 //one shot every 0.3 seconds.
accuracy_mult = 1.05
scatter = 3
damage_mult = 0.6 //40% less damage.
recoil = 0.5
wield_delay = 0.6 SECONDS
aim_slowdown = 0.2

//It's very fast shogun, it's made to prevent stagger/weaken spam.
/obj/item/weapon/gun/shotgun/combat/shq6/get_ammo()
. = ..()
switch(ammo_datum_type)
if(/datum/ammo/bullet/shotgun/buckshot)
return /datum/ammo/bullet/shotgun/buckshot/shq6
if(/datum/ammo/bullet/shotgun/slug)
return /datum/ammo/bullet/shotgun/slug/shq6
if(/datum/ammo/bullet/shotgun/flechette)
return /datum/ammo/bullet/shotgun/flechette/shq6
if(/datum/ammo/bullet/shotgun/incendiary)
return /datum/ammo/bullet/shotgun/incendiary/shq6

//-------------------------------------------------------
//SH-39 semi automatic shotgun. Used by marines.
Expand Down
Binary file modified modular_RUtgmc/icons/Marine/gun64.dmi
View file
Binary file not shown.
Binary file modified modular_RUtgmc/icons/mob/clothing/back.dmi
View file
Binary file not shown.
Binary file modified modular_RUtgmc/icons/mob/items_lefthand_1.dmi
View file
Binary file not shown.
Binary file modified modular_RUtgmc/icons/mob/items_righthand_1.dmi
View file
Binary file not shown.
Binary file modified modular_RUtgmc/icons/mob/suit_slot.dmi
View file
Binary file not shown.
Binary file added modular_RUtgmc/sound/weapons/guns/shotgun/SH-46/SH46.ogg
View file
Binary file not shown.
Binary file added modular_RUtgmc/sound/weapons/guns/shotgun/SH-46/SH46_boltpull.ogg
View file
Binary file not shown.
Binary file added modular_RUtgmc/sound/weapons/guns/shotgun/SH-46/SH46_shell.ogg
View file
Binary file not shown.

0 comments on commit b425d20

Please sign in to comment.