SSmachine -> SSmachines

This commit is contained in:
Cyberboss
2017-03-22 11:38:35 -04:00
parent 5907da67ee
commit 71deca2374
11 changed files with 21 additions and 21 deletions
+1 -1
View File
@@ -3,7 +3,7 @@ var/global/list/portals = list() //list of all /obj/effect/portal
var/global/list/airlocks = list() //list of all airlocks
var/global/list/mechas_list = list() //list of all mechs. Used by hostile mobs target tracking.
var/global/list/shuttle_caller_list = list() //list of all communication consoles and AIs, for automatic shuttle calls when there are none.
var/global/list/machines = list() //NOTE: this is a list of ALL machines now. The processing machines list is SSmachine.processing !
var/global/list/machines = list() //NOTE: this is a list of ALL machines now. The processing machines list is SSmachines.processing !
var/global/list/syndicate_shuttle_boards = list() //important to keep track of for managing nukeops war declarations.
var/global/list/navbeacons = list() //list of all bot nagivation beacons, used for patrolling.
var/global/list/teleportbeacons = list() //list of all tracking beacons used by teleporters
+1 -1
View File
@@ -628,7 +628,7 @@ var/datum/controller/subsystem/garbage/SSgarbage
SearchVar(SSipintel)
SearchVar(SSjob)
SearchVar(SSlighting)
SearchVar(SSmachine)
SearchVar(SSmachines)
SearchVar(SSmapping)
SearchVar(SSminimap)
SearchVar(SSmob)
+6 -6
View File
@@ -1,4 +1,4 @@
var/datum/controller/subsystem/machines/SSmachine
var/datum/controller/subsystem/machines/SSmachines
/datum/controller/subsystem/machines
name = "Machines"
@@ -26,7 +26,7 @@ var/datum/controller/subsystem/machines/SSmachine
propagate_network(PC,PC.powernet)
/datum/controller/subsystem/machines/New()
NEW_SS_GLOBAL(SSmachine)
NEW_SS_GLOBAL(SSmachines)
/datum/controller/subsystem/machines/stat_entry()
@@ -65,7 +65,7 @@ var/datum/controller/subsystem/machines/SSmachine
propagate_network(PC,PC.powernet)
/datum/controller/subsystem/machines/Recover()
if (istype(SSmachine.processing))
processing = SSmachine.processing
if (istype(SSmachine.powernets))
powernets = SSmachine.powernets
if (istype(SSmachines.processing))
processing = SSmachines.processing
if (istype(SSmachines.powernets))
powernets = SSmachines.powernets
+4 -4
View File
@@ -59,7 +59,7 @@
G.message_gangtools("WARNING: [gang.name] Gang takeover imminent. Their dominator at [domloc.map_name] must be destroyed!",1,1)
if(!.)
STOP_PROCESSING(SSmachine, src)
STOP_PROCESSING(SSmachines, src)
/obj/machinery/dominator/play_attack_sound(damage_amount, damage_type = BRUTE, damage_flag = 0)
switch(damage_type)
@@ -122,7 +122,7 @@
cut_overlays()
operating = 0
stat |= BROKEN
STOP_PROCESSING(SSmachine, src)
STOP_PROCESSING(SSmachines, src)
/obj/machinery/dominator/Destroy()
if(!(stat & BROKEN))
@@ -132,7 +132,7 @@
qdel(spark_system)
qdel(countdown)
countdown = null
STOP_PROCESSING(SSmachine, src)
STOP_PROCESSING(SSmachines, src)
return ..()
/obj/machinery/dominator/emp_act(severity)
@@ -181,7 +181,7 @@
countdown.start()
set_light(3)
START_PROCESSING(SSmachine, src)
START_PROCESSING(SSmachines, src)
gang.message_gangtools("Hostile takeover in progress: Estimated [time] minutes until victory.[gang.dom_attempts ? "" : " This is your final attempt."]")
for(var/datum/gang/G in SSticker.mode.gangs)
+1 -1
View File
@@ -73,7 +73,7 @@
if(beaker)
usr.visible_message("<span class='warning'>[usr] attaches \the [src] to \the [target].</span>", "<span class='notice'>You attach \the [src] to \the [target].</span>")
attached = target
START_PROCESSING(SSmachine, src)
START_PROCESSING(SSmachines, src)
update_icon()
else
to_chat(usr, "<span class='warning'>There's nothing attached to the IV drip!</span>")
+2 -2
View File
@@ -130,7 +130,7 @@ Class Procs:
..()
machines += src
if(!speed_process)
START_PROCESSING(SSmachine, src)
START_PROCESSING(SSmachines, src)
else
START_PROCESSING(SSfastprocess, src)
power_change()
@@ -138,7 +138,7 @@ Class Procs:
/obj/machinery/Destroy()
machines.Remove(src)
if(!speed_process)
STOP_PROCESSING(SSmachine, src)
STOP_PROCESSING(SSmachines, src)
else
STOP_PROCESSING(SSfastprocess, src)
dropContents()
+1 -1
View File
@@ -69,7 +69,7 @@ var/explosionid = 1
//postpone processing for a bit
var/postponeCycles = max(round(devastation_range/8),1)
SSlighting.postpone(postponeCycles)
SSmachine.postpone(postponeCycles)
SSmachines.postpone(postponeCycles)
if(heavy_impact_range > 1)
if(smoke)
+1 -1
View File
@@ -383,7 +383,7 @@ var/list/TYPES_SHORTCUTS = list(
/client/proc/cmd_debug_make_powernets()
set category = "Debug"
set name = "Make Powernets"
SSmachine.makepowernets()
SSmachines.makepowernets()
log_admin("[key_name(src)] has remade the powernet. makepowernets() called.")
message_admins("[key_name_admin(src)] has remade the powernets. makepowernets() called.", 0)
feedback_add_details("admin_verb","MPWN") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc!
+1 -1
View File
@@ -39,7 +39,7 @@
atmos_machines += A
SSatoms.InitializeAtoms(atoms)
SSmachine.setup_template_powernets(cables)
SSmachines.setup_template_powernets(cables)
SSair.setup_template_machinery(atmos_machines)
/datum/map_template/proc/load_new_z()
+1 -1
View File
@@ -192,7 +192,7 @@
/obj/machinery/am_shielding/proc/setup_core()
processing = 1
machines |= src
START_PROCESSING(SSmachine, src)
START_PROCESSING(SSmachines, src)
if(!control_unit)
return
control_unit.linked_cores.Add(src)
+2 -2
View File
@@ -15,7 +15,7 @@
var/netexcess = 0 // excess power on the powernet (typically avail-load)///////
/datum/powernet/New()
SSmachine.powernets += src
SSmachines.powernets += src
/datum/powernet/Destroy()
//Go away references, you suck!
@@ -26,7 +26,7 @@
nodes -= M
M.powernet = null
SSmachine.powernets -= src
SSmachines.powernets -= src
return ..()
/datum/powernet/proc/is_empty()