Skip to content

Commit 484ec30

Browse files
committed
Move thermoelectric generator into its own module
1 parent 47429ca commit 484ec30

File tree

5 files changed

+30
-30
lines changed

5 files changed

+30
-30
lines changed

code/game/objects/items/circuitboards/machinery/power.dm

Lines changed: 0 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -27,34 +27,6 @@
2727
/obj/item/stock_parts/capacitor = 6
2828
) // The apc part is to supply upkeep power, so it charges the battery instead of draining it. Capacitors make things go faster.
2929

30-
/obj/item/stock_parts/circuitboard/teg_turbine
31-
name = "circuitboard (thermoelectric generator turbine)"
32-
build_path = /obj/machinery/atmospherics/binary/circulator
33-
board_type = "machine"
34-
origin_tech = @'{"powerstorage":4,"engineering":4}'
35-
req_components = list(
36-
/obj/item/stock_parts/manipulator = 3,
37-
/obj/item/stock_parts/matter_bin = 3
38-
)
39-
additional_spawn_components = list(
40-
/obj/item/stock_parts/power/apc/buildable = 1
41-
)
42-
43-
/obj/item/stock_parts/circuitboard/teg_turbine/motor
44-
name = "circuitboard (thermoelectric generator motor)"
45-
build_path = /obj/machinery/generator
46-
board_type = "machine"
47-
origin_tech = @'{"powerstorage":4,"engineering":4}'
48-
req_components = list(
49-
/obj/item/stock_parts/manipulator = 2,
50-
/obj/item/stock_parts/capacitor = 4
51-
)
52-
additional_spawn_components = list(
53-
/obj/item/stock_parts/console_screen = 1,
54-
/obj/item/stock_parts/keyboard = 1,
55-
/obj/item/stock_parts/power/apc/buildable = 1
56-
)
57-
5830
/obj/item/stock_parts/circuitboard/breaker
5931
name = "circuitboard (breaker box)"
6032
build_path = /obj/machinery/power/breakerbox

code/modules/atmospherics/components/binary_devices/circulator.dm renamed to code/modules/thermoelectric_generator/circulator.dm

File renamed without changes.
File renamed without changes.
Lines changed: 27 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,27 @@
1+
/obj/item/stock_parts/circuitboard/teg_turbine
2+
name = "circuitboard (thermoelectric generator turbine)"
3+
build_path = /obj/machinery/atmospherics/binary/circulator
4+
board_type = "machine"
5+
origin_tech = @'{"powerstorage":4,"engineering":4}'
6+
req_components = list(
7+
/obj/item/stock_parts/manipulator = 3,
8+
/obj/item/stock_parts/matter_bin = 3
9+
)
10+
additional_spawn_components = list(
11+
/obj/item/stock_parts/power/apc/buildable = 1
12+
)
13+
14+
/obj/item/stock_parts/circuitboard/teg_turbine/motor
15+
name = "circuitboard (thermoelectric generator motor)"
16+
build_path = /obj/machinery/generator
17+
board_type = "machine"
18+
origin_tech = @'{"powerstorage":4,"engineering":4}'
19+
req_components = list(
20+
/obj/item/stock_parts/manipulator = 2,
21+
/obj/item/stock_parts/capacitor = 4
22+
)
23+
additional_spawn_components = list(
24+
/obj/item/stock_parts/console_screen = 1,
25+
/obj/item/stock_parts/keyboard = 1,
26+
/obj/item/stock_parts/power/apc/buildable = 1
27+
)

nebula.dme

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1759,7 +1759,6 @@
17591759
#include "code\modules\atmospherics\components\tvalve.dm"
17601760
#include "code\modules\atmospherics\components\valve.dm"
17611761
#include "code\modules\atmospherics\components\binary_devices\binary_atmos_base.dm"
1762-
#include "code\modules\atmospherics\components\binary_devices\circulator.dm"
17631762
#include "code\modules\atmospherics\components\binary_devices\oxyregenerator.dm"
17641763
#include "code\modules\atmospherics\components\binary_devices\passive_gate.dm"
17651764
#include "code\modules\atmospherics\components\binary_devices\pump.dm"
@@ -3443,7 +3442,6 @@
34433442
#include "code\modules\power\cable.dm"
34443443
#include "code\modules\power\cell.dm"
34453444
#include "code\modules\power\debug_items.dm"
3446-
#include "code\modules\power\generator.dm"
34473445
#include "code\modules\power\gravitygenerator.dm"
34483446
#include "code\modules\power\heavycable.dm"
34493447
#include "code\modules\power\port_gen.dm"
@@ -3874,6 +3872,9 @@
38743872
#include "code\modules\synthesized_instruments\real_instruments\Synthesizer\synthesizer.dm"
38753873
#include "code\modules\synthesized_instruments\real_instruments\Trumpet\trumpet.dm"
38763874
#include "code\modules\synthesized_instruments\real_instruments\Violin\violin.dm"
3875+
#include "code\modules\thermoelectric_generator\circulator.dm"
3876+
#include "code\modules\thermoelectric_generator\generator.dm"
3877+
#include "code\modules\thermoelectric_generator\teg_circuits.dm"
38773878
#include "code\modules\tools\tool.dm"
38783879
#include "code\modules\tools\archetypes\_tool_defines.dm"
38793880
#include "code\modules\tools\archetypes\tool_archetype.dm"

0 commit comments

Comments
 (0)