Merge branch 'master' of https://github.com/cmss13-devs/cmss13

.github/CONTRIBUTING.md

@@ -74,10 +74,10 @@ These are the few directives we have for project maintainers.
     - Try to get secondary maintainer approval before merging if you are able to.
   - PRs with empty commits intended to generate a changelog.
 - Do not merge PRs that contain content from the [banned content list](./CONTRIBUTING.md#banned-content).
-- Do not merge PRs that contain balance changes without GA approval. Exceptions include:
-  - Any PR that has been un-reviewed by a GA for 7 days.
+- Do not merge PRs that contain balance changes without Maintainer Manager approval. Exceptions include:
+  - Any PR that has been un-reviewed by a Maintainer Manager for 7 days.
 - Do not remove the DNM label that another Maintainer has applied. Exceptions include:
-  - GAs removing a DNM label placed by a Maintainer for Balance/Design reasons
+  - Maintainer Managers removing a DNM label placed by a Maintainer for Balance/Design reasons
 
 These are not steadfast rules as maintainers are expected to use their best judgement when operating.
 

.github/workflows/generate_documentation.yml

@@ -21,7 +21,7 @@ jobs:
         run: |
           ~/dmdoc
           touch dmdoc/.nojekyll
-          echo codedocs.tgstation13.org > dmdoc/CNAME
+          echo docs.cm-ss13.com > dmdoc/CNAME
       - name: Deploy
         uses: JamesIves/[email protected]
         with:

code/__DEFINES/conflict.dm

@@ -232,6 +232,7 @@
 //OB timings
 #define OB_TRAVEL_TIMING 12 SECONDS
 #define OB_CRASHING_DOWN 1 SECONDS
+#define OB_CLUSTER_DURATION 45 SECONDS
 //=================================================
 
 //Health of various items

code/__DEFINES/dcs/signals/atom/signals_obj.dm

@@ -4,6 +4,8 @@
 
 /// From /obj/effect/alien/weeds/Initialize()
 #define COMSIG_WEEDNODE_GROWTH_COMPLETE "weednode_growth_complete"
+/// From /obj/effect/alien/weeds/Initialize()
+#define COMSIG_WEEDNODE_GROWTH "weednode_growth"
 /// From /obj/effect/alien/weeds/proc/on_weed_expand()
 #define COMSIG_WEEDNODE_CANNOT_EXPAND_FURTHER "weednode_cannot_expand_further"
 
@@ -24,3 +26,6 @@
 #define COMSIG_TRANSMITTER_UPDATE_ICON "transmitter_update_icon"
 
 #define COMSIG_TENT_COLLAPSING "tent_collapsing"
+
+/// from /obj/proc/afterbuckle()
+#define COSMIG_OBJ_AFTER_BUCKLE "signal_obj_after_buckle"

code/__DEFINES/dcs/signals/signals_datum.dm

@@ -61,3 +61,6 @@
 
 // from /datum/emergency_call/proc/spawn_candidates()
 #define COMSIG_ERT_SETUP "ert_setup"
+
+// from /proc/update_living_queens() : /mob/living/carbon/xenomorph/queen
+#define COMSIG_HIVE_NEW_QUEEN "hive_new_queen"

code/__DEFINES/dcs/signals/signals_global.dm

@@ -53,3 +53,6 @@
 
 /// From /datum/admins/proc/force_predator_round()
 #define COMSIG_GLOB_PREDATOR_ROUND_TOGGLED "!predator_round_toglged"
+
+/// From /datum/game_mode/colonialmarines/proc/check_ground_humans()
+#define COMSIG_GLOB_GROUNDSIDE_FORSAKEN_HANDLING "!groundside_forsaken_handling"

code/__DEFINES/subsystems.dm

@@ -113,7 +113,8 @@
 #define SS_INIT_INPUT   85
 #define SS_INIT_FAIL_TO_TOPIC 84
 #define SS_INIT_TOPIC 83
-#define SS_INIT_RUST    26
+#define SS_INIT_RUST    30
+#define SS_INIT_INFLUXDRIVER 28
 #define SS_INIT_SUPPLY_SHUTTLE  25
 #define SS_INIT_GARBAGE 24
 #define SS_INIT_EVENTS 23.5
@@ -133,7 +134,9 @@
 #define SS_INIT_MORE_INIT   16
 #define SS_INIT_AIR 15
 #define SS_INIT_TELEPORTER  13
-#define SS_INIT_LIGHTING 12
+#define SS_INIT_INFLUXMCSTATS 12
+#define SS_INIT_INFLUXSTATS 11
+#define SS_INIT_LIGHTING 10
 #define SS_INIT_DEFCON 9
 #define SS_INIT_LAW 6
 #define SS_INIT_FZ_TRANSITIONS 5
@@ -212,12 +215,15 @@
 #define SS_PRIORITY_UNSPECIFIED 30
 #define SS_PRIORITY_PROCESS 25
 #define SS_PRIORITY_SOUNDSCAPE    24
+#define SS_PRIORITY_INFLUXDRIVER  23
 #define SS_PRIORITY_PAGER_STATUS   22
 #define SS_PRIORITY_LIGHTING    20
 #define SS_PRIORITY_TRACKING    19
+#define SS_PRIORITY_DATABASE    15
 #define SS_PRIORITY_MINIMAPS 11
 #define SS_PRIORITY_PING    10
-#define SS_PRIORITY_DATABASE    15
+#define SS_PRIORITY_INFLUXMCSTATS 9
+#define SS_PRIORITY_INFLUXSTATS 8
 #define SS_PRIORITY_PLAYTIME    5
 #define SS_PRIORITY_PERFLOGGING 4
 #define SS_PRIORITY_CORPSESPAWNER  3

code/__DEFINES/tgui.dm

@@ -32,7 +32,7 @@
 /// Creates a message packet for sending via output()
 // This is {"type":type,"payload":payload}, but pre-encoded. This is much faster
 // than doing it the normal way.
-// To ensure this is correct, this is unit tested in tgui_create_message. However, CM does not have unit tests available.
+// To ensure this is correct, this is unit tested in tgui_create_message.
 #define TGUI_CREATE_MESSAGE(type, payload) ( \
 	"%7b%22type%22%3a%22[type]%22%2c%22payload%22%3a[url_encode(json_encode(payload))]%7d" \
 )

