Skip to content

Commit

Permalink
Scrap Audit - Circuit Board Removals and Additions + Mech Wreck Chass…
Browse files Browse the repository at this point in the history
…is Additions (#4003)

## About The Pull Request

Does what it says on the tin.
- Removes Communications, Launchpads, broken-ass EXPERIMENTOR machines,
and cloning from circuit board drops.
- Adds engines (for use in emergency repairs) and SMES as circuit drops.
- Removes HONK mechs from potential exosuit part loot drops.
- Adds Chassis to potential mech part drops. Why salvage otherwise?
- Adds power cells to hivebot loot drops, to complete the stock parts
list.
- Makes various exosuit boards somewhat more common, to make gambling
for them worthwhile.

## Why It's Good For The Game

Waste loot has been left... untouched for a fair while. With Cloning and
Sellpads (major things we don't want in players' hands), Communications
(requesting nuclear codes) and others still available I decided to cull
those. This also makes going and spending time on a waste (or multiple
wastes) to salvage mech parts and potentially build a scrap mech
actually possible now. You just couldn't before.

Also, adds a way to get better power cells (non-weapon cells). You have
to kick the hell out of Hivebots though to get the chance to get one.

## Changelog

:cl:
balance: Loot adjustments on waste planets.
/:cl:

Co-authored-by: FalloutFalcon <[email protected]>
  • Loading branch information
firebudgy and FalloutFalcon authored Jan 17, 2025
1 parent 19366fc commit 11483f2
Show file tree
Hide file tree
Showing 3 changed files with 20 additions and 18 deletions.
6 changes: 6 additions & 0 deletions code/game/mecha/mecha_wreckage.dm
Original file line number Diff line number Diff line change
Expand Up @@ -114,6 +114,7 @@
icon_state = "gygax-broken"
parts = list(
/obj/item/mecha_parts/part/gygax_torso,
/obj/item/mecha_parts/chassis/gygax,
/obj/item/mecha_parts/part/gygax_head,
/obj/item/mecha_parts/part/gygax_left_arm,
/obj/item/mecha_parts/part/gygax_right_arm,
Expand Down Expand Up @@ -147,6 +148,7 @@
name = "\improper Ripley wreckage"
icon_state = "ripley-broken"
parts = list(/obj/item/mecha_parts/part/ripley_torso,
/obj/item/mecha_parts/chassis/ripley,
/obj/item/mecha_parts/part/ripley_left_arm,
/obj/item/mecha_parts/part/ripley_right_arm,
/obj/item/mecha_parts/part/ripley_left_leg,
Expand All @@ -156,6 +158,7 @@
name = "\improper Rogue wreckage"
icon_state = "clipripley-broken"


/obj/structure/mecha_wreckage/ripley/mkii
name = "\improper Ripley MK-II wreckage"
icon_state = "ripleymkii-broken"
Expand All @@ -165,6 +168,7 @@
icon_state = "firefighter-broken"
parts = list(/obj/item/mecha_parts/part/ripley_torso,
/obj/item/mecha_parts/part/ripley_left_arm,
/obj/item/mecha_parts/chassis/ripley,
/obj/item/mecha_parts/part/ripley_right_arm,
/obj/item/mecha_parts/part/ripley_left_leg,
/obj/item/mecha_parts/part/ripley_right_leg,
Expand Down Expand Up @@ -193,6 +197,7 @@
icon_state = "durand-broken"
parts = list(
/obj/item/mecha_parts/part/durand_torso,
/obj/item/mecha_parts/chassis/durand,
/obj/item/mecha_parts/part/durand_head,
/obj/item/mecha_parts/part/durand_left_arm,
/obj/item/mecha_parts/part/durand_right_arm,
Expand All @@ -213,6 +218,7 @@
icon_state = "odysseus-broken"
parts = list(
/obj/item/mecha_parts/part/odysseus_torso,
/obj/item/mecha_parts/chassis/odysseus,
/obj/item/mecha_parts/part/odysseus_head,
/obj/item/mecha_parts/part/odysseus_left_arm,
/obj/item/mecha_parts/part/odysseus_right_arm,
Expand Down
29 changes: 11 additions & 18 deletions code/game/objects/effects/spawners/random/boards.dm
Original file line number Diff line number Diff line change
Expand Up @@ -160,11 +160,9 @@
/obj/item/circuitboard/machine/cell_charger = 5,
/obj/item/circuitboard/machine/chem_heater = 5,
/obj/item/circuitboard/machine/chem_master = 5,
/obj/item/circuitboard/machine/clonescanner = 5,
/obj/item/circuitboard/machine/cryo_tube = 5,
/obj/item/circuitboard/machine/cyborgrecharger = 5,
/obj/item/circuitboard/machine/deep_fryer = 5,
/obj/item/circuitboard/machine/experimentor = 5,
/obj/item/circuitboard/machine/holopad = 5,
/obj/item/circuitboard/machine/hydroponics = 5,
/obj/item/circuitboard/machine/limbgrower = 5,
Expand All @@ -179,8 +177,8 @@
/obj/item/circuitboard/machine/reagentgrinder = 5,
/obj/item/circuitboard/machine/recharger = 5,
/obj/item/circuitboard/machine/seed_extractor = 5,
/obj/item/circuitboard/machine/selling_pad = 5,
/obj/item/circuitboard/machine/emitter = 5,
/obj/item/circuitboard/machine/smes = 5,
)

/obj/effect/spawner/random/circuit
Expand All @@ -192,25 +190,24 @@
/obj/item/circuitboard/machine/chem_dispenser = 5,
/obj/item/circuitboard/machine/circuit_imprinter = 5,
/obj/item/circuitboard/machine/protolathe = 5,
/obj/item/circuitboard/machine/clonepod/experimental = 5,
/obj/item/circuitboard/machine/rad_collector = 5,
/obj/item/circuitboard/machine/launchpad = 5,
/obj/item/circuitboard/machine/shuttle/engine/electric = 5,
/obj/item/circuitboard/machine/shuttle/smes = 5,
)

/obj/effect/spawner/random/circuit/machine/mech
loot = list(
/obj/item/circuitboard/mecha/ripley/main = 100,
/obj/item/circuitboard/mecha/ripley/peripherals = 100,
/obj/item/circuitboard/mecha/honker/main = 5,
/obj/item/circuitboard/mecha/honker/peripherals = 5,
/obj/item/circuitboard/mecha/odysseus/main = 5,
/obj/item/circuitboard/mecha/odysseus/peripherals = 5,
/obj/item/circuitboard/mecha/gygax/main = 1,
/obj/item/circuitboard/mecha/gygax/peripherals = 1,
/obj/item/circuitboard/mecha/gygax/targeting = 1,
/obj/item/circuitboard/mecha/durand/main = 1,
/obj/item/circuitboard/mecha/durand/peripherals = 1,
/obj/item/circuitboard/mecha/durand/targeting = 1,
/obj/item/circuitboard/mecha/odysseus/main = 25,
/obj/item/circuitboard/mecha/odysseus/peripherals = 25,
/obj/item/circuitboard/mecha/gygax/main = 20,
/obj/item/circuitboard/mecha/gygax/peripherals = 20,
/obj/item/circuitboard/mecha/gygax/targeting = 20,
/obj/item/circuitboard/mecha/durand/main = 20,
/obj/item/circuitboard/mecha/durand/peripherals = 20,
/obj/item/circuitboard/mecha/durand/targeting = 20,
)

//COMPUTER
Expand All @@ -222,13 +219,10 @@
/obj/item/circuitboard/computer/arcade/orion_trail = 5,
/obj/item/circuitboard/computer/atmos_alert = 5,
/obj/item/circuitboard/computer/card = 5,
/obj/item/circuitboard/computer/cloning = 5,
/obj/item/circuitboard/computer/communications = 5,
/obj/item/circuitboard/computer/launchpad_console = 5,
/obj/item/circuitboard/computer/mech_bay_power_console = 5,
/obj/item/circuitboard/computer/pandemic = 5,
/obj/item/circuitboard/computer/powermonitor/secret = 5,
/obj/item/circuitboard/computer/prototype_cloning = 5,
/obj/item/circuitboard/computer/stationalert = 5,
/obj/item/circuitboard/computer/teleporter = 5,
/obj/item/circuitboard/computer/operating = 5,
Expand All @@ -239,7 +233,6 @@
/obj/effect/spawner/random/circuit/computer/rare
loot = list(
/obj/item/circuitboard/computer/cargo = 5,
/obj/item/circuitboard/computer/communications = 5,
/obj/item/circuitboard/computer/shuttle/helm = 5,
/obj/item/circuitboard/computer/med_data = 5,
)
3 changes: 3 additions & 0 deletions code/game/objects/effects/spawners/random/waste_planet.dm
Original file line number Diff line number Diff line change
Expand Up @@ -116,6 +116,7 @@
/obj/item/stock_parts/manipulator/nano,
/obj/item/stock_parts/micro_laser/high,
/obj/item/stock_parts/matter_bin/adv,
/obj/item/stock_parts/cell/super/empty,
)
spawn_loot_count = 1
spawn_loot_chance = 100
Expand All @@ -127,6 +128,7 @@
/obj/item/stock_parts/manipulator/pico,
/obj/item/stock_parts/micro_laser/ultra,
/obj/item/stock_parts/matter_bin/super,
/obj/item/stock_parts/cell/hyper/empty,
)


Expand All @@ -137,6 +139,7 @@
/obj/item/stock_parts/manipulator/femto,
/obj/item/stock_parts/micro_laser/quadultra,
/obj/item/stock_parts/matter_bin/bluespace,
/obj/item/stock_parts/cell/bluespace/empty,
)


Expand Down

0 comments on commit 11483f2

Please sign in to comment.