Removed deprecated power generation stuff (AM, RUST) to free up more procs

This commit is contained in:
ZomgPonies
2014-07-25 11:33:37 -04:00
parent ebb9f724aa
commit b33df4745c
7 changed files with 14 additions and 32 deletions
+4
View File
@@ -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"
+2 -2
View File
@@ -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"
@@ -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
+2 -2
View File
@@ -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)
+1 -1
View File
@@ -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
@@ -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