Skip to content

Commit

Permalink
Tonight on Fix+QoL Gear.... (#6011)
Browse files Browse the repository at this point in the history
<!-- 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
TONIGHT ON FIX GEAR:
Hammond beats the mech lathe with a wrench until it produces the correct
version of the efficient mech harness!
James sends a formal complaint to the Ramune soda corporation until they
fill their bottles up with the same amount of liquid as the other sodas.
Jeremy spends 5 quid to give all miners a mining scanner in their
lockers.
The Stig raids an FTU shuttle and makes the circuit boards for the
Phazon obtainable with research!
And finally
We get a look at the slimmed down RPED code, since someone decided to
redeclare things that didn't need to be redeclared, in preparation for
the RPED 2 (Powercells and Beakers Edition).

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

## Why It's Good For The Game
You already have to play an expensive gacha to obtain a full phazon
frame. The makers of the gacha made the boards inaccessible, making it
essentially admin spawn. Since nobody went and made it admin spawn, it
is now player obtainable, if difficult.
Miners should have a basic ore scanner in their lockers. They shouldn't
have to be something that map makers have to put in. This changes that.
Nobody tested the efficient mech harness craft, and all this time it's
been crafting the basic one, but for more materials. This has been
fixed.
The ramune soda maybe should have only have 20 units in it, but c'mon,
we can spring for 10 more units for the hard working people of the
station.
<!-- Argue for the merits of your changes and how they benefit the game,
especially if they are controversial and/or far reaching. If you can't
actually explain WHY what you are doing will improve the game, then it
probably isn't good for the game in the first place. -->

## Changelog

<!-- If your PR modifies aspects of the game that can be concretely
observed by players or admins you should add a changelog. If your change
does NOT meet this description, remove this section. Be sure to properly
mark your PRs to prevent unnecessary GBP loss. You can read up on GBP
and it's effects on PRs in the tgstation guides for contributors. Please
note that maintainers freely reserve the right to remove and add tags
should they deem it appropriate. You can attempt to finagle the system
all you want, but it's best to shoot for clear communication right off
the bat. -->

:cl:
fix: The upgraded mech harness is now an actual upgraded mech harness.
Next time, watch your build path!
fix: Miners now start with a baseline ore detector in their lockers. We
ideally want miners to actually somewhat target their explosives/drills,
no?
fix: Players can now realistically, if criminally, create a Phazon if
they are willing to put the time and effort in.
qol:Ramune Sodas now have 30 units of fizzy melon goodness, instead of
20.
/: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. -->

---------

Co-authored-by: TheObserver-sys <[email protected]>
  • Loading branch information
TheObserver-sys and TheObserver-sys authored Sep 23, 2023
1 parent b500a44 commit ebceb1d
Show file tree
Hide file tree
Showing 5 changed files with 21 additions and 10 deletions.
8 changes: 0 additions & 8 deletions code/game/objects/items/stock_parts/part_replacer.dm
Original file line number Diff line number Diff line change
Expand Up @@ -31,15 +31,7 @@
name = "advanced rapid part exchange device"
desc = "A special mechanical module made to store, sort, and apply standard machine parts. This one has a greatly upgraded storage capacity"
icon_state = "RPED"
w_class = ITEMSIZE_HUGE
can_hold = list(/obj/item/stock_parts)
storage_slots = 200
use_to_pickup = 1
allow_quick_gather = 1
allow_quick_empty = 1
collection_mode = 1
display_contents_with_number = 1
max_w_class = ITEMSIZE_NORMAL
max_storage_space = 400
materials = list(
MAT_STEEL = 12000,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -79,6 +79,7 @@
/obj/item/flashlight/lantern,
/obj/item/shovel,
/obj/item/pickaxe,
/obj/item/mining_scanner,
/obj/item/gps/mining,
/obj/item/survivalcapsule,
/obj/item/clothing/glasses/material,
Expand Down
2 changes: 1 addition & 1 deletion code/modules/food/food/cans.dm
Original file line number Diff line number Diff line change
Expand Up @@ -139,7 +139,7 @@

/obj/item/reagent_containers/food/drinks/cans/ramune/Initialize(mapload)
. = ..()
reagents.add_reagent("ramune", 20)
reagents.add_reagent("ramune", 30)

/obj/item/reagent_containers/food/drinks/cans/starkist
name = "\improper Star-kist"
Expand Down
18 changes: 18 additions & 0 deletions code/modules/research/designs/circuits/circuits.dm
Original file line number Diff line number Diff line change
Expand Up @@ -472,6 +472,24 @@ CIRCUITS BELOW
req_tech = list(TECH_DATA = 4, TECH_COMBAT = 2, TECH_ILLEGAL = 4)
build_path = /obj/item/circuitboard/mecha/honker/targeting

/datum/design/circuit/mecha/phazon_main
design_name = "'Phazon' central control"
id = "phazon_main"
req_tech = list(TECH_DATA = 6, TECH_COMBAT = 4, TECH_BLUESPACE = 6, TECH_ARCANE = 2)
build_path = /obj/item/circuitboard/mecha/phazon/main

/datum/design/circuit/mecha/phazon_peri
design_name = "'Phazon' peripherals control"
id = "phazon_peri"
req_tech = list(TECH_DATA = 6, TECH_COMBAT = 4, TECH_BLUESPACE = 6, TECH_ARCANE = 2)
build_path = /obj/item/circuitboard/mecha/phazon/peripherals

/datum/design/circuit/mecha/phazon_targ
design_name = "'Phazon' weapon control and targeting"
id = "phazon_targ"
req_tech = list(TECH_DATA = 6, TECH_COMBAT = 4, TECH_BLUESPACE = 6, TECH_ARCANE = 2)
build_path = /obj/item/circuitboard/mecha/phazon/targeting

/datum/design/circuit/mecha/reticent_main
design_name = "'Reticent' central control"
id = "reticent_main"
Expand Down
2 changes: 1 addition & 1 deletion code/modules/research/designs/mechfab_designs.dm
Original file line number Diff line number Diff line change
Expand Up @@ -947,7 +947,7 @@
id = "melectricalhigh"
req_tech = list(TECH_ENGINEERING = 5, TECH_POWER = 5, TECH_MATERIAL = 4)
materials = list(MAT_STEEL = 3000, MAT_GLASS = 4000, MAT_PLASTIC = 5000, MAT_GOLD = 5000)
build_path = /obj/item/mecha_parts/component/electrical
build_path = /obj/item/mecha_parts/component/electrical/high_current

/datum/design/science/mecha_component/hull
design_name = "Mecha Hull"
Expand Down

0 comments on commit ebceb1d

Please sign in to comment.