New master-controller and subsystems (#1481)

* работающая система и 2 работающих подсистемы, остальные залью позже * Забыл залить исправленный мастерконтроллер. +Легаси, который его цепляет * garbage subsystem * Фикс названия прока процесса, который я забыл. * минификсота и парочка подсистем * some fixes * Нормальный процессинг всех возможных вещей. Добавлена подсистема воздуха * Залью RuntimeCondencer на всякий случай, я думаю, многим пригодится. * mob_list --> SSmob.mob_list. Парочка фиксов * Вроде бы фикс мастера * Возможно, исправит проблему со speech_bubble * Камера и тревога должны обрабатываться SSmachines * Парочка фиксов рантаймов * Поправил везде возвращаемое значение Destroy(). * LateInitialize вместо Initialize open спейсу
discordia-space · Apr 22, 2018 · 2245004 · 2245004
1 parent 10d1228
commit 2245004
Show file tree

Hide file tree

Showing 567 changed files with 8,980 additions and 3,621 deletions.
diff --git a/.directory b/.directory
@@ -0,0 +1,6 @@
+[Dolphin]
+Timestamp=2018,4,20,13,3,29
+Version=3
+
+[Settings]
+HiddenFilesShown=true
diff --git a/.gitignore b/.gitignore
@@ -6,6 +6,7 @@ Thumbs.db
 *.dmb
 *.lk
 *.backup
+tools/
 data/
 cfg/
 build_log.txt
diff --git a/.vscode/tasks.json b/.vscode/tasks.json
@@ -0,0 +1,34 @@
+{
+	// Build the thing!
+	// Except the thing is SS13 code in a shitty C like language!
+	// Why would you ever want to build this?!
+	"version": "2.0.0",
+	"presentation" : { "reveal": "always" },
+	"tasks":[
+		{
+			"label": "Build Release",
+			"group": "build",
+			"type": "shell",
+			"command": "WINEARCH=win32 WINEPREFIX=~/.byondinst wine C:/Program\\ Files/BYOND/bin/dm.exe",
+			"args": ["/home/guap6512/Space\\ Station\\ 13/CEV-Eris/cev_eris.dme"],
+			"problemMatcher": {
+				"owner": "dm",
+				"fileLocation": ["relative", "${workspaceRoot}"],
+				"pattern": {
+					"regexp": "^([\\\\\/0-9a-zA-Z\\._ -]+):(\\d+):(warning|error): (.*)",
+					"file": 1,
+					"line": 2,
+					"severity": 3,
+					"message": 4
+				}
+			}
+		},
+		{
+			"label": "Run Server",
+			"group": "test",
+			"type": "shell",
+			"command": "WINEARCH=win32 WINEPREFIX=~/.byondinst wine C:/Program\\ Files/BYOND/bin/dreamdaemon.exe",
+			"args": ["/home/guap6512/Space\\ Station\\ 13/CEV-Eris/cev_eris.dmb", "-trusted", "-invisible", "-close"]
+		}
+	]
+}
diff --git a/cev_eris.dme b/cev_eris.dme
diff --git a/code/ATMOSPHERICS/atmospherics.dm b/code/ATMOSPHERICS/atmospherics.dm
@@ -87,7 +87,7 @@ obj/machinery/atmospherics/proc/check_connect_types(obj/machinery/atmospherics/a
 
 	return node.pipe_color
 
-/obj/machinery/atmospherics/process()
+/obj/machinery/atmospherics/Process()
 	last_flow_rate = 0
 	last_power_draw = 0
 

diff --git a/code/ATMOSPHERICS/components/binary_devices/binary_atmos_base.dm b/code/ATMOSPHERICS/components/binary_devices/binary_atmos_base.dm
@@ -57,9 +57,9 @@ obj/machinery/atmospherics/binary
 		node1 = null
 		node2 = null
 
-		..()
+		. = ..()
 
-	initialize()
+	Initialize()
 		if(node1 && node2) return
 
 		var/node2_connect = dir

diff --git a/code/ATMOSPHERICS/components/binary_devices/circulator.dm b/code/ATMOSPHERICS/components/binary_devices/circulator.dm
@@ -67,7 +67,7 @@
 	stored_energy = 0
 	return last_stored_energy_transferred
 
-/obj/machinery/atmospherics/binary/circulator/process()
+/obj/machinery/atmospherics/binary/circulator/Process()
 	..()
 
 	if(last_worldtime_transfer < world.time - 50)
@@ -101,13 +101,13 @@
 			else if(dir & (EAST|WEST))
 				initialize_directions = EAST|WEST
 
-			initialize()
+			Initialize()
 			build_network()
 			if (node1)
-				node1.initialize()
+				node1.Initialize()
 				node1.build_network()
 			if (node2)
-				node2.initialize()
+				node2.Initialize()
 				node2.build_network()
 		else
 			if(node1)

diff --git a/code/ATMOSPHERICS/components/binary_devices/dp_vent_pump.dm b/code/ATMOSPHERICS/components/binary_devices/dp_vent_pump.dm
@@ -99,7 +99,7 @@
 	update_icon()
 	update_underlays()
 
-/obj/machinery/atmospherics/binary/dp_vent_pump/process()
+/obj/machinery/atmospherics/binary/dp_vent_pump/Process()
 	..()
 
 	last_power_draw = 0
@@ -189,7 +189,7 @@
 
 	return 1
 
-/obj/machinery/atmospherics/binary/dp_vent_pump/initialize()
+/obj/machinery/atmospherics/binary/dp_vent_pump/Initialize()
 	..()
 	if(frequency)
 		set_frequency(frequency)

diff --git a/code/ATMOSPHERICS/components/binary_devices/passive_gate.dm b/code/ATMOSPHERICS/components/binary_devices/passive_gate.dm
@@ -44,7 +44,7 @@
 /obj/machinery/atmospherics/binary/passive_gate/hide(var/i)
 	update_underlays()
 
-/obj/machinery/atmospherics/binary/passive_gate/process()
+/obj/machinery/atmospherics/binary/passive_gate/Process()
 	..()
 
 	last_flow_rate = 0
@@ -123,7 +123,7 @@
 
 	return 1
 
-/obj/machinery/atmospherics/binary/passive_gate/initialize()
+/obj/machinery/atmospherics/binary/passive_gate/Initialize()
 	..()
 	if(frequency)
 		set_frequency(frequency)

diff --git a/code/ATMOSPHERICS/components/binary_devices/pipeturbine.dm b/code/ATMOSPHERICS/components/binary_devices/pipeturbine.dm
@@ -51,9 +51,9 @@
 		node1 = null
 		node2 = null
 
-		..()
+		. = ..()
 
-	process()
+	Process()
 		..()
 		if(anchored && !(stat&BROKEN))
 			kin_energy *= 1 - kin_loss
@@ -99,13 +99,13 @@
 				else if(dir & (EAST|WEST))
 					initialize_directions = NORTH|SOUTH
 
-				initialize()
+				Initialize()
 				build_network()
 				if (node1)
-					node1.initialize()
+					node1.Initialize()
 					node1.build_network()
 				if (node2)
-					node2.initialize()
+					node2.Initialize()
 					node2.build_network()
 			else
 				if(node1)
@@ -157,7 +157,7 @@
 
 		return null
 
-	initialize()
+	Initialize()
 		if(node1 && node2) return
 
 		var/node2_connect = turn(dir, -90)
@@ -249,7 +249,7 @@
 			if (turbine.stat & (BROKEN) || !turbine.anchored || turn(turbine.dir, 180) != dir)
 				turbine = null
 
-	process()
+	Process()
 		updateConnection()
 		if(!turbine || !anchored || stat & (BROKEN))
 			return

diff --git a/code/ATMOSPHERICS/components/binary_devices/pump.dm b/code/ATMOSPHERICS/components/binary_devices/pump.dm
@@ -62,7 +62,7 @@ Thus, the two variables affect pump operation are set in New():
 /obj/machinery/atmospherics/binary/pump/hide(var/i)
 	update_underlays()
 
-/obj/machinery/atmospherics/binary/pump/process()
+/obj/machinery/atmospherics/binary/pump/Process()
 	last_power_draw = 0
 	last_flow_rate = 0
 
@@ -143,7 +143,7 @@ Thus, the two variables affect pump operation are set in New():
 		ui.open()					// open the new ui window
 		ui.set_auto_update(1)		// auto update every Master Controller tick
 
-/obj/machinery/atmospherics/binary/pump/initialize()
+/obj/machinery/atmospherics/binary/pump/Initialize()
 	..()
 	if(frequency)
 		set_frequency(frequency)

diff --git a/code/ATMOSPHERICS/components/omni_devices/_omni_extras.dm b/code/ATMOSPHERICS/components/omni_devices/_omni_extras.dm
@@ -40,10 +40,10 @@
 /datum/omni_port/proc/connect()
 	if(node)
 		return
-	master.initialize()
+	master.Initialize()
 	master.build_network()
 	if(node)
-		node.initialize()
+		node.Initialize()
 		node.build_network()
 
 /datum/omni_port/proc/disconnect()

diff --git a/code/ATMOSPHERICS/components/omni_devices/filter.dm b/code/ATMOSPHERICS/components/omni_devices/filter.dm
@@ -28,7 +28,7 @@
 	input = null
 	output = null
 	filters.Cut()
-	..()
+	. = ..()
 
 /obj/machinery/atmospherics/omni/filter/sort_ports()
 	for(var/datum/omni_port/P in ports)
@@ -57,7 +57,7 @@
 
 	return 0
 
-/obj/machinery/atmospherics/omni/filter/process()
+/obj/machinery/atmospherics/omni/filter/Process()
 	if(!..())
 		return 0
 

diff --git a/code/ATMOSPHERICS/components/omni_devices/mixer.dm b/code/ATMOSPHERICS/components/omni_devices/mixer.dm
@@ -52,7 +52,7 @@
 /obj/machinery/atmospherics/omni/mixer/Destroy()
 	inputs.Cut()
 	output = null
-	..()
+	. = ..()
 
 /obj/machinery/atmospherics/omni/mixer/sort_ports()
 	for(var/datum/omni_port/P in ports)
@@ -97,7 +97,7 @@
 
 	return 0
 
-/obj/machinery/atmospherics/omni/mixer/process()
+/obj/machinery/atmospherics/omni/mixer/Process()
 	if(!..())
 		return 0
 

diff --git a/code/ATMOSPHERICS/components/omni_devices/omni_base.dm b/code/ATMOSPHERICS/components/omni_devices/omni_base.dm
@@ -61,7 +61,7 @@
 /obj/machinery/atmospherics/omni/proc/error_check()
 	return
 
-/obj/machinery/atmospherics/omni/process()
+/obj/machinery/atmospherics/omni/Process()
 	last_power_draw = 0
 	last_flow_rate = 0
 
@@ -239,9 +239,9 @@
 			qdel(P.network)
 			P.node = null
 
-	..()
+	. = ..()
 
-/obj/machinery/atmospherics/omni/initialize()
+/obj/machinery/atmospherics/omni/Initialize()
 	for(var/datum/omni_port/P in ports)
 		if(P.node || P.mode == 0)
 			continue

diff --git a/code/ATMOSPHERICS/components/portables_connector.dm b/code/ATMOSPHERICS/components/portables_connector.dm
@@ -37,7 +37,7 @@
 /obj/machinery/atmospherics/portables_connector/hide(var/i)
 	update_underlays()
 
-/obj/machinery/atmospherics/portables_connector/process()
+/obj/machinery/atmospherics/portables_connector/Process()
 	..()
 	if(!on)
 		return
@@ -72,9 +72,9 @@
 
 	node = null
 
-	..()
+	. = ..()
 
-/obj/machinery/atmospherics/portables_connector/initialize()
+/obj/machinery/atmospherics/portables_connector/Initialize()
 	if(node) return
 
 	var/node_connect = dir

diff --git a/code/ATMOSPHERICS/components/trinary_devices/filter.dm b/code/ATMOSPHERICS/components/trinary_devices/filter.dm
@@ -93,7 +93,7 @@
 	if(old_stat != stat)
 		update_icon()
 
-/obj/machinery/atmospherics/trinary/filter/process()
+/obj/machinery/atmospherics/trinary/filter/Process()
 	..()
 
 	last_power_draw = 0
@@ -124,7 +124,7 @@
 
 	return 1
 
-/obj/machinery/atmospherics/trinary/filter/initialize()
+/obj/machinery/atmospherics/trinary/filter/Initialize()
 	set_frequency(frequency)
 	..()
 
@@ -248,7 +248,7 @@ obj/machinery/atmospherics/trinary/filter/m_filter/New()
 		if(WEST)
 			initialize_directions = WEST|SOUTH|EAST
 
-/obj/machinery/atmospherics/trinary/filter/m_filter/initialize()
+/obj/machinery/atmospherics/trinary/filter/m_filter/Initialize()
 	set_frequency(frequency)
 
 	if(node1 && node2 && node3) return

diff --git a/code/ATMOSPHERICS/components/trinary_devices/mixer.dm b/code/ATMOSPHERICS/components/trinary_devices/mixer.dm
@@ -72,7 +72,7 @@
 	if (!mixing_inputs)
 		mixing_inputs = list(src.air1 = node1_concentration, src.air2 = node2_concentration)
 
-/obj/machinery/atmospherics/trinary/mixer/process()
+/obj/machinery/atmospherics/trinary/mixer/Process()
 	..()
 
 	last_power_draw = 0
@@ -194,7 +194,7 @@ obj/machinery/atmospherics/trinary/mixer/t_mixer/New()
 		if(WEST)
 			initialize_directions = WEST|NORTH|SOUTH
 
-obj/machinery/atmospherics/trinary/mixer/t_mixer/initialize()
+obj/machinery/atmospherics/trinary/mixer/t_mixer/Initialize()
 	..()
 	if(node1 && node2 && node3) return
 
@@ -240,7 +240,7 @@ obj/machinery/atmospherics/trinary/mixer/m_mixer/New()
 		if(WEST)
 			initialize_directions = WEST|SOUTH|EAST
 
-obj/machinery/atmospherics/trinary/mixer/m_mixer/initialize()
+obj/machinery/atmospherics/trinary/mixer/m_mixer/Initialize()
 	..()
 	if(node1 && node2 && node3) return
 

diff --git a/code/ATMOSPHERICS/components/trinary_devices/trinary_base.dm b/code/ATMOSPHERICS/components/trinary_devices/trinary_base.dm
@@ -69,9 +69,9 @@ obj/machinery/atmospherics/trinary
 		node2 = null
 		node3 = null
 
-		..()
+		. = ..()
 
-	initialize()
+	Initialize()
 		if(node1 && node2 && node3) return
 
 		var/node1_connect = turn(dir, -180)