From b33df4745cd6ca06903bd97a63a883fa260b4143 Mon Sep 17 00:00:00 2001 From: ZomgPonies Date: Fri, 25 Jul 2014 11:33:37 -0400 Subject: [PATCH] Removed deprecated power generation stuff (AM, RUST) to free up more procs --- baystation12.dme | 25 ------------------- code/controllers/master_controller.dm | 4 +++ code/datums/supplypacks.dm | 4 +-- .../items/stacks/sheets/sheet_types.dm | 5 ++-- code/game/turfs/simulated/walls.dm | 4 +-- code/modules/admin/verbs/mapping.dm | 2 +- .../particle_accelerator/particle.dm | 2 ++ 7 files changed, 14 insertions(+), 32 deletions(-) diff --git a/baystation12.dme b/baystation12.dme index 21a99a5d2b9..44918128cfe 100644 --- a/baystation12.dme +++ b/baystation12.dme @@ -847,7 +847,6 @@ #include "code\modules\customitems\item_defines.dm" #include "code\modules\customitems\item_spawning.dm" #include "code\modules\customitems\definitions\base.dm" -#include "code\modules\destilery\main.dm" #include "code\modules\detectivework\detective_work.dm" #include "code\modules\detectivework\evidence.dm" #include "code\modules\detectivework\footprints_and_rag.dm" @@ -931,7 +930,6 @@ #include "code\modules\library\lib_items.dm" #include "code\modules\library\lib_machines.dm" #include "code\modules\library\lib_readme.dm" -#include "code\modules\liquid\splash_simulation.dm" #include "code\modules\media\broadcast.dm" #include "code\modules\media\jukebox.dm" #include "code\modules\media\machinery.dm" @@ -1219,9 +1217,6 @@ #include "code\modules\power\terminal.dm" #include "code\modules\power\tracker.dm" #include "code\modules\power\turbine.dm" -#include "code\modules\power\antimatter\containment_jar.dm" -#include "code\modules\power\antimatter\control.dm" -#include "code\modules\power\antimatter\shielding.dm" #include "code\modules\power\singularity\collector.dm" #include "code\modules\power\singularity\containment_field.dm" #include "code\modules\power\singularity\emitter.dm" @@ -1460,31 +1455,11 @@ #include "code\WorkInProgress\Cael_Aislinn\Jungle\jungle_turfs.dm" #include "code\WorkInProgress\Cael_Aislinn\Jungle\misc_helpers.dm" #include "code\WorkInProgress\Cael_Aislinn\Rust\areas.dm" -#include "code\WorkInProgress\Cael_Aislinn\Rust\circuits_and_design.dm" -#include "code\WorkInProgress\Cael_Aislinn\Rust\core_control.dm" -#include "code\WorkInProgress\Cael_Aislinn\Rust\core_field.dm" -#include "code\WorkInProgress\Cael_Aislinn\Rust\core_gen.dm" -#include "code\WorkInProgress\Cael_Aislinn\Rust\core_monitor.dm" -#include "code\WorkInProgress\Cael_Aislinn\Rust\fuel_assembly.dm" -#include "code\WorkInProgress\Cael_Aislinn\Rust\fuel_assembly_port.dm" -#include "code\WorkInProgress\Cael_Aislinn\Rust\fuel_assembly_port_construction.dm" -#include "code\WorkInProgress\Cael_Aislinn\Rust\fuel_compressor.dm" -#include "code\WorkInProgress\Cael_Aislinn\Rust\fuel_compressor_construction.dm" -#include "code\WorkInProgress\Cael_Aislinn\Rust\fuel_control.dm" -#include "code\WorkInProgress\Cael_Aislinn\Rust\fuel_injector.dm" -#include "code\WorkInProgress\Cael_Aislinn\Rust\fusion_reactions.dm" -#include "code\WorkInProgress\Cael_Aislinn\Rust\gyrotron.dm" -#include "code\WorkInProgress\Cael_Aislinn\Rust\gyrotron_controller.dm" -#include "code\WorkInProgress\Cael_Aislinn\Rust\radiation.dm" -#include "code\WorkInProgress\Cael_Aislinn\Rust\virtual_particle_catcher.dm" #include "code\WorkInProgress\Cael_Aislinn\ShieldGen\circuits_and_designs.dm" #include "code\WorkInProgress\Cael_Aislinn\ShieldGen\energy_field.dm" #include "code\WorkInProgress\Cael_Aislinn\ShieldGen\shield_capacitor.dm" #include "code\WorkInProgress\Cael_Aislinn\ShieldGen\shield_gen.dm" #include "code\WorkInProgress\Cael_Aislinn\ShieldGen\shield_gen_external.dm" -#include "code\WorkInProgress\Cael_Aislinn\Supermatter\Laser2.dm" -#include "code\WorkInProgress\Cael_Aislinn\Supermatter\LaserComputer.dm" -#include "code\WorkInProgress\Cael_Aislinn\Supermatter\ZeroPointLaser.dm" #include "code\WorkInProgress\Chinsky\ashtray.dm" #include "code\WorkInProgress\Chinsky\guestpass.dm" #include "code\WorkInProgress\Cib\MedicalSideEffects.dm" diff --git a/code/controllers/master_controller.dm b/code/controllers/master_controller.dm index 9d5f11b85bf..4e62555e369 100644 --- a/code/controllers/master_controller.dm +++ b/code/controllers/master_controller.dm @@ -224,10 +224,12 @@ datum/controller/game_controller/proc/process() processEvents() events_cost = (world.timeofday - timer) / 10 +/* //PUDDLES timer = world.timeofday processPuddles() puddles_cost = (world.timeofday - timer) / 10 +*/ //TICKER timer = world.timeofday @@ -325,6 +327,7 @@ datum/controller/game_controller/proc/process() checkEvent() +/* /datum/controller/game_controller/proc/processPuddles() last_thing_processed = /datum/puddle @@ -332,6 +335,7 @@ datum/controller/game_controller/proc/process() if (Puddle) Puddle.process() continue +*/ datum/controller/game_controller/proc/Recover() //Mostly a placeholder for now. var/msg = "## DEBUG: [time2text(world.timeofday)] MC restarted. Reports:\n" diff --git a/code/datums/supplypacks.dm b/code/datums/supplypacks.dm index 06c4f7b407e..b11c5a680d5 100755 --- a/code/datums/supplypacks.dm +++ b/code/datums/supplypacks.dm @@ -941,7 +941,7 @@ var/list/all_supply_groups = list("Operations","Security","Hospitality","Enginee containertype = /obj/structure/closet containername = "Formalwear for the best occasions." group = "Operations" - +/* /datum/supply_packs/rust_injector contains = list(/obj/machinery/power/rust_fuel_injector) name = "RUST fuel injector" @@ -977,7 +977,7 @@ var/list/all_supply_groups = list("Operations","Security","Hospitality","Enginee containername = "RUST tokamak crate" group = "Engineering" access = access_engine - +*/ /datum/supply_packs/shield_gen contains = list(/obj/item/weapon/circuitboard/shield_gen) name = "Experimental shield generator circuitry" diff --git a/code/game/objects/items/stacks/sheets/sheet_types.dm b/code/game/objects/items/stacks/sheets/sheet_types.dm index cb677ac6e9b..1cc1ac1695e 100644 --- a/code/game/objects/items/stacks/sheets/sheet_types.dm +++ b/code/game/objects/items/stacks/sheets/sheet_types.dm @@ -103,8 +103,9 @@ var/global/list/datum/stack_recipe/plasteel_recipes = list ( \ new/datum/stack_recipe("AI core", /obj/structure/AIcore, 4, time = 50, one_per_turf = 1), \ new/datum/stack_recipe("Surgery Table", /obj/machinery/optable, 5, time = 50, one_per_turf = 1, on_floor = 1), \ new/datum/stack_recipe("Metal crate", /obj/structure/closet/crate, 10, time = 50, one_per_turf = 1), \ - new/datum/stack_recipe("RUST fuel assembly port frame", /obj/item/rust_fuel_assembly_port_frame, 12, time = 50, one_per_turf = 1), \ - new/datum/stack_recipe("RUST fuel compressor frame", /obj/item/rust_fuel_compressor_frame, 12, time = 50, one_per_turf = 1), \ +// new/datum/stack_recipe("RUST fuel assembly port frame", /obj/item/rust_fuel_assembly_port_frame, 12, time = 50, one_per_turf = 1), \ +// new/datum/stack_recipe("RUST fuel compressor frame", /obj/item/rust_fuel_compressor_frame, 12, time = 50, one_per_turf = 1), \ + ) /obj/item/stack/sheet/plasteel diff --git a/code/game/turfs/simulated/walls.dm b/code/game/turfs/simulated/walls.dm index 339c8042052..31ed7271360 100644 --- a/code/game/turfs/simulated/walls.dm +++ b/code/game/turfs/simulated/walls.dm @@ -457,7 +457,7 @@ var/obj/item/light_fixture_frame/small/AH = W AH.try_build(src) return - +/* else if(istype(W,/obj/item/rust_fuel_compressor_frame)) var/obj/item/rust_fuel_compressor_frame/AH = W AH.try_build(src) @@ -467,7 +467,7 @@ var/obj/item/rust_fuel_assembly_port_frame/AH = W AH.try_build(src) return - +*/ //Poster stuff else if(istype(W,/obj/item/weapon/contraband/poster)) place_poster(W,user) diff --git a/code/modules/admin/verbs/mapping.dm b/code/modules/admin/verbs/mapping.dm index c386387577a..e9d5f88164e 100644 --- a/code/modules/admin/verbs/mapping.dm +++ b/code/modules/admin/verbs/mapping.dm @@ -136,7 +136,7 @@ var/intercom_range_display_status = 0 src.verbs += /client/proc/startSinglo src.verbs += /client/proc/cmd_admin_grantfullaccess src.verbs += /client/proc/kaboom - src.verbs += /client/proc/splash +// src.verbs += /client/proc/splash src.verbs += /client/proc/cmd_admin_areatest src.verbs += /client/proc/cmd_admin_rejuvenate src.verbs += /datum/admins/proc/show_traitor_panel diff --git a/code/modules/power/singularity/particle_accelerator/particle.dm b/code/modules/power/singularity/particle_accelerator/particle.dm index daaee3f31a3..a38fadbe457 100644 --- a/code/modules/power/singularity/particle_accelerator/particle.dm +++ b/code/modules/power/singularity/particle_accelerator/particle.dm @@ -43,6 +43,7 @@ toxmob(A) if((istype(A,/obj/machinery/the_singularitygen))||(istype(A,/obj/machinery/singularity/))) A:energy += energy +/* else if( istype(A,/obj/effect/rust_particle_catcher) ) var/obj/effect/rust_particle_catcher/collided_catcher = A if(particle_type && particle_type != "neutron") @@ -57,6 +58,7 @@ collided_core.owned_field.mega_energy += mega_energy - mega_energy * energy_loss_ratio collided_core.owned_field.energy += energy - energy * energy_loss_ratio del (src) +*/ return