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

Author: Azrun

+secret

@@ -52,6 +52,7 @@ o+`        `-` ``..-:yooos-..----------..`
 //#define ME_AND_MY_40_ALT_ACCOUNTS // Override game mode minimum player requirements for testing revs, nukies etc.
 //#define I_WANNA_BE_THE_JOB "IMCODER" // Spawn as a 'imcoder' job. Gives CE belt, captain ID, etc. Change string to different job ID as needed
 //#define NO_ADMIN_SPEECH_MODULES // Loads the admin speech and listen module trees without any modules.
+//#define NO_PREGAME_HTML // Don't spawn the HTML pregame browser lobby screen
 
 //#define STOP_DISTRACTING_ME //All of the below
 
@@ -153,6 +154,8 @@ o+`        `-` ``..-:yooos-..----------..`
 //#define MAP_OVERRIDE_MUSHROOM     // Updated Mushroom
 //#define MAP_OVERRIDE_DENSITY2     // Density2 (second smallest map), by Emily
 
+//#define GENERATE_GOONHUB_MAP // Generate map screenshots for goonhub map viewer (NOT USED NORMALLY). Use with a map override.
+
 //------------ Unit Test Framework ------------//
 
 //#define UNIT_TESTS
@@ -177,7 +180,51 @@ o+`        `-` ``..-:yooos-..----------..`
 //#define ENABLE_ARTEMIS // Enables artemis for development
 //#define MIDSUMMER 1
 
-//Don't comment this ty
+//----- Testmerge & Revision Information -----//
+
+/// The literal current commit hash the server is running off of
+#define VCS_REVISION "1"
+/// The literal current author of the commit the server is runing off of
+#define VCS_AUTHOR "bob"
+/// The latest commit on the origin at the time of the server build, for display
+#define ORIGIN_REVISION "1"
+/// The latest commit author on the origin at the time of the server build, for display
+#define ORIGIN_AUTHOR "bob"
+// This exists and is set to a list of PR numbers when testmerges exist - goonstation/goonhub/app/Libraries/GameBuilder/Build.php#L392
+// #define TESTMERGE_PRS list(123, 456)
+
+// The following describe when the server was compiled
+#define BUILD_TIME_TIMEZONE_ALPHA "UTC" // Server is UTC
+#define BUILD_TIME_TIMEZONE_OFFSET 0000
+#define BUILD_TIME_FULL "2009-02-13 18:31:30"
+#define BUILD_TIME_YEAR 2053
+#define BUILD_TIME_MONTH 03
+#define BUILD_TIME_DAY 13
+#define BUILD_TIME_HOUR 18
+#define BUILD_TIME_MINUTE 31
+#define BUILD_TIME_SECOND 30
+#define BUILD_TIME_UNIX 1234567890 // Unix epoch, second precision
+
+// Uncomment and set to a URL with a zip of the RSC to offload RSC sending to an external webserver/CDN.
+//#define PRELOAD_RSC_URL ""
+
+// -- Internal __build.dm stuff --
+#ifdef GENERATE_GOONHUB_MAP
+#define GOTTA_GO_FAST_BUT_ZLEVELS_TOO_SLOW
+#define IM_REALLY_IN_A_FUCKING_HURRY_HERE
+#define I_AM_ABOVE_THE_LAW
+#define ALL_ROBOT_AND_COMPUTERS_MUST_SHUT_THE_HELL_UP
+#define BAD_MONKEY_NO_BANANA
+#define CLONING_IS_A_SIN
+#define NO_CRITTERS
+#define NO_RANDOM_ROOMS
+#define NO_RANDOM_EVENTS
+#define NO_SHUTTLE_CALLS
+#define FUCK_OFF_WITH_THE_MAIL
+#define GHOSTDRONES_ON_STRIKE
+#define STOP_BREAKING_THE_FUCKING_LIGHTS_I_WANT_TO_SEE_SHIT
+#endif
+
 #ifdef STOP_DISTRACTING_ME
 #define I_AM_ABOVE_THE_LAW
 #define ALL_ROBOT_AND_COMPUTERS_MUST_SHUT_THE_HELL_UP
@@ -207,31 +254,3 @@ o+`        `-` ``..-:yooos-..----------..`
 #define IM_TESTING_SHIT_STOP_BARFING_CHANGELOGS_AT_ME
 #define I_DONT_WANNA_WAIT_FOR_THIS_PREGAME_SHIT_JUST_GO
 #endif
