diff --git a/modular_doppler/colony_fabricator/code/appliances/wind_turbine.dm b/modular_doppler/colony_fabricator/code/appliances/wind_turbine.dm index 6b4a9b82821f3..3ee0efd219e47 100644 --- a/modular_doppler/colony_fabricator/code/appliances/wind_turbine.dm +++ b/modular_doppler/colony_fabricator/code/appliances/wind_turbine.dm @@ -15,9 +15,9 @@ layer = ABOVE_MOB_LAYER can_change_cable_layer = TRUE /// How much power the turbine makes without a storm - var/regular_power_production = 2500 + var/regular_power_production = 1 KILO WATTS /// How much power the turbine makes during a storm - var/storm_power_production = 10000 + var/storm_power_production = 5 KILO WATTS /// Is our pressure too low to function? var/pressure_too_low = FALSE /// Minimum external pressure needed to work diff --git a/modular_doppler/colony_fabricator/code/colony_fabricator.dm b/modular_doppler/colony_fabricator/code/colony_fabricator.dm index b9c38bd3090bc..946ad8322fecd 100644 --- a/modular_doppler/colony_fabricator/code/colony_fabricator.dm +++ b/modular_doppler/colony_fabricator/code/colony_fabricator.dm @@ -13,8 +13,6 @@ allowed_buildtypes = COLONY_FABRICATOR /// The item we turn into when repacked var/repacked_type = /obj/item/flatpacked_machine - /// The sound loop played while the fabricator is making something - var/datum/looping_sound/colony_fabricator_running/soundloop /obj/machinery/rnd/production/colony_lathe/Initialize(mapload) . = ..() @@ -22,14 +20,9 @@ AddElement(/datum/element/manufacturer_examine, COMPANY_FRONTIER) // We don't get new designs but can't print stuff if something's not researched, so we use the web that has everything researched stored_research = locate(/datum/techweb/admin) in SSresearch.techwebs - soundloop = new(src, FALSE) if(!mapload) flick("colony_lathe_deploy", src) // Sick ass deployment animation -/obj/machinery/rnd/production/colony_lathe/Destroy() - QDEL_NULL(soundloop) - return ..() - // formerly NO_DECONSTRUCTION /obj/machinery/rnd/production/colony_lathe/default_deconstruction_screwdriver(mob/user, icon_state_open, icon_state_closed, obj/item/screwdriver) return NONE @@ -45,14 +38,12 @@ return /obj/machinery/rnd/production/colony_lathe/start_printing_visuals() - soundloop.start() set_light(l_range = 1.5) icon_state = "colony_lathe_working" update_appearance() /obj/machinery/rnd/production/colony_lathe/finalize_build() . = ..() - soundloop.stop() set_light(l_range = 0) icon_state = base_icon_state update_appearance() diff --git a/modular_doppler/colony_fabricator/code/looping_sounds.dm b/modular_doppler/colony_fabricator/code/looping_sounds.dm index a1f26b8fb8d88..f93e7288a5b2e 100644 --- a/modular_doppler/colony_fabricator/code/looping_sounds.dm +++ b/modular_doppler/colony_fabricator/code/looping_sounds.dm @@ -1,17 +1,3 @@ -/datum/looping_sound/colony_fabricator_running - start_sound = 'modular_doppler/colony_fabricator/sounds/fabricator/fabricator_start.wav' - start_length = 1 - mid_sounds = list( - 'modular_doppler/colony_fabricator/sounds/fabricator/fabricator_mid_1.wav' = 1, - 'modular_doppler/colony_fabricator/sounds/fabricator/fabricator_mid_2.wav' = 1, - 'modular_doppler/colony_fabricator/sounds/fabricator/fabricator_mid_3.wav' = 1, - 'modular_doppler/colony_fabricator/sounds/fabricator/fabricator_mid_4.wav' = 1, - ) - mid_length = 3 SECONDS - end_sound = 'modular_doppler/colony_fabricator/sounds/fabricator/fabricator_end.wav' - volume = 100 - falloff_exponent = 3 - /datum/looping_sound/arc_furnace_running mid_sounds = list( 'modular_doppler/colony_fabricator/sounds/arc_furnace/arc_furnace_mid_1.wav' = 1, diff --git a/modular_doppler/colony_fabricator/code/machines/solar_panels.dm b/modular_doppler/colony_fabricator/code/machines/solar_panels.dm index b66640e731315..8d32d5b18a308 100644 --- a/modular_doppler/colony_fabricator/code/machines/solar_panels.dm +++ b/modular_doppler/colony_fabricator/code/machines/solar_panels.dm @@ -14,7 +14,7 @@ return /obj/machinery/power/solar/deployable/on_deconstruction(disassembled) - var/obj/item/solar_assembly/assembly = locate() in src + var/obj/item/solar_assembly/assembly = locate() in contents if(assembly) qdel(assembly) return ..() @@ -69,7 +69,7 @@ return NONE /obj/machinery/power/tracker/deployable/on_deconstruction(disassembled) - var/obj/item/solar_assembly/assembly = locate() in src + var/obj/item/solar_assembly/assembly = locate() in contents if(assembly) qdel(assembly) return ..() diff --git a/modular_doppler/colony_fabricator/code/machines/solid_fuel_generator.dm b/modular_doppler/colony_fabricator/code/machines/solid_fuel_generator.dm index 86bd78f1d062b..e68d48a6a9964 100644 --- a/modular_doppler/colony_fabricator/code/machines/solid_fuel_generator.dm +++ b/modular_doppler/colony_fabricator/code/machines/solid_fuel_generator.dm @@ -14,7 +14,7 @@ anchored = TRUE max_sheets = 25 time_per_sheet = parent_type::time_per_sheet * (5 / 3) //66.6% better - power_gen = parent_type::power_gen * 2.5 + power_gen = 10 KILO JOULES drag_slowdown = 1.5 sheet_path = /obj/item/stack/sheet/mineral/plasma /// The item we turn into when repacked diff --git a/modular_doppler/colony_fabricator/code/machines/stirling_generator.dm b/modular_doppler/colony_fabricator/code/machines/stirling_generator.dm index fcd14acb0d78d..370a528107454 100644 --- a/modular_doppler/colony_fabricator/code/machines/stirling_generator.dm +++ b/modular_doppler/colony_fabricator/code/machines/stirling_generator.dm @@ -20,7 +20,7 @@ /// What this thing deconstructs into var/deconstruction_type = /obj/item/flatpacked_machine/stirling_generator /// Maximum efficient heat difference, at what heat difference does more difference stop meaning anything for power? - var/max_efficient_heat_difference = 8000 + var/max_efficient_heat_difference = 6000 /// Maximum power output from this machine var/max_power_output = 100 KILO WATTS /// How much power the generator is currently making diff --git a/modular_doppler/colony_fabricator/sounds/attributions.txt b/modular_doppler/colony_fabricator/sounds/attributions.txt index 565a818121207..534c8d0c85406 100644 --- a/modular_doppler/colony_fabricator/sounds/attributions.txt +++ b/modular_doppler/colony_fabricator/sounds/attributions.txt @@ -3,9 +3,6 @@ a contributor who no longer wishes to be named specifically for free open source use from the novasector codebase, so don't worry about it. modular_doppler/colony_fabricator/sound/arc_furnace/arc_furnace_mid_(1 - 4).wav -modular_doppler/colony_fabricator/sound/fabricator/fabricator_mid_(1 - 4).wav -modular_doppler/colony_fabricator/sound/fabricator/fabricator_end.wav -modular_doppler/colony_fabricator/sound/fabricator/fabricator_start.wav The following sounds are from https://pixabay.com/sound-effects/wall-air-conditioner-43901/ diff --git a/modular_doppler/colony_fabricator/sounds/fabricator/fabricator_end.wav b/modular_doppler/colony_fabricator/sounds/fabricator/fabricator_end.wav deleted file mode 100644 index 90e16a116fb7d..0000000000000 Binary files a/modular_doppler/colony_fabricator/sounds/fabricator/fabricator_end.wav and /dev/null differ diff --git a/modular_doppler/colony_fabricator/sounds/fabricator/fabricator_mid_1.wav b/modular_doppler/colony_fabricator/sounds/fabricator/fabricator_mid_1.wav deleted file mode 100644 index 5a70874cda7a4..0000000000000 Binary files a/modular_doppler/colony_fabricator/sounds/fabricator/fabricator_mid_1.wav and /dev/null differ diff --git a/modular_doppler/colony_fabricator/sounds/fabricator/fabricator_mid_2.wav b/modular_doppler/colony_fabricator/sounds/fabricator/fabricator_mid_2.wav deleted file mode 100644 index a8ea099036c83..0000000000000 Binary files a/modular_doppler/colony_fabricator/sounds/fabricator/fabricator_mid_2.wav and /dev/null differ diff --git a/modular_doppler/colony_fabricator/sounds/fabricator/fabricator_mid_3.wav b/modular_doppler/colony_fabricator/sounds/fabricator/fabricator_mid_3.wav deleted file mode 100644 index b5d0a0117c5cb..0000000000000 Binary files a/modular_doppler/colony_fabricator/sounds/fabricator/fabricator_mid_3.wav and /dev/null differ diff --git a/modular_doppler/colony_fabricator/sounds/fabricator/fabricator_mid_4.wav b/modular_doppler/colony_fabricator/sounds/fabricator/fabricator_mid_4.wav deleted file mode 100644 index 1700b0fc379bb..0000000000000 Binary files a/modular_doppler/colony_fabricator/sounds/fabricator/fabricator_mid_4.wav and /dev/null differ diff --git a/modular_doppler/colony_fabricator/sounds/fabricator/fabricator_start.wav b/modular_doppler/colony_fabricator/sounds/fabricator/fabricator_start.wav deleted file mode 100644 index 673a9da8b41c3..0000000000000 Binary files a/modular_doppler/colony_fabricator/sounds/fabricator/fabricator_start.wav and /dev/null differ diff --git a/modular_doppler/kahraman_equipment/code/ore_thumper.dm b/modular_doppler/kahraman_equipment/code/ore_thumper.dm index 99b1833aabae4..7221c03e83504 100644 --- a/modular_doppler/kahraman_equipment/code/ore_thumper.dm +++ b/modular_doppler/kahraman_equipment/code/ore_thumper.dm @@ -89,7 +89,7 @@ if(!istype(get_turf(src), /turf/open/misc)) . += span_notice("It must be constructed on suitable terrain, like ash, snow, or sand.") . += span_notice("It must have a powered, wired connection running beneath it with [display_power(active_power_usage, convert = FALSE)] of excess power to function.") - . += span_notice("It will produce a box of materials after it has slammed [slam_jams_needed] times.") + . += span_notice("It will produce materials after it has slammed [slam_jams_needed] times.") . += span_notice("Currently, it has slammed [slam_jams] / [slam_jams_needed] times needed.") . += span_notice("It will stop producing resources if there are too many piles of ore near it.") . += span_notice("The thumper cannot work if it is too close to another thumper, needing at least [ore_spawn_range] spaces in all directions between it another thumper.") @@ -243,10 +243,10 @@ for(var/iteration in 1 to rand(2, 4)) var/turf/target_turf = pick(nearby_valid_turfs) -// var/obj/item/stack/new_ore = pick_weight(ore_weight_list) -// var/obj/new_ore_pile = new new_ore(target_turf, ore_spawn_values[new_ore.type]) + var/obj/item/stack/new_ore = pick_weight(ore_weight_list) + var/obj/new_ore_pile = new new_ore(target_turf, ore_spawn_values[new_ore.type]) new /obj/effect/temp_visual/mook_dust(target_turf) -// playsound(new_ore_pile, 'modular_nova/master_files/sound/effects/robot_sit.ogg', 25, TRUE) port tallborgs soon + playsound(new_ore_pile, 'modular_doppler/kahraman_equipment/sounds/tallborg_sitting_down.ogg', 25, TRUE) slam_jams -= slam_jams_needed diff --git a/modular_doppler/kahraman_equipment/sounds/tallborg_sitting_down.ogg b/modular_doppler/kahraman_equipment/sounds/tallborg_sitting_down.ogg new file mode 100644 index 0000000000000..769d2d43b0b7f Binary files /dev/null and b/modular_doppler/kahraman_equipment/sounds/tallborg_sitting_down.ogg differ