code/__DEFINES/traits.dm

@@ -123,7 +123,7 @@
 #define TRAIT_SUPER_STRONG "t_super_strong"
 /// Foreign biology. Basic medHUDs won't show the mob. (Yautja, Zombies)
 #define TRAIT_FOREIGN_BIO "t_foreign_bio"
-/// Eye color changes on intent. (G1 Synths)
+/// Eye color changes on intent. (G1 Synths and WJs)
 #define TRAIT_INTENT_EYES "t_intent_eyes"
 /// Masked synthetic biology. Basic medHUDs will percieve the mob as human. (Infiltrator Synths)
 #define TRAIT_INFILTRATOR_SYNTH "t_infiltrator_synth"
@@ -157,6 +157,8 @@
 #define TRAIT_LEADERSHIP "t_leadership"
 /// If the mob can see the reagents contents of stuff
 #define TRAIT_REAGENT_SCANNER "reagent_scanner"
+/// If the mob cannot eat/be fed
+#define TRAIT_CANNOT_EAT "t_cannot_eat"
 /// If the mob is being lazed by a sniper spotter
 #define TRAIT_SPOTTER_LAZED "t_spotter_lazed"
 /// If the mob has ear protection. Protects from external ear damage effects. Includes explosions, firing the RPG, screeching DEAFNESS only, and flashbangs.
@@ -211,6 +213,9 @@
 //ie. naming a regulation tape "example" will become regulation tape (example)
 #define TRAIT_ITEM_RENAME_SPECIAL "t_item_rename_special"
 
+// This item can't be implanted into someone, regardless of the size of the item.
+#define TRAIT_ITEM_NOT_IMPLANTABLE "t_item_not_implantable"
+
 //-- structure traits --
 // TABLE TRAITS
 /// If the table is being flipped, prevent any changes that will mess with adjacency handling
