diff --git a/code/datums/looping_sounds/machinery_sounds.dm b/code/datums/looping_sounds/machinery_sounds.dm index f9a9e07aed..e4c1d64ab9 100644 --- a/code/datums/looping_sounds/machinery_sounds.dm +++ b/code/datums/looping_sounds/machinery_sounds.dm @@ -23,6 +23,14 @@ end_sound = 'sound/machines/generator/generator_end.ogg' volume = 40 +datum/looping_sound/generator/clockwork + start_sound = 'sound/machines/generator/clockwork/clockwork_gen_start.ogg' + start_length = 10 + mid_sounds = 'sound/machines/generator/clockwork/clockwork_gen_mid.ogg' + mid_length = 10 + end_sound = 'sound/machines/generator/clockwork/clockwork_gen_end.ogg' + volume = 65 + /////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// diff --git a/code/game/objects/items/circuitboards/machine_circuitboards.dm b/code/game/objects/items/circuitboards/machine_circuitboards.dm index 8e59e91e38..c4e1168630 100644 --- a/code/game/objects/items/circuitboards/machine_circuitboards.dm +++ b/code/game/objects/items/circuitboards/machine_circuitboards.dm @@ -84,6 +84,16 @@ name = "clockwork board (Report This)" icon_state = "clock_mod" +/obj/item/circuitboard/machine/clockwork/generator + name = "clockwork generator (machine board)" + icon_state = "clock_mod" + build_path = /obj/machinery/power/port_gen/pacman/clockwork + req_components = list( + /obj/item/clockwork/component/replicant_alloy = 1, + /obj/item/clockwork/component/vanguard_cogwheel = 3, + /obj/item/clockwork/component/geis_capacitor = 2, + /obj/item/stack/tile/brass = 5) + /obj/item/circuitboard/machine/clonescanner name = "Cloning Scanner (Machine Board)" build_path = /obj/machinery/dna_scannernew diff --git a/code/game/objects/items/stacks/sheets/sheet_types.dm b/code/game/objects/items/stacks/sheets/sheet_types.dm index 32d65041bc..0cab63efe7 100644 --- a/code/game/objects/items/stacks/sheets/sheet_types.dm +++ b/code/game/objects/items/stacks/sheets/sheet_types.dm @@ -629,6 +629,7 @@ GLOBAL_LIST_INIT(brass_recipes, list ( \ new/datum/stack_recipe("brass table frame", /obj/structure/table_frame/brass, 1, time = 5, one_per_turf = TRUE, on_floor = TRUE), \ new/datum/stack_recipe("brass anvil", /obj/structure/anvil/obtainable/ratvar, 10, time = 15, one_per_turf = TRUE, on_floor = TRUE), \ new/datum/stack_recipe("brass furnace", /obj/structure/furnace/infinite/ratvar, 10, time = 15, one_per_turf = TRUE, on_floor = TRUE), \ + new/datum/stack_recipe("clockwork generator", /obj/machinery/power/port_gen/pacman/clockwork, 15, time = 20, one_per_turf = TRUE, on_floor = TRUE), \ null, \ new/datum/stack_recipe("sender - pressure sensor", /obj/structure/destructible/clockwork/trap/trigger/pressure_sensor, 2, time = 20, one_per_turf = TRUE, on_floor = TRUE), \ new/datum/stack_recipe("sender - mech sensor", /obj/structure/destructible/clockwork/trap/trigger/pressure_sensor/mech, 2, time = 20, one_per_turf = TRUE, on_floor = TRUE), \ diff --git a/code/modules/power/port_gen.dm b/code/modules/power/port_gen.dm index b5ed659e47..f110eb8dc0 100644 --- a/code/modules/power/port_gen.dm +++ b/code/modules/power/port_gen.dm @@ -286,3 +286,18 @@ /obj/machinery/power/port_gen/pacman/mrs/overheat() explosion(src.loc, 4, 4, 4, -1) + + +//////////////// +// CLOCKWORK // +////////////// +/obj/machinery/power/port_gen/pacman/clockwork + name = "clockwork generator" + base_icon = "clockgen" + icon_state = "clockgen_0" + circuit = /obj/item/circuitboard/machine/clockwork/generator + max_sheets = 100 + power_gen = 2500 + sheet_path = /obj/item/stack/tile/brass + time_per_sheet = 260 + /datum/looping_sound/generator/clockwork/soundloop \ No newline at end of file diff --git a/icons/obj/power.dmi b/icons/obj/power.dmi index 9544ea77c0..b599a98f5a 100644 Binary files a/icons/obj/power.dmi and b/icons/obj/power.dmi differ diff --git a/sound/machines/generator/clockwork/clockwork_gen_end.ogg b/sound/machines/generator/clockwork/clockwork_gen_end.ogg new file mode 100644 index 0000000000..7a4537f34c Binary files /dev/null and b/sound/machines/generator/clockwork/clockwork_gen_end.ogg differ diff --git a/sound/machines/generator/clockwork/clockwork_gen_mid.ogg b/sound/machines/generator/clockwork/clockwork_gen_mid.ogg new file mode 100644 index 0000000000..ba2b871bc3 Binary files /dev/null and b/sound/machines/generator/clockwork/clockwork_gen_mid.ogg differ diff --git a/sound/machines/generator/clockwork/clockwork_gen_start.ogg b/sound/machines/generator/clockwork/clockwork_gen_start.ogg new file mode 100644 index 0000000000..5b7927160f Binary files /dev/null and b/sound/machines/generator/clockwork/clockwork_gen_start.ogg differ diff --git a/tgstation.dme b/tgstation.dme index 03e8c6f1e5..14a6a7cd10 100644 --- a/tgstation.dme +++ b/tgstation.dme @@ -1570,7 +1570,6 @@ #include "code\modules\antagonists\clockcult\clock_helpers\component_helpers.dm" #include "code\modules\antagonists\clockcult\clock_helpers\fabrication_helpers.dm" #include "code\modules\antagonists\clockcult\clock_helpers\hierophant_network.dm" -#include "code\modules\antagonists\clockcult\clock_helpers\leader_helpers.dm" #include "code\modules\antagonists\clockcult\clock_helpers\power_helpers.dm" #include "code\modules\antagonists\clockcult\clock_helpers\ratvarian_language.dm" #include "code\modules\antagonists\clockcult\clock_helpers\scripture_checks.dm" @@ -1600,6 +1599,8 @@ #include "code\modules\antagonists\clockcult\clock_structures\_trap_object.dm" #include "code\modules\antagonists\clockcult\clock_structures\ark_of_the_clockwork_justicar.dm" #include "code\modules\antagonists\clockcult\clock_structures\clockwork_obelisk.dm" +#include "code\modules\antagonists\clockcult\clock_structures\eminence_spire.dm" +#include "code\modules\antagonists\clockcult\clock_structures\heralds_beacon.dm" #include "code\modules\antagonists\clockcult\clock_structures\mania_motor.dm" #include "code\modules\antagonists\clockcult\clock_structures\ocular_warden.dm" #include "code\modules\antagonists\clockcult\clock_structures\prolonging_prism.dm"