Merge remote-tracking branch 'upstream/master' into voteingchanges

.github/workflows/ci_suite.yml

@@ -10,7 +10,7 @@ jobs:
   run_linters:
     if: "!contains(github.event.head_commit.message, '[ci skip]')"
     name: Run Linters
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-22.04
     concurrency:
       group: run_linters-${{ github.ref }}
       cancel-in-progress: true
@@ -42,7 +42,8 @@ jobs:
           bash tools/ci/check_changelogs.sh
           bash tools/ci/check_grep.sh
           bash tools/ci/check_misc.sh
-          tools/bootstrap/python tools/validate_dme.py <sojourn-station.dme
+          tools/bootstrap/python tools/ticked_file_enforcement/ticked_file_enforcement.py < tools/ticked_file_enforcement/schemas/sojourn_dme.json
+          tools/bootstrap/python tools/ticked_file_enforcement/ticked_file_enforcement.py < tools/ticked_file_enforcement/schemas/unit_tests.json
           tools/build/build --ci lint tgui-test
           tools/bootstrap/python -m dmi.test
           tools/bootstrap/python -m mapmerge2.dmm_test
@@ -56,7 +57,7 @@ jobs:
   compile_all_maps:
     if: "!contains(github.event.head_commit.message, '[ci skip]')"
     name: Compile Maps
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-22.04
     concurrency:
       group: compile_all_maps-${{ github.ref }}
       cancel-in-progress: true
@@ -76,7 +77,7 @@ jobs:
   run_all_tests:
     if: "!contains(github.event.head_commit.message, '[ci skip]')"
     name: Integration Tests
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-22.04
     services:
       mysql:
         image: mysql:latest
@@ -104,7 +105,7 @@ jobs:
         run: |
           sudo dpkg --add-architecture i386
           sudo apt update || true
-          sudo apt install -o APT::Immediate-Configure=false libssl1.1:i386
+          sudo apt install zlib1g-dev:i386
           bash tools/ci/install_rust_g.sh
       - name: Compile Tests
         run: |
@@ -127,7 +128,7 @@ jobs:
     if: "!contains(github.event.head_commit.message, '[ci skip]') && always()"
     needs: [run_all_tests]
     name: Compare Screenshot Tests
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-22.04
     steps:
       - uses: actions/checkout@v3
       # If we ever add more artifacts, this is going to break, but it'll be obvious.

CONTRIBUTING.md

