mirror of
https://github.com/Bubberstation/Bubberstation.git
synced 2026-08-24 05:30:05 +01:00
[MIRROR] Stock Part Datumization Complete [MDB IGNORE] (#18639)
* 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:
co-authored by
SyncIt21
GoldenAlpharex
parent
666ec11b53
commit
902caab964
@@ -4,8 +4,8 @@
|
||||
build_path = /obj/machinery/ltsrbt
|
||||
req_components = list(
|
||||
/obj/item/stack/ore/bluespace_crystal = 2,
|
||||
/obj/item/stock_parts/subspace/ansible = 1,
|
||||
/obj/item/stock_parts/micro_laser = 1,
|
||||
/datum/stock_part/ansible = 1,
|
||||
/datum/stock_part/micro_laser = 1,
|
||||
/datum/stock_part/scanning_module = 2)
|
||||
def_components = list(/obj/item/stack/ore/bluespace_crystal = /obj/item/stack/ore/bluespace_crystal/artificial)
|
||||
|
||||
@@ -56,8 +56,8 @@
|
||||
recharge_cooldown = recharge_time
|
||||
|
||||
power_efficiency = 0
|
||||
for(var/obj/item/stock_parts/micro_laser/laser in component_parts)
|
||||
power_efficiency += laser.rating
|
||||
for(var/datum/stock_part/micro_laser/laser in component_parts)
|
||||
power_efficiency += laser.tier
|
||||
// Shouldn't happen but you never know.
|
||||
if(!power_efficiency)
|
||||
power_efficiency = 1
|
||||
|
||||
Reference in New Issue
Block a user