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.

Sign up for GitHub

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

Tonight on Fix+QoL Gear.... #6011

Merged
merged 7 commits into from
Sep 23, 2023
+21 −10
Merged

Tonight on Fix+QoL Gear.... #6011

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
ce8fc40
Merge remote-tracking branch 'Upstream/master'
Aug 8, 2023
11eac2f
Merge remote-tracking branch 'Upstream/master'
Aug 24, 2023
013f7b4
Merge remote-tracking branch 'Upstream/master'
Sep 22, 2023
356a97c
Is it sad I make PRs only when enough shit annoys
Sep 22, 2023
cf46433
a missed comma
Sep 22, 2023
decd908
Removing the cell/beaker stuff for now. New PR inc
Sep 22, 2023
1cd20f0
Merge remote-tracking branch 'Upstream/master' into Fixes2AnotherOne
Sep 23, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 0 additions & 8 deletions code/game/objects/items/stock_parts/part_replacer.dm
View file
Open in desktop
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
1 change: 1 addition & 0 deletions code/game/objects/structures/crates_lockers/closets/secure/cargo.dm
View file
Open in desktop
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
View file
Open in desktop
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
View file
Open in desktop
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
View file
Open in desktop
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