@@ -4,8 +4,8 @@
 * Pull requests should not contain any debug output, variables or procs, unless these are of value to admins/coders for live debugging.
 * Pull requests should not contain changes that do not relate with functionality described in commit messages.
 * If pull request relates with existing github issue, it should be specified in commit message, for example, "Fix broken floor sprites, close #23" (see https://help.github.com/articles/closing-issues-via-commit-messages/ for additional info).
-* If pull request contains map files changes, it MUST be fitted for the correct format exstrenal tools like Strong DMM automatical do this, local in code tools currently do not work so it is best to use proper tool then Dream Makers base. Pull request description should contain screenshots of map changes if it's not obvious from map files diff.
-* If pull request contains icon files changes, the pull request description should contain screenshots of changed icon files, well this isn't required its more perferd then digging into the file or checking the Actions Tools for your sprite changes.
+* If pull request contains map files changes, it MUST be fitted for the correct format. External tools like StrongDMM automatically do this. Local in-code tools currently do not work so it is best to use proper tools than Dream Makers base. Pull request description should contain screenshots of map changes if it's not obvious from map files diff.
+* If pull request contains icon files changes, the pull request description should contain screenshots of changed icon files. While this isn't required, it's more preferred than digging into the file or checking the Actions Tools for your sprite changes.
 * If you have the permissions, please set appropriate labels on your PRs. Including, at the very least, Good-To-Merge to indicate that its done.
 
 # Advice for new recruits
@@ -264,4 +264,4 @@ Procedure arguments should not contain `var/`. Specified input type e.g. `some_t
 /proc/rename_area(var/mob/user as mob, var/area/A as area, var/new_name as text)
 
 ```
-***
+***

README.md

@@ -1,9 +1,12 @@
-![](https://cdn.discordapp.com/attachments/265411250341543936/269612274765791242/eris_128.png)
-# Endless Horizon: CEV-Eris [![Build Status](https://travis-ci.org/discordia-space/CEV-Eris.svg?branch=master)](https://travis-ci.org/Endless-Horizon/CEV-Eris)
-[![discord](https://discordapp.com/api/guilds/255035529085583360/widget.png)](https://discord.gg/QfEg7K7)
+![](placeholder)
+# Sojourn 13 : Nadezhda Colony
+[![discord](https://discordapp.com/api/guilds/255035529085583360/widget.png)](https://discord.gg/akFxTw49)
 
-Корабль, который должен умирать.
+
+A downstream branch of the CEV-Eris codebase.
 
 ## CONTRIBUTING
 
-Please see [CONTRIBUTING.md](https://sojourn13.space/wiki/Contributor_Guide)
+Please see [CONTRIBUTING.md](https://sojourn13.space/wiki/Contributor_Guide) and contact us on the server Discord. 
+
+Current Lead Maintainers - Trilby, CDB.

code/ATMOSPHERICS/_atmos_setup.dm

@@ -1,10 +1,4 @@
-//--------------------------------------------
-// Pipe colors
-//
-// Add them here and to the pipe_colors list
-//  to automatically add them to all relevant
-//  atmospherics devices.
-//--------------------------------------------
+var/global/list/pipe_colors = list("grey" = PIPE_COLOR_GREY, "red" = PIPE_COLOR_RED, "blue" = PIPE_COLOR_BLUE, "cyan" = PIPE_COLOR_CYAN, "green" = PIPE_COLOR_GREEN, "yellow" = PIPE_COLOR_YELLOW, "black" = PIPE_COLOR_BLACK)
 
 /proc/pipe_color_lookup(var/color)
 	for(var/C in pipe_colors)

code/ATMOSPHERICS/_atmospherics_helpers.dm

@@ -25,9 +25,9 @@
 //Moves gas from one gas_mixture to another and returns the amount of power needed (assuming 1 second), or -1 if no gas was pumped.
 //transfer_moles - Limits the amount of moles to transfer. The actual amount of gas moved may also be limited by available_power, if given.
 //available_power - the maximum amount of power that may be used when moving gas. If null then the transfer is not limited by power.
-/proc/pump_gas(var/obj/machinery/M, var/datum/gas_mixture/source, var/datum/gas_mixture/sink, var/transfer_moles = null, var/available_power = null)
+/proc/pump_gas(var/obj/machinery/M, var/datum/gas_mixture/source, var/datum/gas_mixture/sink, var/transfer_moles, var/available_power)
 	if (source.total_moles < MINIMUM_MOLES_TO_PUMP) //if we cant transfer enough gas just stop to avoid further processing
-		return 0 //change it to -1 if a debug of this is needed
+		return -1
 
 	if (isnull(transfer_moles))
 		transfer_moles = source.total_moles
@@ -40,7 +40,7 @@
 		transfer_moles = min(transfer_moles, available_power / specific_power)
 
 	if (transfer_moles < MINIMUM_MOLES_TO_PUMP) //if we cant transfer enough gas just stop to avoid further processing
-		return 0 //change it to -1 if a debug of this is needed
+		return -1
 
 	//Update flow rate meter
 	if (istype(M, /obj/machinery/atmospherics))
@@ -59,7 +59,7 @@
 
 	var/datum/gas_mixture/removed = source.remove(transfer_moles)
 	if (!removed) //Just in case
-		return 0 //change it to -1 if a debug of this is needed
+		return -1
 
 	var/power_draw = specific_power*transfer_moles
 
@@ -70,7 +70,7 @@
 //Gas 'pumping' proc for the case where the gas flow is passive and driven entirely by pressure differences (but still one-way).
 /proc/pump_gas_passive(var/obj/machinery/M, var/datum/gas_mixture/source, var/datum/gas_mixture/sink, var/transfer_moles = null)
 	if (source.total_moles < MINIMUM_MOLES_TO_PUMP) //if we cant transfer enough gas just stop to avoid further processing
-		return 0 //change it to -1 if a debug of this is needed
+		return -1
 
 	if (isnull(transfer_moles))
 		transfer_moles = source.total_moles
@@ -81,7 +81,7 @@
 	transfer_moles = min(transfer_moles, equalize_moles)
 
 	if (transfer_moles < MINIMUM_MOLES_TO_PUMP) //if we cant transfer enough gas just stop to avoid further processing
-		return 0 //change it to -1 if a debug of this is needed
+		return -1
 
 	//Update flow rate meter
 	if (istype(M, /obj/machinery/atmospherics))
@@ -96,7 +96,7 @@
 
 	var/datum/gas_mixture/removed = source.remove(transfer_moles)
 	if(!removed) //Just in case
-		return 0 //change it to -1 if a debug of this is needed
+		return -1
 	sink.merge(removed)
 
 	return 0
@@ -108,7 +108,7 @@
 //available_power - the maximum amount of power that may be used when scrubbing gas. If null then the scrubbing is not limited by power.
 /proc/scrub_gas(var/obj/machinery/M, var/list/filtering, var/datum/gas_mixture/source, var/datum/gas_mixture/sink, var/total_transfer_moles = null, var/available_power = null)
 	if (source.total_moles < MINIMUM_MOLES_TO_FILTER) //if we cant transfer enough gas just stop to avoid further processing
-		return 0 //change it to -1 if a debug of this is needed
+		return -1
 
 	filtering = filtering & source.gas	//only filter gasses that are actually there. DO NOT USE &=
 
@@ -124,7 +124,7 @@
 		total_filterable_moles += source.gas[g]
 
 	if (total_filterable_moles < MINIMUM_MOLES_TO_FILTER) //if we cant transfer enough gas just stop to avoid further processing
-		return 0 //change it to -1 if a debug of this is needed
+		return -1
 
 	//now that we know the total amount of filterable gas, we can calculate the amount of power needed to scrub one mole of gas
 	var/total_specific_power = 0		//the power required to remove one mole of filterable gas
@@ -143,7 +143,7 @@
 		total_transfer_moles = min(total_transfer_moles, available_power/total_specific_power)
 
 	if (total_transfer_moles < MINIMUM_MOLES_TO_FILTER) //if we cant transfer enough gas just stop to avoid further processing
-		return 0 //change it to -1 if a debug of this is needed
+		return -1
 
 	//Update flow rate var
 	if (istype(M, /obj/machinery/atmospherics))
@@ -179,7 +179,7 @@
 //available_power - the maximum amount of power that may be used when filtering gas. If null then the filtering is not limited by power.
 /proc/filter_gas(var/obj/machinery/M, var/list/filtering, var/datum/gas_mixture/source, var/datum/gas_mixture/sink_filtered, var/datum/gas_mixture/sink_clean, var/total_transfer_moles = null, var/available_power = null)
 	if (source.total_moles < MINIMUM_MOLES_TO_FILTER) //if we cant transfer enough gas just stop to avoid further processing
-		return 0 //change it to -1 if a debug of this is needed
+		return -1
 
 	filtering = filtering & source.gas	//only filter gasses that are actually there. DO NOT USE &=
 
@@ -212,7 +212,7 @@
 		total_transfer_moles = min(total_transfer_moles, available_power/total_specific_power)
 
 	if (total_transfer_moles < MINIMUM_MOLES_TO_FILTER) //if we cant transfer enough gas just stop to avoid further processing
-		return 0 //change it to -1 if a debug of this is needed
+		return -1
 
 	//Update flow rate var
 	if (istype(M, /obj/machinery/atmospherics))
@@ -224,7 +224,7 @@
 
 	var/datum/gas_mixture/removed = source.remove(total_transfer_moles)
 	if (!removed) //Just in case
-		return 0 //change it to -1 if a debug of this is needed
+		return -1
 
 	var/filtered_power_used = 0		//power used to move filterable gas to sink_filtered
 	var/unfiltered_power_used = 0	//power used to move unfilterable gas to sink_clean
@@ -251,7 +251,7 @@
 //filter_gas can be removed and replaced with this proc if need be.
 /proc/filter_gas_multi(var/obj/machinery/M, var/list/filtering, var/datum/gas_mixture/source, var/datum/gas_mixture/sink_clean, var/total_transfer_moles = null, var/available_power = null)
 	if (source.total_moles < MINIMUM_MOLES_TO_FILTER) //if we cant transfer enough gas just stop to avoid further processing
-		return 0 //change it to -1 if a debug of this is needed
+		return -1
 
 	filtering = filtering & source.gas	//only filter gasses that are actually there. DO NOT USE &=
 
@@ -285,7 +285,7 @@
 		total_transfer_moles = min(total_transfer_moles, available_power/total_specific_power)
 
 	if (total_transfer_moles < MINIMUM_MOLES_TO_FILTER) //if we cant transfer enough gas just stop to avoid further processing
-		return 0 //change it to -1 if a debug of this is needed
+		return -1
 
 	//Update Flow Rate var
 	if (istype(M, /obj/machinery/atmospherics))
@@ -297,7 +297,7 @@
 
 	var/datum/gas_mixture/removed = source.remove(total_transfer_moles)
 	if (!removed) //Just in case
-		return 0 //change it to -1 if a debug of this is needed
+		return -1
 
 	var/list/filtered_power_used = list()		//power used to move filterable gas to the filtered gas mixes
 	var/unfiltered_power_used = 0	//power used to move unfilterable gas to sink_clean
@@ -326,9 +326,9 @@
 
 //Similar deal as the other atmos process procs.
 //mix_sources maps input gas mixtures to mix ratios. The mix ratios MUST add up to 1.
-/proc/mix_gas(var/obj/machinery/M, var/list/mix_sources, var/datum/gas_mixture/sink, var/total_transfer_moles = null, var/available_power = null)
+/proc/mix_gas(var/obj/machinery/M, var/list/mix_sources, var/datum/gas_mixture/sink, var/total_transfer_moles, var/available_power)
 	if (!mix_sources.len)
-		return 0 //change it to -1 if a debug of this is needed
+		return -1
 
 	var/total_specific_power = 0	//the power needed to mix one mole of gas
 	var/total_mixing_moles = null	//the total amount of gas that can be mixed, given our mix ratios
@@ -337,7 +337,7 @@
 	var/list/source_specific_power = list()
 	for (var/datum/gas_mixture/source in mix_sources)
 		if (source.total_moles < MINIMUM_MOLES_TO_FILTER)
-			return 0 //change it to -1 if a debug of this is needed	//either mix at the set ratios or mix no gas at all
+			return -1	//either mix at the set ratios or mix no gas at all
 
 		var/mix_ratio = mix_sources[source]
 		if (!mix_ratio)
@@ -354,7 +354,7 @@
 		total_input_moles += source.total_moles
 
 	if (total_mixing_moles < MINIMUM_MOLES_TO_FILTER) //if we cant transfer enough gas just stop to avoid further processing
-		return 0 //change it to -1 if a debug of this is needed
+		return -1
 
 	if (isnull(total_transfer_moles))
 		total_transfer_moles = total_mixing_moles
@@ -366,7 +366,7 @@
 		total_transfer_moles = min(total_transfer_moles, available_power / total_specific_power)
 
 	if (total_transfer_moles < MINIMUM_MOLES_TO_FILTER) //if we cant transfer enough gas just stop to avoid further processing
-		return 0 //change it to -1 if a debug of this is needed
+		return -1
 
 	//Update flow rate var
 	if (istype(M, /obj/machinery/atmospherics))

code/ATMOSPHERICS/atmospherics.dm

@@ -1,18 +1,19 @@
 /*
 Quick overview:
+
 Pipes combine to form pipelines
 Pipelines and other atmospheric objects combine to form pipe_networks
 	Note: A single pipe_network represents a completely open space
+
 Pipes -> Pipelines
 Pipelines + Other Objects -> Pipe network
+
 */
 /obj/machinery/atmospherics
 
-	var/has_errored = FALSE //Used to get a debug message
-
 	auto_init = 0
 
-	anchored = 1
+	anchored = TRUE
 	idle_power_usage = 0
 	active_power_usage = 0
 	power_channel = STATIC_ENVIRON
@@ -83,7 +84,7 @@ obj/machinery/atmospherics/proc/check_connect_types(obj/machinery/atmospherics/a
 
 /obj/machinery/atmospherics/proc/check_icon_cache(var/safety = 0)
 	if(!SSatoms.initialized)
-		return FALSE
+		return 0
 	if(!istype(icon_manager))
 		if(!safety) //to prevent infinite loops
 			icon_manager = new()