cyberpresidentvanellope/Bubberstation
1
0
Fork 0
mirror of https://github.com/Bubberstation/Bubberstation.git synced 2026-08-24 13:38:41 +01:00
Code Issues Packages Projects Releases Wiki Activity

[MIRROR] Stock Part Datumization Complete [MDB IGNORE] (#18639)

Browse Source 
* Stock Part Datumization Complete (#72559)

So i accidently reverted all my commits in #72511 when resolving a merge
conflict So ummm yeah fuck my bad anyway

Finishes what was started in #71693 and completes the
[initiative](https://github.com/tgstation/dev-cycles-initiative/issues/1)

Except for `obj/item/stock_parts/cell` and its subtypes. All machines
now use `datum/stock_part` for its requested components & component
parts

Not sure if i caught every machine & stuff in the game so merge with
caution
🆑
code: datum stock part for every obj stock part
refactor: all machines & dependent experiments to use datum stock parts
/🆑

* Fixes a teeny tiny Funce mistake :)

Co-authored-by: SyncIt21 <110812394+SyncIt21@users.noreply.github.com>
Co-authored-by: GoldenAlpharex <jerego1234@hotmail.com>
This commit is contained in:
SkyratBot
2023-01-19 17:09:19 -05:00
committed by GitHub
co-authored by SyncIt21 GoldenAlpharex
parent 666ec11b53
commit 902caab964
55 changed files with 534 additions and 407 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/hydroponics/biogenerator.dm
+6 -6
View File
@@ -86,13 +86,13 @@
var/new_max_items = 10
var/new_processed_items_per_cycle = 0
for(var/obj/item/stock_parts/matter_bin/bin in component_parts)
new_max_items += MAX_ITEMS_PER_RATING * bin.rating
for(var/datum/stock_part/matter_bin/bin in component_parts)
new_max_items += MAX_ITEMS_PER_RATING * bin.tier
for(var/obj/item/stock_parts/manipulator/manipulator in component_parts)
new_productivity += manipulator.rating
new_efficiency += manipulator.rating
new_processed_items_per_cycle += PROCESSED_ITEMS_PER_RATING * manipulator.rating
for(var/datum/stock_part/manipulator/manipulator in component_parts)
new_productivity += manipulator.tier
new_efficiency += manipulator.tier
new_processed_items_per_cycle += PROCESSED_ITEMS_PER_RATING * manipulator.tier
max_items = new_max_items
efficiency = new_efficiency
code/modules/hydroponics/hydroponics.dm
+4 -4
View File
@@ -162,10 +162,10 @@
/obj/machinery/hydroponics/constructable/RefreshParts()
. = ..()
var/tmp_capacity = 0
for (var/obj/item/stock_parts/matter_bin/M in component_parts)
tmp_capacity += M.rating
for (var/obj/item/stock_parts/manipulator/M in component_parts)
rating = M.rating
for (var/datum/stock_part/matter_bin/matter_bin in component_parts)
tmp_capacity += matter_bin.tier
for (var/datum/stock_part/manipulator/manipulator in component_parts)
rating = manipulator.tier
maxwater = tmp_capacity * 50 // Up to 300
maxnutri = (tmp_capacity * 5) + STATIC_NUTRIENT_CAPACITY // Up to 50 Maximum
reagents.maximum_volume = maxnutri
code/modules/hydroponics/seed_extractor.dm
+4 -4
View File
@@ -90,10 +90,10 @@
/obj/machinery/seed_extractor/RefreshParts()
. = ..()
for(var/obj/item/stock_parts/matter_bin/B in component_parts)
max_seeds = initial(max_seeds) * B.rating
for(var/obj/item/stock_parts/manipulator/M in component_parts)
seed_multiplier = initial(seed_multiplier) * M.rating
for(var/datum/stock_part/matter_bin/matter_bin in component_parts)
max_seeds = initial(max_seeds) * matter_bin.tier
for(var/datum/stock_part/manipulator/manipulator in component_parts)
seed_multiplier = initial(seed_multiplier) * manipulator.tier
/obj/machinery/seed_extractor/examine(mob/user)
. = ..()