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.

Sign up for GitHub

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

Shatters buff #310

Merged
merged 4 commits into from
Sep 20, 2024
Merged

Shatters buff #310

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
6ed5753
buff
homexp13 Sep 13, 2024
1f9e555
Merge branch 'master_reborn' into ammo_2
homexp13 Sep 13, 2024
94565a3
aim
homexp13 Sep 13, 2024
5d91149
some some
homexp13 Sep 19, 2024
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
2 changes: 1 addition & 1 deletion _maps/map_files/Talos/TGS_Talos.dmm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32271,7 +32271,7 @@
/area/mainship/hull/starboard_hull)
"sSg" = (
/obj/structure/table/mainship,
/obj/item/weapon/gun/rifle/sr127,
/obj/item/weapon/gun/rifle/sniper/antimaterial/sr127,
/turf/open/floor/mainship/metal,
/area/mainship/shipboard/firing_range)
"sSK" = (
Expand Down
2 changes: 1 addition & 1 deletion code/game/objects/effects/landmarks/landmarks.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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/sr127,
/obj/item/weapon/gun/rifle/sniper/antimaterial/sr127,
/obj/item/weapon/gun/rifle/ar11,
/obj/item/weapon/gun/rifle/ar21,
/obj/item/weapon/gun/rifle/mkh,
Expand Down
2 changes: 1 addition & 1 deletion code/game/objects/effects/spawners/random/random_set.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,7 @@
/obj/item/ammo_magazine/rifle/br64,
/obj/item/ammo_magazine/rifle/br64,
),
list(/obj/item/weapon/gun/rifle/sr127,
list(/obj/item/weapon/gun/rifle/sniper/antimaterial/sr127,
/obj/item/ammo_magazine/rifle/sr127,
/obj/item/ammo_magazine/rifle/sr127,
/obj/item/ammo_magazine/rifle/sr127,
Expand Down
2 changes: 1 addition & 1 deletion code/game/objects/effects/spawners/random/weaponry.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
/obj/item/weapon/gun/smg/mp19,
/obj/item/weapon/gun/rifle/dmr37,
/obj/item/weapon/gun/rifle/br64,
/obj/item/weapon/gun/rifle/sr127/unscoped,
/obj/item/weapon/gun/rifle/sniper/antimaterial/sr127,
/obj/item/weapon/gun/shotgun/pump/bolt/unscoped,
/obj/item/weapon/gun/shotgun/double/martini,
/obj/item/weapon/gun/pistol/p14,
Expand Down
6 changes: 3 additions & 3 deletions code/game/objects/machinery/vending/marine_vending.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@
"Marksman" = list(
/obj/item/weapon/gun/rifle/dmr37 = -1,
/obj/item/ammo_magazine/rifle/dmr37 = -1,
/obj/item/weapon/gun/rifle/sr127 = -1,
/obj/item/weapon/gun/rifle/sniper/antimaterial/sr127= -1,
/obj/item/ammo_magazine/rifle/sr127 = -1,
/obj/item/weapon/gun/shotgun/pump/bolt = -1,
/obj/item/ammo_magazine/rifle/boltclip = -1,
Expand Down Expand Up @@ -258,7 +258,7 @@
"Marksman" = list(
/obj/item/weapon/gun/rifle/dmr37 = -1,
/obj/item/ammo_magazine/rifle/dmr37 = -1,
/obj/item/weapon/gun/rifle/sr127 = -1,
/obj/item/weapon/gun/rifle/sniper/antimaterial/sr127= -1,
/obj/item/ammo_magazine/rifle/sr127 = -1,
/obj/item/weapon/gun/shotgun/pump/bolt = -1,
/obj/item/ammo_magazine/rifle/bolt = -1,
Expand Down Expand Up @@ -483,7 +483,7 @@
"Marksman" = list(
/obj/item/weapon/gun/rifle/dmr37 = -1,
/obj/item/ammo_magazine/rifle/dmr37 = -1,
/obj/item/weapon/gun/rifle/sr127 = -1,
/obj/item/weapon/gun/rifle/sniper/antimaterial/sr127= -1,
/obj/item/ammo_magazine/rifle/sr127 = -1,
/obj/item/weapon/gun/shotgun/pump/bolt = -1,
/obj/item/ammo_magazine/rifle/boltclip = -1,
Expand Down
14 changes: 13 additions & 1 deletion code/modules/projectiles/ammo_datums/bullet/shotgun.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,13 +60,25 @@
damage = 45
damage_falloff = 0.5
penetration = 15
additional_xeno_penetration = 30
additional_xeno_penetration = 20
///shatter effection duration when hitting mobs
var/shatter_duration = 8 SECONDS

/datum/ammo/bullet/shotgun/flechette/on_hit_mob(mob/M, obj/projectile/proj)
if(!isliving(M))
return

var/mob/living/living_victim = M
living_victim.apply_status_effect(STATUS_EFFECT_SHATTER, shatter_duration)

/datum/ammo/bullet/shotgun/flechette/flechette_spread
name = "additional flechette"
damage = 35
additional_xeno_penetration = 30

/datum/ammo/bullet/shotgun/flechette/flechette_spread/on_hit_mob(mob/M, obj/projectile/proj)
return

/datum/ammo/bullet/shotgun/buckshot
name = "shotgun buckshot shell"
handful_icon_state = "shotgun buckshot shell"
Expand Down
19 changes: 16 additions & 3 deletions code/modules/projectiles/ammo_datums/bullet/sniper.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,16 @@
damage = 70
penetration = 35
sundering = 0
additional_xeno_penetration = 25
additional_xeno_penetration = 15
///shatter effection duration when hitting mobs
var/shatter_duration = 8 SECONDS

/datum/ammo/bullet/sniper/svd/on_hit_mob(mob/M, obj/projectile/proj)
if(!isliving(M))
return

var/mob/living/living_victim = M
living_victim.apply_status_effect(STATUS_EFFECT_SHATTER, shatter_duration)

/datum/ammo/bullet/sniper/martini
name = "crude heavy sniper bullet"
Expand Down Expand Up @@ -86,11 +95,15 @@
name = "high caliber rifle bullet"
hud_state = "sniper_heavy"
flags_ammo_behavior = AMMO_BALLISTIC|AMMO_SNIPER
damage = 80
damage = 75
penetration = 30
sundering = 7.5
sundering = 0
additional_xeno_penetration = 15
damage_falloff = 0.25

/datum/ammo/bullet/sniper/pfc/on_hit_mob(mob/M, obj/projectile/P)
staggerstun(M, P, slowdown = 1, max_range = 17)

/datum/ammo/bullet/sniper/pfc/flak
name = "high caliber flak rifle bullet"
hud_state = "sniper_heavy_flak"
Expand Down
9 changes: 4 additions & 5 deletions code/modules/projectiles/guns/rifles.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1491,7 +1491,8 @@
//-------------------------------------------------------
//SR-127 bolt action sniper rifle

/obj/item/weapon/gun/rifle/sr127

/obj/item/weapon/gun/rifle/sniper/antimaterial/sr127 //its a subtype of antimaterial. A little complicated, but I don't want to copypast
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'
Expand All @@ -1506,11 +1507,9 @@
inhand_y_dimension = 32
fire_sound = 'sound/weapons/guns/sniper/SR-127/SR127.ogg'
fire_rattle = null
cocked_sound = 'sound/weapons/guns/interact/tl-127_bolt.ogg'
dry_fire_sound = 'sound/weapons/guns/fire/sniper_empty.ogg'
unload_sound = 'sound/weapons/guns/sniper/SR-127/SR127_clipout.ogg'
reload_sound = 'sound/weapons/guns/sniper/SR-127/SR127_clipin.ogg'
cocked_sound = 'sound/weapons/guns/sniper/SR-127/SR127_boltpull.ogg'
silenced_sound = 'sound/weapons/guns/sniper/SR-127/SR127_SIL.ogg'
wield_sound = 'sound/weapons/guns/dmr/Deploy_Wave_DMR.ogg'
caliber = CALIBER_86X70 //codex
Expand All @@ -1534,7 +1533,6 @@
)

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
Helg2 marked this conversation as resolved.
Show resolved Hide resolved

cock_animation = "tl127_cock"
cocked_message = "You rack the bolt!"
Expand Down Expand Up @@ -1562,7 +1560,8 @@
cock_delay = 0.7 SECONDS
movement_acc_penalty_mult = 6

/obj/item/weapon/gun/rifle/sr127/unscoped

/obj/item/weapon/gun/rifle/sniper/antimaterial/sr127/unscoped
starting_attachment_types = list(/obj/item/attachable/stock/sr127stock)

//-------------------------------------------------------
Expand Down
Loading