Merge branch 'Bleeding-Edge' into surgery-room-improvements

Author: SECBATON-GRIFFON

.github/workflows/ci.yml

@@ -38,15 +38,19 @@ jobs:
     steps:
       # Checks-out your repository under $GITHUB_WORKSPACE, so your job can access it
       - uses: actions/checkout@v3
-      - uses: actions/setup-python@v4
-        with:
-          python-version: '3.x'
+      # - uses: actions/setup-python@v4
+      #   with:
+      #     python-version: '3.x'
+
+      - name: Setup Python
+        run: |
+          tools/bootstrap/python -c ''
 
         #TODO: Cache Dreamchecker install
       - name: Run dreamchecker
         run: |
           SPACEMAN_DMM_GIT_TAG="suite-1.8" tools/travis/install_spaceman_dmm.sh dreamchecker
-          ~/dreamchecker
+          ~/dreamchecker 2>&1 | bash tools/ci/annotate_dm.sh
 
       - name: Run map checker
         run: python tools/travis/check_map_files.py maps/
@@ -59,6 +63,17 @@ jobs:
       - name: Make sure test maps or vaults aren't ticked
         run: find -name '*.dme' -exec cat {} \; | awk '/maps\\test.*|\.dmm/ { exit 1 }'
 
+      # OpenDream linting
+      - name: Install OpenDream
+        uses: robinraju/release-downloader@v1.9
+        with:
+          repository: "OpenDreamProject/OpenDream"
+          tag: "latest"
+          fileName: "DMCompiler_linux-x64.tar.gz"
+          extract: true
+      - name: Run OpenDream
+        run: ./DMCompiler_linux-x64/DMCompiler vgstation13.dme --suppress-unimplemented --define=CIBUILDING | bash tools/ci/annotate_od.sh
+
   build:
     name: ${{matrix.job-name}}
     runs-on: ubuntu-latest

.gitignore

@@ -77,3 +77,6 @@ Thumbs.db
 
 # Bootstrapped node installation for the tgui build system
 .cache
+
+# Running OpenDream locally
+vgstation13.json

__DEFINES/materials.dm

@@ -33,6 +33,7 @@
 #define MAT_GINGERBREAD "$gingerbread"
 
 
+#define VALUE_MISC 0.1
 #define VALUE_IRON 0.2
 #define VALUE_GLASS 0.2
 #define VALUE_DIAMOND 50

__DEFINES/obj_defines.dm

@@ -42,3 +42,27 @@ var/list/qualityByString = list(
 
 #define SPAWN_ON_TURF "turf"
 #define SPAWN_ON_LOC "loc"
+
+// Slime extract application flags
+#define SLIME_GREY 1
+#define SLIME_GOLD 2
+#define SLIME_SILVER 4
+#define SLIME_METAL 8
+#define SLIME_PURPLE 16
+#define SLIME_DARKPURPLE 32
+#define SLIME_ORANGE 64
+#define SLIME_YELLOW 128
+#define SLIME_RED 256
+#define SLIME_BLUE 512
+#define SLIME_DARKBLUE 1024
+#define SLIME_PINK 2048
+#define SLIME_GREEN 4096
+#define SLIME_LIGHTPINK 8192
+#define SLIME_BLACK 16384
+#define SLIME_OIL 32768
+#define SLIME_ADAMANTINE 65536
+#define SLIME_BLUESPACE 131072
+#define SLIME_PYRITE 262144
+#define SLIME_CERULEAN 524288
+#define SLIME_SEPIA 1048576
+#define ALL_SLIMES 2097151 //sum of above, 2097152 - 1

__DEFINES/reagents.dm

@@ -531,6 +531,7 @@
 #define LEMONDROP		"lemondrop"
 #define FEVERFEW		"feverfew"
 #define SQUASH			"squash"
+#define PRIAXATE		"priaxate"
 
 #define ACRYLIC			"acrylic"
 #define ACETONE			"acetone"

__DEFINES/subsystem.dm

@@ -65,6 +65,7 @@
 #define SS_PRIORITY_INACTIVITY     1
 #define SS_PRIORITY_BURNABLE	  -50
 #define SS_PRIORITY_DAYNIGHT	  -200
+#define SS_PRIORITY_NEWS          -1000
 
 #define SS_WAIT_WEATHER         	2 SECONDS
 #define SS_WAIT_MACHINERY           2 SECONDS //TODO move the rest of these to defines

___odlint.dm

@@ -0,0 +1,10 @@
+// This file is included right at the start of the DME.
+// Its purpose is to enable multiple lints (pragmas) that are supported by OpenDream to better validate the codebase
+// These are essentially nitpicks the DM compiler should pick up on but doesnt
+
+#if !defined(SPACEMAN_DMM) && defined(OPENDREAM)
+// This is in a separate file as a hack to avoid SpacemanDMM
+// evaluating the #pragma lines, even if its outside a block it cares about
+// (Also so people can code-own it. Shoutout to AA)
+#include "tools/ci/od_lints.dm"
+#endif

code/ATMOSPHERICS/atmospherics.dm

@@ -329,7 +329,7 @@ Pipelines + Other Objects -> Pipe network
 								"You hear a ratchet.")
 			var/obj/item/tool/wrench/socket/thewrench = W
 			var/datum/gas_mixture/internal_removed = int_air.remove_volume(starting_volume)