-
-//----- Testmerge & Revision Information -----//
-
-/// The literal current commit hash the server is running off of
-#define VCS_REVISION "1"
-/// The literal current author of the commit the server is runing off of
-#define VCS_AUTHOR "bob"
-/// The latest commit on the origin at the time of the server build, for display
-#define ORIGIN_REVISION "1"
-/// The latest commit author on the origin at the time of the server build, for display
-#define ORIGIN_AUTHOR "bob"
-// This exists and is set to a list of PR numbers when testmerges exist - goonstation/goonhub/app/Libraries/GameBuilder/Build.php#L392
-// #define TESTMERGE_PRS list(123, 456)
-
-// The following describe when the server was compiled
-#define BUILD_TIME_TIMEZONE_ALPHA "UTC" // Server is UTC
-#define BUILD_TIME_TIMEZONE_OFFSET 0000
-#define BUILD_TIME_FULL "2009-02-13 18:31:30"
-#define BUILD_TIME_YEAR 2053
-#define BUILD_TIME_MONTH 03
-#define BUILD_TIME_DAY 13
-#define BUILD_TIME_HOUR 18
-#define BUILD_TIME_MINUTE 31
-#define BUILD_TIME_SECOND 30
-#define BUILD_TIME_UNIX 1234567890 // Unix epoch, second precision
-
-// Uncomment and set to a URL with a zip of the RSC to offload RSC sending to an external webserver/CDN.
-//#define PRELOAD_RSC_URL ""

_std/__build.dm

@@ -78,6 +78,7 @@
 #include "defines\item.dm"
 #include "defines\interdictor.dm"
 #include "defines\invisibility.dm"
+#include "defines\recipe.dm"
 #include "defines\jobs.dm"
 #include "defines\landmarks.dm"
 #include "defines\layer.dm"

_std/__std.dme

@@ -39,7 +39,7 @@
 #define access_robotics 29
 #define access_fine_large 30
 #define access_cargo 31 // QM.
-// Access 32 Unused
+#define access_pharmacy 32
 #define access_chemistry 33
 #define access_dwaine_superuser 34 // So it's not the same as the RD's office and locker.
 #define access_hydro 35

_std/defines/access.dm

@@ -3,6 +3,8 @@
 #define FORENSIC_GROUP_TEXT 1
 #define FORENSIC_GROUP_NOTES 2 // Basically a misc section
 #define FORENSIC_GROUP_SLEUTH 3 // Pug sleuthing smells
+#define FORENSIC_GROUP_ADMINPRINTS 4 // Chain of custody for admins
+#define FORENSIC_GROUP_FINGERPRINTS 5
 
 // Each group has a unique variable. Use that to create a new group.
 // Placed here together with the FORENSIC_GROUP variable defines
@@ -12,6 +14,8 @@
 		if(FORENSIC_GROUP_TEXT) group = new/datum/forensic_group/text
 		if(FORENSIC_GROUP_NOTES) group = new/datum/forensic_group/basic_list/notes
 		if(FORENSIC_GROUP_SLEUTH) group = new/datum/forensic_group/basic_list/sleuth
+		if(FORENSIC_GROUP_ADMINPRINTS) group = new/datum/forensic_group/adminprints
+		if(FORENSIC_GROUP_FINGERPRINTS) group = new/datum/forensic_group/fingerprints
 	if(!group)
 		CRASH("Forensic group category [category] not found.")
 	return group
@@ -31,3 +35,10 @@
 #define FORENSIC_VALUE_MULT 3
 #define FORENSIC_VALUE_MAX 4
 #define FORENSIC_VALUE_MIN 5
+
+// Chose 16 letters that look distinct and sort of fingerprinty with curves and such
+#define FORENSIC_CHARS_FINGERPRINTS list("a","b","c","d","e","g","n","o","p","q","s","u","v","x","y","z")
+#define FORENSIC_CHARS_HEX list("0","1","2","3","4","5","6","7","8","9","A","B","C","D","E","F")
+
+#define FORENSIC_GLOVE_MASK_FINGERLESS "0123-4567-89AB-CDEF"
+#define FORENSIC_GLOVE_MASK_NONE "...???..."

