Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

M20 Claymore Tweak #347

Draft
wants to merge 23 commits into
base: master
Choose a base branch
from
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
21 changes: 21 additions & 0 deletions code/datums/ammo/shrapnel.dm
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,27 @@
stamina_damage = 25
shrapnel_chance = 0

/datum/ammo/bullet/shrapnel/claymore
name = "claymore pellet"
icon_state = "buckshot"
accurate_range_min = 0
flags_ammo_behavior = AMMO_BALLISTIC|AMMO_STOPPED_BY_COVER

accuracy = HIT_ACCURACY_TIER_10
accurate_range = 32
max_range = 8
damage = 40
damage_var_low = 0
damage_var_high = 0
penetration = 0
shell_speed = AMMO_SPEED_TIER_2
shrapnel_chance = 10

/datum/ammo/bullet/shrapnel/claymore/set_bullet_traits()
. = ..()
LAZYADD(traits_to_give, list(
BULLET_TRAIT_ENTRY(/datum/element/bullet_trait_penetrating)
))

/datum/ammo/bullet/shrapnel/hornet_rounds
name = ".22 hornet round"
Expand Down
6 changes: 3 additions & 3 deletions code/game/objects/items/explosives/mine.dm
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
//Stepping directly on the mine will also blow it up
/obj/item/explosive/mine
name = "\improper M20 Claymore anti-personnel mine"
desc = "The M20 Claymore is a directional proximity-triggered anti-personnel mine designed by Armat Systems for use by the United States Colonial Marines. The mine is triggered by movement both on the mine itself, and on the space immediately in front of it. Detonation sprays shrapnel forwards in a 120-degree cone. The words \"FRONT TOWARD ENEMY\" are embossed on the front."
desc = "The M20 Claymore is a directional anti-personnel smart mine of the USCMC. Generates 120 degree cone of shrapnel if a valid target crosses before or over it. On its face, it reads \"FRONT TOWARD ENEMY\"."
icon = 'icons/obj/items/weapons/grenade.dmi'
icon_state = "m20"
force = 5
Expand Down Expand Up @@ -216,8 +216,8 @@
set waitfor = 0

if(!customizable)
create_shrapnel(loc, 12, dir, angle, , cause_data)
cell_explosion(loc, 60, 20, EXPLOSION_FALLOFF_SHAPE_LINEAR, dir, cause_data)
create_shrapnel(loc, 60, dir, angle, /datum/ammo/bullet/shrapnel/claymore, cause_data)
cell_explosion(loc, 60, 30, EXPLOSION_FALLOFF_SHAPE_LINEAR, dir, cause_data)
qdel(src)
else
. = ..()
Expand Down
Loading