Skip to content

Commit

Permalink
Adds tech shells to the outpost market, recipe rebalance and buffs (#…
Browse files Browse the repository at this point in the history
…2958)

<!-- Write **BELOW** The Headers and **ABOVE** The comments else it may
not be viewable. -->
<!-- You can view Contributing.MD for a detailed description of the pull
request process. -->

## About The Pull Request

<!-- Describe The Pull Request. Please be sure every change is
documented or this can delay review and even discourage maintainers from
merging your PR! -->

Adds unloaded techshells to the outpost market, 7 shells for 175
credits.

### Recipe changes

- Scatter Laser: 1 Adv Capacitor, 1 Adv Microlaser -> 1 Capacitor, 3
Microlaser, 1 power cell, 5u lithium
- Pulse Slug: 2 Adv Capacitor, 1 Ultra Microlaser -> 3 Capacitor, 1
Microlaser, 1 power cell, 5u lithium
- Scatter Ion: 1 Ansible Crystal, 1 Ultra Microlaser -> 2 Capacitor, 2
Microlaser, 1 scanning module, 5u iron, 5u uranium
- Dragonsbreath : 5u phosphorous -> 10u phosphorous

Changes the scatter ion desc to reflect the new recipe.

### Ammo changes

Scatter laser and ion now fires 8 pellets, instead of 4, variance is 25
from 35
Dragonsbreath now fires 8 pellets instead of 4, deals 8 damage up from
5, variance is 45 from 35.

## Why It's Good For The Game

<!-- Please add a short description of why you think these changes would
benefit the game. If you can't justify it in words, it might not be
worth adding. -->

These techshells were pretty underwhelming for what they were, and
pretty heavily gated behind RND. For all the effort of researching and
printing techshells with scatter lasers for example, you'd get a 60
damage shell on par with an improvised buckshot you made with scrap.

These changes should make them more comparable with standard ammunition
and not so reliant on needing RND. I think techshells are pretty
interesting and adds a versatile combat option.

## Changelog

:cl:
add: Techshell box
add: Techshells to the outpost market for 175 credits
tweak: Scatter ion description
balance: Techshell recipes no longer require higher tier stock parts,
adjusts scatter laser, scatter ion, dragonsbreath and pulse slug recipes
balance: Buffs scatter lasers, scatter ion and dragonsbreath
/:cl:

<!-- Both :cl:'s are required for the changelog to work! You can put
your name to the right of the first :cl: if you want to overwrite your
GitHub username as author ingame. -->
<!-- You can use multiple of the same prefix (they're only used for the
icon ingame) and delete the unneeded ones. Despite some of the tags,
changelogs should generally represent how a player might be affected by
the changes rather than a summary of the PR's contents. -->

---------

Signed-off-by: Gristlebee <[email protected]>
  • Loading branch information
Gristlebee authored Jun 12, 2024
1 parent 25b3614 commit 4626817
Show file tree
Hide file tree
Showing 7 changed files with 40 additions and 16 deletions.
1 change: 1 addition & 0 deletions code/datums/components/crafting/recipes.dm
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@
if(!(result in reqs))
blacklist += result


