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

BonePipeshot #18112

Merged
merged 6 commits into from
Mar 7, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
20 changes: 20 additions & 0 deletions code/modules/projectiles/bullet.dm
Original file line number Diff line number Diff line change
Expand Up @@ -724,6 +724,26 @@ toxic - poisons
implanted = /obj/item/implant/projectile/shrapnel
damage = 10

/datum/projectile/bullet/improvbone
name = "bone"
sname = "bone"
icon_state = "trace"
dissipation_delay = 1
dissipation_rate = 3
damage_type = D_KINETIC
hit_type = DAMAGE_BLUNT
implanted = null
damage = 9
hit_mob_sound = 'sound/effects/skeleton_break.ogg'
impact_image_state = null // in my mind these are just literal bones fragments being thrown at people, wouldn't stick into walls

on_hit(atom/hit)
var/turf/T = get_turf(hit)
T.fluid_react_single("calcium", 2) // Creates 5 units of calcium on hit
on_max_range_die(obj/projectile/O)
var/turf/T = get_turf(O)
T.fluid_react_single("calcium", 2) // Creates 5 units of caclium once it reaches max range.

/datum/projectile/bullet/aex
name = "explosive slug"
shot_sound = 'sound/weapons/shotgunshot.ogg'
Expand Down
13 changes: 13 additions & 0 deletions code/modules/projectiles/special.dm
Original file line number Diff line number Diff line change
Expand Up @@ -250,6 +250,19 @@ ABSTRACT_TYPE(/datum/projectile/special)
spread_angle_variance = 10
dissipation_variance = 10

/datum/projectile/special/spreader/buckshot_burst/bone
spread_projectile_type = /datum/projectile/bullet/improvbone
name = "bone"
sname = "bone"
cost = 1
pellets_to_fire = 3
casing = /obj/item/casing/shotgun/pipe
shot_sound = 'sound/weapons/shotgunshot.ogg'
speed_max = 30
speed_min = 20
spread_angle_variance = 25
dissipation_variance = 40

/datum/projectile/special/spreader/buckshot_burst/nails
name = "nails"
sname = "nails"
Expand Down
7 changes: 7 additions & 0 deletions code/obj/item/assembly/misc_assemblies.dm
Original file line number Diff line number Diff line change
Expand Up @@ -1069,6 +1069,13 @@ ABSTRACT_TYPE(/datum/pipeshotrecipe)
accepteditem = /obj/item/raw_material/shard
craftname = "shard"

/datum/pipeshotrecipe/bone
thingsneeded = 2
result = /obj/item/ammo/bullets/pipeshot/bone
accepteditem = /obj/item/material_piece/bone
craftname = "bone chunk"


/obj/item/assembly/pipehulls
name = "filled pipe hulls"
desc = "Four open pipe shells, with propellant in them. You wonder what you could stuff into them."
Expand Down
4 changes: 4 additions & 0 deletions code/obj/item/gun/ammo.dm
Original file line number Diff line number Diff line change
Expand Up @@ -774,6 +774,10 @@ ABSTRACT_TYPE(/obj/item/ammo/bullets/pipeshot)
amount_left = 5
max_amount = 5

/obj/item/ammo/bullets/pipeshot/bone // scrap handmade bone shells
sname = "bone load"
desc = "This appears to be some bone fragments haphazardly shoved into a few cut open pipe frames - grotesque!"
ammo_type = new/datum/projectile/special/spreader/buckshot_burst/bone

/obj/item/ammo/bullets/nails // oh god oh fuck
sname = "Nails"
Expand Down