-			if(!thewrench.has_slime)
+			if(!(thewrench.has_slimes & SLIME_BLUESPACE))
 				env_air.merge(internal_removed)
 		else
 			to_chat(user, "<span class='warning'>You cannot unwrench this [src], it's too exerted due to internal pressure.</span>")

code/ZAS/Fire.dm

@@ -546,6 +546,10 @@ var/ZAS_fuel_energy_release_rate = zas_settings.Get(/datum/ZAS_Setting/fire_fuel
 	if(!flammable || check_fire_protection() || thermal_mass <= 0)
 		return FALSE
 
+	var/datum/gas_mixture/air_contents = return_air()
+	if(air_contents[GAS_OXYGEN] < 1)
+		return FALSE
+
 	var/in_fire = FALSE
 	on_fire=1
 
@@ -625,7 +629,6 @@ var/ZAS_fuel_energy_release_rate = zas_settings.Get(/datum/ZAS_Setting/fire_fuel
 	//Fires shouldn't spawn in areas or mobs, but it has happened...
 	if(!istype(loc,/turf))
 		qdel(src)
-		CRASH("Fire was created at src->loc: [src]->[loc] instead of a turf.")
 
 	// Get location and check if it is in a proper ZAS zone.
 	var/turf/simulated/S = get_turf(loc)
@@ -641,7 +644,7 @@ var/ZAS_fuel_energy_release_rate = zas_settings.Get(/datum/ZAS_Setting/fire_fuel
 	if(!air_contents.check_recombustability(S))
 		Extinguish()
 	else if(air_contents.check_recombustability(S) == 1)
-		if((air_contents.molar_ratio(GAS_OXYGEN)) < (MINOXY2BURN + rand(-2,2)*0.01))
+		if((air_contents.molar_ratio(GAS_OXYGEN)) < (MINOXY2BURN + rand(-2,2)*0.01) || (air_contents[GAS_OXYGEN] < 1)) //extinguish if the ratio of fuel:oxygen is too low or if there isn't enough oxygen present at all
 			Extinguish()
 			return
 

code/__HELPERS/lists.dm

@@ -157,6 +157,55 @@
 			return
 		return chosen
 
+/*
+ * Returns the length of a common prefix in a list, if any
+ * Requires a SORTED list
+ */
+/proc/find_string_list_prefix(var/list/inputlist)
+	if(!inputlist.len)
+		return
+	if(inputlist.len==1)
+		return inputlist[1]
+	var/i = 0
+	var/first = "[inputlist[1]]"
+	var/last = "[inputlist[inputlist.len]]"
+	while(i < length(first) && first[i+1] == last[i+1])
+		i++
+	return i
+
+/*
+ * Returns a choice from an input typelist, given a string filter
+ * If only one thing is returned, just gives us that with no input list.
+ */
+/proc/filter_typelist_input(input_text, input_heading, var/list/matches)
+	if(!matches.len)
+		return
+	if(matches.len==1)
+		return matches[1]
+	matches = sortList(matches)
+	var/prefix = ""
+	var/common = find_string_list_prefix(matches)
+	if(common)
+		prefix = copytext("[matches[1]]", 1, common+1)
+		var/foundpartial = findlasttext(prefix, "/")
+		if(foundpartial)
+			prefix = copytext(prefix, 1, foundpartial)
+			common = foundpartial
+	var/list/results = list()
+	for(var/x in matches)
+		if(common)
+			results += copytext("[x]", common)
+		else
+			results += "[x]"
+	var/newvalue = input("[input_text][(input_text && prefix) ? "\n" : ""][prefix ? "Prefix: [prefix]" : ""]",input_heading) as null|anything in results
+	if(isnull(newvalue))
+		return
+	if(prefix)
+		newvalue = text2path(prefix + newvalue)
+	else
+		newvalue = text2path(newvalue)
+	return newvalue
+
 /*
  * Returns list containing all the entries from first list that are not present in second.
  * If skiprep = 1, repeated elements are treated as one.