Skip to content

Commit

Permalink
beeg changes
Browse files Browse the repository at this point in the history
  • Loading branch information
MajManatee committed Oct 17, 2023
1 parent 902567a commit 66aba32
Show file tree
Hide file tree
Showing 3 changed files with 26 additions and 16 deletions.
10 changes: 5 additions & 5 deletions code/datums/components/crafting/weapons.dm
Original file line number Diff line number Diff line change
Expand Up @@ -425,12 +425,12 @@
time = 0.5 SECONDS
category = CAT_WEAPON_AMMO

/datum/crafting_recipe/mindshatter
name = "Mindshatter Shell"
result = /obj/item/ammo_casing/shotgun/mindshatter
/datum/crafting_recipe/anarchy
name = "Anarchy Shell"
result = /obj/item/ammo_casing/shotgun/anarchy
reqs = list(/obj/item/ammo_casing/shotgun/techshell = 1,
/datum/reagent/medicine/rezadone = 5,// Rezadone because then it garuntees that the damage is fixable.
/datum/reagent/medicine/sal_acid = 2) // because its... melting them?
/obj/item/stack/sheet/plastic = 5, // uhh because we dont have rubber and this is as close as i can get?
/obj/item/stack/sheet/mineral/silver = 5) // mirrors are inlaid with silver so light reflects, so clearly it helps them reflect too, right?
tool_behaviors = list(TOOL_SCREWDRIVER)
time = 0.5 SECONDS
category = CAT_WEAPON_AMMO
Expand Down
25 changes: 18 additions & 7 deletions code/modules/projectiles/ammunition/ballistic/shotgun.dm
Original file line number Diff line number Diff line change
Expand Up @@ -249,10 +249,21 @@
pellets = 2
variance = 3 // the tight spread

/obj/item/ammo_casing/shotgun/mindshatter
name = "mindshatter shell"
desc = "An advanced shotgun shell that has low impact damage, but splashes the target with nanites that eat away at them on a cellular level."
icon_state = "msshell"
projectile_type = /obj/projectile/bullet/pellet/shotgun_mindshatter
pellets = 4
variance = 40
/obj/item/ammo_casing/shotgun/anarchy
name = "anarchy shell"
desc = "An advanced shotgun shell that has low impact damage, wide spread, and loads of pellets that bounce everywhere. Good luck"
icon_state = "anashell"
projectile_type = /obj/projectile/bullet/pellet/shotgun_anarchy
pellets = 10 // AWOOGA!!
variance = 50
ricochets_max = 3

Check failure on line 259 in code/modules/projectiles/ammunition/ballistic/shotgun.dm

View workflow job for this annotation

GitHub Actions / Lints

undefined var 'ricochets_max' on type '/obj/item/ammo_casing/shotgun/anarchy'
reflect_range_decrease = 5

Check failure on line 260 in code/modules/projectiles/ammunition/ballistic/shotgun.dm

View workflow job for this annotation

GitHub Actions / Lints

undefined var 'reflect_range_decrease' on type '/obj/item/ammo_casing/shotgun/anarchy'
multiple_hit = TRUE

Check failure on line 261 in code/modules/projectiles/ammunition/ballistic/shotgun.dm

View workflow job for this annotation

GitHub Actions / Lints

undefined var 'multiple_hit' on type '/obj/item/ammo_casing/shotgun/anarchy'

/obj/item/ammo_casing/shotgun/anarchy/check_ricochet(atom/A)
if(istype(A, /turf/closed))
return TRUE
return FALSE

/obj/item/ammo_casing/shotgun/anarchy/check_ricochet_flag(atom/A)
return TRUE
7 changes: 3 additions & 4 deletions code/modules/projectiles/projectile/bullets/shotgun.dm
Original file line number Diff line number Diff line change
Expand Up @@ -167,10 +167,9 @@
if(damage < 0 && stamina < 0)
qdel(src)

/obj/projectile/bullet/pellet/shotgun_mindshatter
name = "mindshatter pellet"
damage_type = CLONE
damage = 8 // 8x4 at point blank, otherwise probably 8x2
/obj/projectile/bullet/pellet/shotgun_anarchy
name = "anarchy pellet"
damage = 4 // 4x10 at point blank
sharpness = SHARP_NONE

/obj/projectile/bullet/shotgun/slug/rip
Expand Down

0 comments on commit 66aba32

Please sign in to comment.