@@ -258,6 +263,7 @@ GLOBAL_LIST_INIT(traits_by_type, list(
 		"TRAIT_BIMEX" = TRAIT_BIMEX,
 		"TRAIT_EMOTE_CD_EXEMPT" = TRAIT_EMOTE_CD_EXEMPT,
 		"TRAIT_LISPING" = TRAIT_LISPING,
+		"TRAIT_CANNOT_EAT" = TRAIT_CANNOT_EAT,
 	),
 	/mob/living/carbon/xenomorph = list(
 		"TRAIT_ABILITY_NO_PLASMA_TRANSFER" = TRAIT_ABILITY_NO_PLASMA_TRANSFER,

code/__DEFINES/weapon_stats.dm

@@ -1,7 +1,7 @@
 #define HUMAN_UNIVERSAL_DAMAGEMULT 1
 
 #define RECOIL_BUILDUP_VIEWPUNCH_MULTIPLIER 0.1
-
+#define BASE_VELOCITY_BONUS 0
 
 #define PROJ_BASE_ACCURACY_MULT 0.01
 #define PROJ_BASE_DAMAGE_MULT 0.01

code/__DEFINES/wj_emotes.dm

@@ -0,0 +1,8 @@
+#define JOE_EMOTE_CATEGORY_GREETING "Greeting"
+#define JOE_EMOTE_CATEGORY_TASK_UPDATE "Task Update"
+#define JOE_EMOTE_CATEGORY_RESTRICTED_AREA "Restricted Area"
+#define JOE_EMOTE_CATEGORY_FAREWELL "Farewell"
+#define JOE_EMOTE_CATEGORY_QUIP "Quip"
+#define JOE_EMOTE_CATEGORY_WARNING "Warning"
+#define JOE_EMOTE_CATEGORY_QUESTION "Question"
+#define JOE_EMOTE_CATEGORY_NOTICE "Notice"

code/__DEFINES/xeno.dm

@@ -132,6 +132,7 @@
 // Weed defines
 #define WEED_LEVEL_WEAK 0
 #define WEED_LEVEL_STANDARD  1.5
+#define WEED_LEVEL_HARDY 1.6
 #define WEED_LEVEL_HIVE   4
 
 #define WEED_RANGE_STANDARD  3

code/__HELPERS/cmp.dm

@@ -65,4 +65,4 @@ var/atom/cmp_dist_origin=null
 /// Compares observers based on their larva_queue_time value in ascending order
 /// Assumes the client on the observer is not null
 /proc/cmp_obs_larvaqueuetime_asc(mob/dead/observer/A, mob/dead/observer/B)
-	return A.client.larva_queue_time - B.client.larva_queue_time
+	return A.client.player_details.larva_queue_time - B.client.player_details.larva_queue_time

code/__HELPERS/game.dm

@@ -302,7 +302,7 @@
 			to_chat(candidates[i], chat_message)
 
 		// Count how many are prioritized
-		if(cur_obs.client.larva_queue_time < 2) // 0 and 1 because facehuggers/t-domers are slightly deprioritized
+		if(cur_obs.client.player_details.larva_queue_time < 2) // 0 and 1 because facehuggers/t-domers are slightly deprioritized
 			new_players++
 
 /proc/convert_k2c(temp)

code/__HELPERS/text.dm

@@ -164,6 +164,11 @@
 		t = "0[t]"
 	return t
 
+/proc/pad_trailing(text, padding, size)
+	while (length(text) < size)
+		text = "[text][padding]"
+	return text
+
 //Adds 'u' number of spaces ahead of the text 't'
 /proc/add_lspace(t, u)
 	while(length(t) < u)

code/_globalvars/global_lists.dm

@@ -10,6 +10,7 @@ GLOBAL_LIST_EMPTY(GeneralFaxes) //Inter-machine faxes
 GLOBAL_LIST_EMPTY(fax_contents) //List of fax contents to maintain it even if source paper is deleted
 
 GLOBAL_LIST_EMPTY(failed_fultons) //A list of fultoned items which weren't collected and fell back down
+GLOBAL_LIST_EMPTY(larva_burst_by_hive)
 
 GLOBAL_LIST_INIT_TYPED(custom_huds_list, /datum/custom_hud, setup_all_huds())
 GLOBAL_LIST_INIT_TYPED(custom_human_huds, /datum/custom_hud, setup_human_huds())

code/controllers/configuration/entries/general.dm

@@ -529,6 +529,25 @@ This maintains a list of ip addresses that are able to bypass topic filtering.
 
 /datum/config_entry/string/round_results_webhook_url
 
+/// InfluxDB v2 Host to connect to for sending statistics (over HTTP API)
+/datum/config_entry/string/influxdb_host
+/// InfluxDB v2 Bucket to send staistics to
+/datum/config_entry/string/influxdb_bucket
+/// InfluxDB v2 Organization to access buckets of
+/datum/config_entry/string/influxdb_org
+/// InfluxDB v2 API Token to access the organization and bucket
+/datum/config_entry/string/influxdb_token
+
+/// How often to snapshot general game statistics to influxdb driver
+/datum/config_entry/number/influxdb_stats_period
+	config_entry_value = 30
+/// How often to snapshot MC statistics
+/datum/config_entry/number/influxdb_mcstats_period
+	config_entry_value = 60
+/// How often to send queued influxdb statistics
+/datum/config_entry/number/influxdb_send_period
+	config_entry_value = 10
+
 /// logs all timers in buckets on automatic bucket reset (Useful for timer debugging)
 /datum/config_entry/flag/log_timers_on_bucket_reset
 

code/controllers/subsystem/influxdriver.dm

@@ -0,0 +1,132 @@
+/// Sends collected statistics to an influxdb v2 backend periodically
+SUBSYSTEM_DEF(influxdriver)
+	name       = "InfluxDB Driver"
+	wait       = 10 SECONDS
+	init_order = SS_INIT_INFLUXDRIVER
+	priority   = SS_PRIORITY_INFLUXDRIVER
+	runlevels  = RUNLEVELS_DEFAULT|RUNLEVEL_LOBBY
+
+	var/list/send_queue = list()
+
+	/// Maximum amount of metric lines to send at most in one request
+	/// This is neccessary because sending a lot of metrics can get expensive
+	/// and drive the subsystem into overtime, but we can't split the work as it'd be even less efficient
+	var/max_batch = 150
+
+	/// Last timestamp in microseconds
+	var/timestamp_cache_realtime
+	/// Last tick time the timestamp was taken at
+	var/timestamp_cache_worldtime
+
+/datum/controller/subsystem/influxdriver/Initialize()
+	var/period = text2num(CONFIG_GET(number/influxdb_send_period))
+	if(isnum(period))
+		wait = max(period * (1 SECONDS), 2 SECONDS)
+	return SS_INIT_SUCCESS
+
+/datum/controller/subsystem/influxdriver/stat_entry(msg)
+	msg += "period=[wait] queue=[length(send_queue)]"
+	return ..()
+
+/datum/controller/subsystem/influxdriver/proc/unix_timestamp_string() // pending change to rust-g
+	return RUSTG_CALL(RUST_G, "unix_timestamp")()
+
+/datum/controller/subsystem/influxdriver/proc/update_timestamp()
+	PRIVATE_PROC(TRUE)
+	// We make only one request to rustg per game tick, so we cache the result per world.time
+	var/whole_timestamp = unix_timestamp_string() // Format "7129739474.4758981" - timestamp with up to 7-8 decimals
+	var/list/tsparts = splittext(whole_timestamp, ".")
+	var/fractional = copytext(pad_trailing(tsparts[2], "0", 6), 1, 7) // in microseconds
+	timestamp_cache_worldtime = world.time
+	timestamp_cache_realtime = "[tsparts[1]][fractional]"
+
+/datum/controller/subsystem/influxdriver/fire(resumed)
+	var/maxlen = min(length(send_queue)+1, max_batch)
+	var/list/queue = send_queue.Copy(1, maxlen)
+	send_queue.Cut(1, maxlen)
+	flush_queue(queue)
+
+/// Flushes measurements batch to InfluxDB backend
+/datum/controller/subsystem/influxdriver/proc/flush_queue(list/queue)
+	PRIVATE_PROC(TRUE)
+
+	var/host   = CONFIG_GET(string/influxdb_host)
+	var/token  = CONFIG_GET(string/influxdb_token)
+	var/bucket = CONFIG_GET(string/influxdb_bucket)
+	var/org    = CONFIG_GET(string/influxdb_org)
+
+	if(!host || !token || !bucket || !org)
+		can_fire = FALSE
+		return
+
+	if(!length(queue))
+		return // Nothing to do
+
+	var/url = "[host]/api/v2/write?org=[org]&bucket=[bucket]&precision=us" // microseconds
+	var/list/headers = list()
+	headers["Authorization"] = "Token [token]"
+	headers["Content-Type"] = "text/plain; charset=utf-8"
+	headers["Accept"] = "application/json"
+
+	var/datum/http_request/request = new
+	var/payload = ""
+	for(var/line in queue)
+		payload += "[line]\n"
+	request.prepare(RUSTG_HTTP_METHOD_POST, url, payload, headers)
+	request.begin_async()
+	// TODO possibly check back result of request later
+
+/// Enqueues sending to InfluxDB Backend selected measurement values - round_id and timestamp are filled in automatically
+/datum/controller/subsystem/influxdriver/proc/enqueue_stats(measurement, list/tags, list/fields)
+	. = FALSE
+	var/valid = FALSE
+	var/serialized = "[measurement],round_id=[GLOB.round_id]"
+	if(tags)
+		for(var/tag in tags)
+			var/serialized_tag = serialize_field(tag, tags[tag])
+			if(serialized_tag)
+				serialized += ",[serialized_tag]"
+	serialized += " "
+	var/comma = ""
+	for(var/field in fields)
+		var/serialized_field = serialize_field(field, fields[field])
+		if(serialized_field)
+			valid = TRUE
+			serialized += "[comma][serialized_field]"
+			comma = ","
+	if(!valid)
+		CRASH("Attempted to serialize to InfluxDB backend an invalid measurement (likely has no fields)")
+	if(timestamp_cache_worldtime != world.time)
+		update_timestamp()
+	serialized += " [timestamp_cache_realtime]"
+	send_queue += serialized
+	return TRUE
+
+/// Enqueues sending varied stats in a dumb and simpler format directly as: measurement count=
+/datum/controller/subsystem/influxdriver/proc/enqueue_stats_crude(measurement, value, field_name = "count")
+	. = FALSE
+	var/serialized_field = serialize_field(field_name, value)
+	if(!length(serialized_field))
+		return
+	if(timestamp_cache_worldtime != world.time)
+		update_timestamp()
+	var/serialized = "[measurement],round_id=[GLOB.round_id] [serialized_field] [timestamp_cache_realtime]"
+	send_queue += serialized
+	return TRUE
+
+/// Puts a single field or tag value into InfluxDB Line format
+/datum/controller/subsystem/influxdriver/proc/serialize_field(field, value)
+	var/static/regex/whitelistedCharacters = regex(@{"([^a-zA-Z0-9_]+)"}, "g")
+	var/sanitized_field = whitelistedCharacters.Replace("[field]", "")
+	if(!length(sanitized_field) || copytext(sanitized_field, 1, 2) == "_")
+		CRASH("Invalid tag/field for InfluxDB serialization: '[sanitized_field]' (original: '[field]')")
+	var/sanitized_value
+	if(isnum(value))
+		sanitized_value = value
+	else if(istext(value))
+		sanitized_value = whitelistedCharacters.Replace("[value]", "")
+		if(!length(sanitized_value) || copytext(sanitized_value, 1, 2) == "_")
+			CRASH("Invalid value for InfluxDB serialization: '[sanitized_value]' (original: '[value]')")
+	else
+		CRASH("Invalid value type passed for InfluxDB serialization: '[value]'")
+	return "[sanitized_field]=[sanitized_value]"