_std/defines/forensics.dm

@@ -94,6 +94,9 @@
 #define OMNI_MODE_WELDING 7
 #define OMNI_MODE_DECON 8
 #define OMNI_MODE_SOLDERING 9
+#define OMNI_MODE_SPOONING 10
+#define OMNI_MODE_UNCAPPING 11
+#define OMNI_MODE_SAWING 12
 
 //fluid_canister flags
 #define FLUID_CANISTER_MODE_OFF 1

_std/defines/item.dm

@@ -0,0 +1,3 @@
+// machine IDs for recipe instructions
+#define RECIPE_ID_OVEN "oven"
+#define RECIPE_ID_MIXER "mixer"

_std/defines/recipe.dm

@@ -386,3 +386,10 @@ proc/params2complexlist(params)
 	for(var/i in 1 to round(listlen / 2)) \
 		x.Swap(i, listlen - i + 1) \
 	} while (0)
+
+/// Cuts elements from the start and end of the list.
+#define trim_list(L, start_amt, end_amt) \
+	do { \
+	L.Cut(length(L) - end_amt + 1); \
+	L.Cut(1, start_amt + 1) \
+	} while (0)

_std/lists.dm

@@ -5,6 +5,7 @@
 #define PLANE_UNDERFLOOR -115
 #define PLANE_FLOOR -110
 #define PLANE_WALL -105
+#define PLANE_OVERFLOOR -103
 #define PLANE_NOSHADOW_BELOW -102
 #define PLANE_DEFAULT -101
 #define PLANE_DEFAULT_NOWARP -100 //for objects which should not be affected by gravitational lensing

_std/plane.dm

@@ -89,6 +89,147 @@
 		indices = null
 		..()
 