/**
* Run custom pre-craft checks for this recipe
*
Expand Down
21 changes: 14 additions & 7 deletions code/datums/components/crafting/recipes/weapon.dm
Original file line number Diff line number Diff line change
Expand Up @@ -125,8 +125,10 @@
name = "Pulse Slug Shell"
result = /obj/item/ammo_casing/shotgun/pulseslug
reqs = list(/obj/item/ammo_casing/shotgun/techshell = 1,
/obj/item/stock_parts/capacitor/adv = 2,
/obj/item/stock_parts/micro_laser/ultra = 1)
/obj/item/stock_parts/capacitor = 3,
/obj/item/stock_parts/micro_laser = 1,
/obj/item/stock_parts/cell = 1,
/datum/reagent/lithium = 5)
tools = list(TOOL_SCREWDRIVER)
time = 5
category = CAT_WEAPONRY
Expand All @@ -135,7 +137,7 @@
/datum/crafting_recipe/dragonsbreath
name = "Dragonsbreath Shell"
result = /obj/item/ammo_casing/shotgun/dragonsbreath
reqs = list(/obj/item/ammo_casing/shotgun/techshell = 1, /datum/reagent/phosphorus = 5)
reqs = list(/obj/item/ammo_casing/shotgun/techshell = 1, /datum/reagent/phosphorus = 10)
tools = list(TOOL_SCREWDRIVER)
time = 5
category = CAT_WEAPONRY
Expand All @@ -157,8 +159,11 @@
name = "Ion Scatter Shell"
result = /obj/item/ammo_casing/shotgun/ion
reqs = list(/obj/item/ammo_casing/shotgun/techshell = 1,
/obj/item/stock_parts/micro_laser/ultra = 1,
/obj/item/stock_parts/subspace/crystal = 1)
/obj/item/stock_parts/micro_laser = 2,
/obj/item/stock_parts/capacitor = 2,
/obj/item/stock_parts/scanning_module = 1,
/datum/reagent/iron = 5,
/datum/reagent/uranium = 5)
tools = list(TOOL_SCREWDRIVER)
time = 5
category = CAT_WEAPONRY
Expand All @@ -179,8 +184,10 @@
name = "Scatter Laser Shell"
result = /obj/item/ammo_casing/shotgun/laserscatter
reqs = list(/obj/item/ammo_casing/shotgun/techshell = 1,
/obj/item/stock_parts/capacitor/adv = 1,
/obj/item/stock_parts/micro_laser/high = 1)
/obj/item/stock_parts/capacitor = 1,
/obj/item/stock_parts/micro_laser = 3,
/obj/item/stock_parts/cell = 1,
/datum/reagent/lithium = 5)
tools = list(TOOL_SCREWDRIVER)
time = 5
category = CAT_WEAPONRY
Expand Down
10 changes: 10 additions & 0 deletions code/game/objects/items/storage/boxes.dm
Original file line number Diff line number Diff line change
Expand Up @@ -856,6 +856,16 @@
for(var/i in 1 to 7)
new /obj/item/ammo_casing/shotgun/buckshot(src)

/obj/item/storage/box/techshot
name = "box of unloaded shotgun tech shells"
desc = "A box full of unloaded tech shells, capable of producing a variety of effects once loaded."
icon_state = "techshot_box"
illustration = null

/obj/item/storage/box/techshot/PopulateContents()
for(var/i in 1 to 7)
new /obj/item/ammo_casing/shotgun/techshell(src)

/obj/item/storage/box/beanbag
name = "box of beanbags"
desc = "A box full of beanbag shells."
Expand Down
6 changes: 6 additions & 0 deletions code/modules/cargo/packs/ammo.dm
Original file line number Diff line number Diff line change
Expand Up @@ -70,6 +70,12 @@
cost = 500
contains = list(/obj/item/ammo_box/a12g/slug)

/datum/supply_pack/ammo/techshells
name = "Unloaded Shotgun Technological Shells Crate"
desc = "Contains a box of 7 versatile tech shells, capable of producing a variety of deadly effects for any situation. Some assembly required."
cost = 210
contains = list(/obj/item/storage/box/techshot)

/*
.38 ammo
*/
Expand Down
16 changes: 8 additions & 8 deletions code/modules/projectiles/ammunition/ballistic/shotgun.dm
Original file line number Diff line number Diff line change
Expand Up @@ -111,8 +111,8 @@
desc = "A shotgun shell which fires a spread of incendiary pellets."
icon_state = "dragonsbreath"
projectile_type = /obj/projectile/bullet/incendiary/shotgun/dragonsbreath
pellets = 4
variance = 35
pellets = 8
variance = 45

/obj/item/ammo_casing/shotgun/meteorslug
name = "meteorslug shell"
Expand All @@ -128,20 +128,20 @@

/obj/item/ammo_casing/shotgun/ion
name = "ion shell"
desc = "An advanced shotgun shell which uses a subspace ansible crystal to produce an effect similar to a standard ion rifle. \
The unique properties of the crystal split the pulse into a spread of individually weaker bolts."
desc = "An advanced shotgun shell which uses a micro laser to focus the effects of an EMP reaction to produce an effect similar to a standard ion rifle. \
The more uncontrolled nature of the reaction causes the pulse to spread into multiple individually weaker bolts."
icon_state = "ion"
projectile_type = /obj/projectile/ion/weak
pellets = 4
variance = 35
pellets = 8
variance = 25

/obj/item/ammo_casing/shotgun/laserscatter
name = "scatter laser shell"
desc = "An advanced shotgun shell that uses a micro laser to replicate the effects of a scatter laser weapon in a ballistic package."
icon_state = "laser"
projectile_type = /obj/projectile/beam/weak
pellets = 4 //WS edit: makes scatter lasers based again
variance = 35
pellets = 8
variance = 25

/obj/item/ammo_casing/shotgun/pulseslug
name = "pulse slug"
Expand Down
2 changes: 1 addition & 1 deletion code/modules/projectiles/projectile/bullets/shotgun.dm
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@

/obj/projectile/bullet/incendiary/shotgun/dragonsbreath
name = "dragonsbreath pellet"
damage = 5
damage = 8
armour_penetration = -35

/obj/projectile/bullet/slug/stun
Expand Down
Binary file modified icons/obj/storage.dmi
Binary file not shown.

0 comments on commit 4626817

Please sign in to comment.