diff --git a/code/datums/looping_sounds/machinery_sounds.dm b/code/datums/looping_sounds/machinery_sounds.dm index bcf7d2a1a3..4f6996bfdd 100644 --- a/code/datums/looping_sounds/machinery_sounds.dm +++ b/code/datums/looping_sounds/machinery_sounds.dm @@ -23,14 +23,6 @@ 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 4fe8a4293e..4873962587 100644 --- a/code/game/objects/items/circuitboards/machine_circuitboards.dm +++ b/code/game/objects/items/circuitboards/machine_circuitboards.dm @@ -84,16 +84,6 @@ 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 118ecbbb6f..9f126f492b 100644 --- a/code/game/objects/items/stacks/sheets/sheet_types.dm +++ b/code/game/objects/items/stacks/sheets/sheet_types.dm @@ -630,7 +630,6 @@ 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/antagonists/clockcult/clock_mobs/_eminence.dm b/code/modules/antagonists/clockcult/clock_mobs/_eminence.dm index 365cf964d0..b41c71a650 100644 --- a/code/modules/antagonists/clockcult/clock_mobs/_eminence.dm +++ b/code/modules/antagonists/clockcult/clock_mobs/_eminence.dm @@ -252,7 +252,9 @@ E.eminence_help() -//Returns to the Ark - Going along with their superior mobility +/* + +//Returns to the Ark - Commented out and replaced with obelisk_jump /datum/action/innate/eminence/ark_jump name = "Return to Ark" desc = "Warps you to the Ark." @@ -265,8 +267,8 @@ owner.playsound_local(owner, 'sound/magic/magic_missile.ogg', 50, TRUE) flash_color(owner, flash_color = "#AF0AAF", flash_time = 25) else - to_chat(owner, "There is no Ark to warp to, ascendant one.") - + to_chat(owner, "There is no Ark!") +*/ //Warps to a chosen Obelisk /datum/action/innate/eminence/obelisk_jump diff --git a/code/modules/antagonists/clockcult/clockcult.dm b/code/modules/antagonists/clockcult/clockcult.dm index ce343dbdfa..ef10ad7877 100644 --- a/code/modules/antagonists/clockcult/clockcult.dm +++ b/code/modules/antagonists/clockcult/clockcult.dm @@ -7,7 +7,6 @@ antag_moodlet = /datum/mood_event/cult skill_modifiers = list(/datum/skill_modifier/job/level/wiring, /datum/skill_modifier/job/level/dwarfy/blacksmithing) var/datum/action/innate/hierophant/hierophant_network = new - var/datum/action/innate/eminence_ascend = new threat = 3 var/datum/team/clockcult/clock_team var/make_team = TRUE //This should be only false for tutorial scarabs @@ -33,7 +32,6 @@ /datum/antagonist/clockcult/Destroy() qdel(hierophant_network) - qdel(eminence_ascend) return ..() /datum/antagonist/clockcult/get_team() @@ -138,7 +136,6 @@ hierophant_network.span_for_name = "nezbere" hierophant_network.span_for_message = "brass" hierophant_network.Grant(current) - eminence_ascend.Grant(current) current.throw_alert("clockinfo", /obj/screen/alert/clockwork/infodump) var/obj/structure/destructible/clockwork/massive/celestial_gateway/G = GLOB.ark_of_the_clockwork_justiciar if(G && G.active && ishuman(current)) diff --git a/code/modules/power/port_gen.dm b/code/modules/power/port_gen.dm index f110eb8dc0..b5ed659e47 100644 --- a/code/modules/power/port_gen.dm +++ b/code/modules/power/port_gen.dm @@ -286,18 +286,3 @@ /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 b599a98f5a..9544ea77c0 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 deleted file mode 100644 index 7a4537f34c..0000000000 Binary files a/sound/machines/generator/clockwork/clockwork_gen_end.ogg and /dev/null differ diff --git a/sound/machines/generator/clockwork/clockwork_gen_mid.ogg b/sound/machines/generator/clockwork/clockwork_gen_mid.ogg deleted file mode 100644 index ba2b871bc3..0000000000 Binary files a/sound/machines/generator/clockwork/clockwork_gen_mid.ogg and /dev/null differ diff --git a/sound/machines/generator/clockwork/clockwork_gen_start.ogg b/sound/machines/generator/clockwork/clockwork_gen_start.ogg deleted file mode 100644 index 5b7927160f..0000000000 Binary files a/sound/machines/generator/clockwork/clockwork_gen_start.ogg and /dev/null differ