+	proc/forensic_search(var/search_input)
+		var/list/datum/db_record/record_matches = forensic_search_subjects(search_input)
+		var/result = ""
+		if(length(record_matches) > 0)
+			result = SPAN_SUCCESS("<li>Records matching \"[search_input]\"</li>")
+			var/match_num = ""
+			if(length(record_matches) > 1)
+				match_num = " (1/[length(record_matches)])"
+			var/match_count = 1
+			for(var/datum/db_record/R in record_matches)
+				result += "<li>[SPAN_NOTICE("Match[match_num]:<b> [R["name"]]</b>")]" + " ([R["rank"]])</li>"
+				var/fprint_right = R["fingerprint_right"]
+				var/fprint_left = R["fingerprint_left"]
+				if(fprint_right == fprint_left)
+					result += "<li style='margin-left:15px;list-style-type:none'><i>Fingerprints:</i> [fprint_right]</li>"
+				else
+					result += "<li style='margin-left:15px;list-style-type:none'><i>Fingerprint (R):</i> [fprint_right]</li>\
+								<li style='margin-left:15px;list-style-type:none'><i>Fingerprint (L):</i> [fprint_left]</li>"
+				result += "<li style='margin-left:15px;list-style-type:none'><i>Blood DNA:</i> [R["dna"]]</li>"
+				match_count++
+				match_num = " ([match_count]/[length(record_matches)])"
+			return result
+
+		// Search for partial fingerprints
+		record_matches = forensic_search_fingerprint_partial(search_input)
+		if(length(record_matches) > 0)
+			result = SPAN_SUCCESS("<li>Potential matches for \"[search_input]\"</li>")
+			for(var/datum/db_record/R in record_matches)
+				var/fprint_right = R["fingerprint_right"]
+				var/fprint_left = R["fingerprint_left"]
+				var/match_result = SPAN_NOTICE("<li style='margin-left:15px;list-style-type:none'>["<b>[R["name"]]</b>"]")
+				if(fprint_right == fprint_left)
+					match_result += ": [fprint_right]</li>"
+				else
+					match_result += ": [fprint_right]  |  [fprint_left]</li>"
+				result += match_result
+			return result
+		return SPAN_ALERT("No match found in security records for \"[search_input]\".")
+
+	/// Search for records based on name, dna, or fingerprints
+	proc/forensic_search_subjects(var/search_input)
+		var/search_low = lowertext(search_input)
+		var/list/datum/db_record/subject_records = list()
+		for(var/datum/db_record/R as anything in data_core.general.records)
+			var/is_subj = (search_low == lowertext(R["dna"]))
+			is_subj = is_subj || (search_low == lowertext(R["name"]))
+			is_subj = is_subj || (search_low == lowertext(R["fingerprint_right"]))
+			is_subj = is_subj || (search_low == lowertext(R["fingerprint_left"]))
+			if(is_subj)
+				subject_records += R
+		return subject_records
+
+	proc/forensic_search_fingerprint_partial(var/search_input)
+		RETURN_TYPE(/list/datum/db_record)
+		if(!search_input)
+			return null
+		var/list/record_prints = list()
+		var/list/datum/db_record/record_refs = list()
+
+		// Collect the fingerprint data and their associated records that we need to go through
+		for(var/list/datum/db_record/record in data_core.general.records)
+			var/fprint_right = record["fingerprint_right"]
+			var/fprint_left = record["fingerprint_left"]
+			if(fprint_right == fprint_left)
+				if(!fprint_right)
+					continue
+				record_prints.Add(fprint_right)
+				record_refs.Add(record)
+			else
+				if(fprint_right)
+					record_prints.Add(fprint_right)
+					record_refs.Add(record)
+				if(fprint_left)
+					record_prints.Add(fprint_left)
+					record_refs.Add(record)
+		if(!record_prints || !record_refs)
+			return null
+
+		// Get the input into a more usable format
+		// Print: (..3..-4567-...?...-CDEF) => Bunches: list("_3_","4567","_?_","CDEF")
+		search_input = limit_chars(search_input, list("?",".","-"), TRUE, TRUE)
+		var/list/input_bunches = splittext(search_input, "-")
+		for(var/i in length(input_bunches) to 1 step -1)
+			if(input_bunches[i] == "")
+				input_bunches.Cut(i, i+1)
+		if(length(input_bunches) == 0)
+			return null
+		var/list/input_empty = list()
+		for(var/i in 1 to length(input_bunches))
+			input_bunches[i] = text_replace_repeat(input_bunches[i], ".", "_")
+			var/is_empty = !contains_chars(input_bunches[i], null, TRUE, TRUE)
+			input_empty += is_empty
+
+		var/trim_start = 0
+		var/trim_end = 0
+		for(var/i in 1 to length(input_empty))
+			if(!input_empty[i])
+				break
+			trim_start++
+		for(var/i in length(input_empty) to 1 step -1)
+			if(!input_empty[i])
+				break
+			trim_end++
+		trim_list(input_bunches, trim_start, trim_end)
+		if(length(input_bunches) == 0)
+			return null
+
+		// Find and collect all records containing a matching print
+		var/list/datum/db_record/match_records = list() // All records with a matching print
+		for(var/i in 1 to length(record_prints))
+			var/list/rec_bunches = splittext(record_prints[i], "-")
+			trim_list(rec_bunches, trim_start, trim_end)
+			if(length(rec_bunches) == 0)
+				continue
+			var/input_index = 1
+			for(var/k in 1 to length(rec_bunches))
+				var/bunch_match = FALSE
+				if(findtext(input_bunches[input_index], "_")) // (-...A...-) or (...A...B...)
+					// Not efficient to split the input bunch every time, but should be fine
+					var/list/input_bunch_split = splittext(input_bunches[input_index], "_")
+					input_bunch_split.RemoveAll("")
+					if(length(input_empty) == 1)
+						// Check the whole fingerprint rather than individual bunches
+						if(findtextEx_ordered(record_prints[i], input_bunch_split))
+							bunch_match = TRUE
+					else if(findtextEx_ordered(rec_bunches[k], input_bunch_split))
+						bunch_match = TRUE
+				else if(findtextEx(input_bunches[input_index], "?"))
+					if(text_replace_repeat(input_bunches[input_index], "?", "?") == "?") // Bunch only contains question marks
+						input_index++
+					else if(text_equals_partial(rec_bunches[k], input_bunches[input_index], "?")) // (-??A?-)
+						bunch_match = TRUE
+				if(bunch_match)
+					input_index++
+				else
+					input_index = 1
+				if(input_index == length(input_bunches) + 1) // Found a match!
+					match_records += record_refs[i]
+					break
+		return match_records
+
 /datum/db_record
 	VAR_PRIVATE/datum/record_database/db
 	VAR_PRIVATE/list/fields