Merge branch 'master' into burnt-match-light-fix

.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/guides/STANDARDS.md

@@ -126,7 +126,7 @@ While we normally encourage (and in some cases, even require) bringing out of da
 This is a simple one - as we will eventually move to 515, we will need to ditch this kind of callback. So please don't add any new ones. Make our lives easier.
 
 ### PROC_REF Macros
- When referencing procs in RegisterSignal, Callback and other procs you should use PROC_REF,TYPE_PROC_REF and GLOBAL_PROC_REF macros.
+ When referencing procs in RegisterSignal, Callback and other procs you should use PROC_REF, TYPE_PROC_REF and GLOBAL_PROC_REF macros.
  They ensure compilation fails if the reffered to procs change names or get removed.
  The macro to be used depends on how the proc you're in relates to the proc you want to use:
 
@@ -168,6 +168,8 @@ This is a simple one - as we will eventually move to 515, we will need to ditch
  	addtimer(CALLBACK(GLOBAL_PROC, GLOBAL_PROC_REF(funny)), 100))
  ```
 
+ Note that the same rules go for verbs too! We have VERB_REF() and TYPE_VERB_REF() as you need it in these same cases. GLOBAL_VERB_REF() isn't a thing however, as verbs are not global.
+
 ### Signal Handlers
 
 All procs that are registered to listen for signals using `RegisterSignal()` must contain at the start of the proc `SIGNAL_HANDLER` eg;

.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/ARES.dm

@@ -0,0 +1,54 @@
+/// Generic access for 1:1 conversations with ARES and unrestricted commands.
+#define ARES_ACCESS_BASIC 0
+/// Secure Access, can read ARES Announcements and Bioscans.
+#define ARES_ACCESS_COMMAND 1
+#define ARES_ACCESS_JOE 2
+/// CL, can read Apollo Log and also Delete Announcements.
+#define ARES_ACCESS_CORPORATE 3
+/// Senior Command, can Delete Bioscans.
+#define ARES_ACCESS_SENIOR 4
+/// Synth, CE & Commanding Officer, can read the access log.
+#define ARES_ACCESS_CE 5
+#define ARES_ACCESS_SYNTH 6
+#define ARES_ACCESS_CO 7
+/// High Command, can read the deletion log.
+#define ARES_ACCESS_HIGH 8
+#define ARES_ACCESS_WY_COMMAND 9
+/// Debugging. Allows me to view everything without using a high command rank. Unlikely to stay in a full merge.
+#define ARES_ACCESS_DEBUG 10
+
+#define ARES_RECORD_ANNOUNCE "Announcement Record"
+#define ARES_RECORD_ANTIAIR "AntiAir Control Log"
+#define ARES_RECORD_ASRS "Requisition Record"
+#define ARES_RECORD_BIOSCAN "Bioscan Record"
+#define ARES_RECORD_BOMB "Orbital Bombardment Record"
+#define ARES_RECORD_DELETED "Deleted Record"
+#define ARES_RECORD_SECURITY "Security Update"
+#define ARES_RECORD_MAINTENANCE "Maintenance Ticket"
+#define ARES_RECORD_ACCESS "Access Ticket"
+
+/// Not by ARES logged through marine_announcement()
+#define ARES_LOG_NONE 0
+/// Logged with all announcements
+#define ARES_LOG_MAIN 1
+/// Logged in the security updates
+#define ARES_LOG_SECURITY 2
+
+/// Access levels specifically for Working Joe management console
+#define APOLLO_ACCESS_REQUEST 0
+#define APOLLO_ACCESS_REPORTER 1
+#define APOLLO_ACCESS_TEMP 2
+#define APOLLO_ACCESS_AUTHED 3
+#define APOLLO_ACCESS_JOE 4
+#define APOLLO_ACCESS_DEBUG 5
+
+/// Ticket statuses, both for Access and Maintenance
+#define TICKET_PENDING "pending"
+#define TICKET_ASSIGNED "assigned"
+#define TICKET_REJECTED "rejected"
+#define TICKET_CANCELLED "cancelled"
+#define TICKET_COMPLETED "complete"
+
+/// Cooldowns
+#define COOLDOWN_ARES_SENSOR 60 SECONDS
+#define COOLDOWN_ARES_ACCESS_CONTROL 20 SECONDS

code/__DEFINES/__game.dm

@@ -106,6 +106,7 @@ block( \
 #define SOUND_REBOOT (1<<5)
 #define SOUND_ADMIN_MEME (1<<6)
 #define SOUND_ADMIN_ATMOSPHERIC (1<<7)
+#define SOUND_ARES_MESSAGE (1<<8)
 
 //toggles_chat
 #define CHAT_OOC (1<<0)

code/__DEFINES/access.dm

@@ -43,6 +43,14 @@ most of them are tied into map-placed objects. This should be reworked in the fu
 
 #define ACCESS_MARINE_SYNTH 36
 
+// AI Core Accesses
+/// Used in temporary passes
+#define ACCESS_MARINE_AI_TEMP 90
+/// Used as dedicated access to ARES Core.
+#define ACCESS_MARINE_AI 91
+/// Used to access Maintenance Protocols on ARES Interface.
+#define ACCESS_ARES_DEBUG 92
+
 //Surface access levels
 #define ACCESS_CIVILIAN_PUBLIC 100
 #define ACCESS_CIVILIAN_LOGISTICS 101

code/__DEFINES/admin.dm

@@ -48,6 +48,8 @@ var/global/list/note_categories = list("Admin", "Merit", "Commanding Officer", "
 #define CC_MARK(user) "(<a href='?_src_=admin_holder;[HrefToken(forceGlobal = TRUE)];ccmark=[REF(user)]'>MARK</a>)"
 #define CC_REPLY(user) "(<a href='?_src_=admin_holder;[HrefToken(forceGlobal = TRUE)];CentcommReply=[REF(user)]'>RPLY</a>)"
 #define OBSERVER_JMP(observer, atom) atom ? "(<a href='?src=[REF(observer)];jumptocoord=1;X=[atom.x];Y=[atom.y];Z=[atom.z]'>JMP</a>)" : ""
+#define ARES_MARK(user) "(<a href='?_src_=admin_holder;[HrefToken(forceGlobal = TRUE)];AresMark=[REF(user)]'>MARK</a>)"
+#define ARES_REPLY(user, ref) "(<a href='?_src_=admin_holder;[HrefToken(forceGlobal = TRUE)];AresReply=[REF(user)];AresRef=[ref]'>RPLY</a>)"
 
 /atom/proc/Admin_Coordinates_Readable(area_name, admin_jump_ref)
 	var/turf/T = get_turf(src)

code/__DEFINES/camera.dm

@@ -6,6 +6,7 @@
 #define CAMERA_NET_ALAMO "Alamo"
 #define CAMERA_NET_NORMANDY "Normandy"
 #define CAMERA_NET_COLONY "Colony"
+#define CAMERA_NET_ARES "ARES"
 
 #define CAMERA_NET_MILITARY "Military"
 #define CAMERA_NET_OVERWATCH "Overwatch"

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/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

@@ -48,5 +48,8 @@
 // Used for smothering fires upon weather event start/stop
 #define COMSIG_GLOB_WEATHER_CHANGE "!weather_event_changed"
 
+/// From /obj/structure/machinery/telecomms/proc/tcomms_shutdown(), called when the relay turns off
+#define COMSIG_GLOB_GROUNDSIDE_TELECOMM_TURNED_OFF "!groundside_telecomm_turned_off"
+
 /// From /datum/admins/proc/force_predator_round()
 #define COMSIG_GLOB_PREDATOR_ROUND_TOGGLED "!predator_round_toglged"

code/__DEFINES/defenses.dm

@@ -8,7 +8,7 @@
 // Defines for barricade upgrades
 #define BARRICADE_UPGRADE_BURN "Biohazard Upgrade (+Burn)"
 #define BARRICADE_UPGRADE_BRUTE "Reinforced Upgrade (+Brute)"
-#define BARRICADE_UPGRADE_EXPLOSIVE "Explosive Upgrade (+Explosive)"
+#define BARRICADE_UPGRADE_ANTIFF "Composite Upgrade (++Explosive, ++Projectile, ++Fire)"
 
 // Defines for defense stats
 #define DEFENSE_FUNCTIONAL 0

code/__DEFINES/language.dm

@@ -12,7 +12,7 @@
 #define LANGUAGE_XENOMORPH "Xenomorph"
 #define LANGUAGE_HIVEMIND "Hivemind"
 
-#define LANGUAGE_APOLLO "Apollo Link"
+#define LANGUAGE_APOLLO "APOLLO Link"
 
 #define LANGUAGE_TELEPATH "Telepath Implant"
 

code/__DEFINES/misc.dm

@@ -44,6 +44,8 @@
 #define AREA_ALLOW_XENO_JOIN (1<<2)
 /// Flags the area as a containment area
 #define AREA_CONTAINMENT (1<<3)
+/// Flags the area as permanently unweedable. Still requires is_resin_allowed = FALSE
+#define AREA_UNWEEDABLE (1<<4)
 /// Default number of ticks for do_after
 #define DA_DEFAULT_NUM_TICKS 5
 

code/__DEFINES/mobs.dm

@@ -11,8 +11,6 @@
 #define OVEREAT_TIME 200
 
 //=================================================
-#define ALIEN_SELECT_AFK_BUFFER 1 // How many minutes that a person can be AFK before not being allowed to be an alien.
-
 #define HEAT_DAMAGE_LEVEL_1 2 //Amount of damage applied when your body temperature just passes the 360.15k safety point
 #define HEAT_DAMAGE_LEVEL_2 4 //Amount of damage applied when your body temperature passes the 400K point
 #define HEAT_DAMAGE_LEVEL_3 8 //Amount of damage applied when your body temperature passes the 1000K point

code/__DEFINES/mode.dm

@@ -14,6 +14,7 @@
 #define EVACUATION_STATUS_IN_PROGRESS 2
 #define EVACUATION_STATUS_COMPLETE 3
 
+#define NUCLEAR_TIME_LOCK 90 MINUTES
 #define NUKE_EXPLOSION_INACTIVE 0
 #define NUKE_EXPLOSION_ACTIVE 1
 #define NUKE_EXPLOSION_IN_PROGRESS 2

code/__DEFINES/objects.dm

@@ -136,11 +136,16 @@ var/list/RESTRICTED_CAMERA_NETWORKS = list( //Those networks can only be accesse
 #define CLEANABLE_MISC "misc" //Anything else
 
 //For nuke announcements
-#define NUKE_SHOW_TIMER_TEN_SEC 1
-#define NUKE_SHOW_TIMER_MINUTE 2
-#define NUKE_SHOW_TIMER_HALF 4
+#define NUKE_SHOW_TIMER_TEN_SEC (1<<0)
+#define NUKE_SHOW_TIMER_MINUTE (1<<1)
+#define NUKE_SHOW_TIMER_HALF (1<<2)
 #define NUKE_SHOW_TIMER_ALL (NUKE_SHOW_TIMER_TEN_SEC|NUKE_SHOW_TIMER_MINUTE|NUKE_SHOW_TIMER_HALF)
 
+#define NUKE_DECRYPT_SHOW_TIMER_COMPLETE (1<<3)
+#define NUKE_DECRYPT_SHOW_TIMER_MINUTE (1<<4)
+#define NUKE_DECRYPT_SHOW_TIMER_HALF (1<<5)
+#define NUKE_DECRYPT_SHOW_TIMER_ALL (NUKE_SHOW_TIMER_TEN_SEC|NUKE_SHOW_TIMER_HALF|NUKE_DECRYPT_SHOW_TIMER_COMPLETE|NUKE_DECRYPT_SHOW_TIMER_MINUTE|NUKE_DECRYPT_SHOW_TIMER_HALF)
+
 //For recipes
 #define ONE_TYPE_PER_TURF 1
 #define ONE_TYPE_PER_BORDER 2

code/__DEFINES/skills.dm

@@ -152,8 +152,8 @@
 
 //pilot skill, hidden
 #define SKILL_PILOT_DEFAULT 0
-#define SKILL_PILOT_TRAINED 1 // DCC, Synth
-#define SKILL_PILOT_EXPERT 2 // Pilot
+#define SKILL_PILOT_TRAINED 1 // DCC
+#define SKILL_PILOT_EXPERT 2 // Pilot, Synth
 #define SKILL_PILOT_MAX 2
 
 //Navigations skill - for seting orbital alt

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/traits.dm

@@ -211,6 +211,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

code/__DEFINES/urls.dm

@@ -50,6 +50,7 @@
 #define URL_WIKI_MST_GUIDE "https://cm-ss13.com/wiki/Mess_Technician"
 #define URL_WIKI_CL_GUIDE "https://cm-ss13.com/wiki/Corporate_Liaison" // Misc //
 #define URL_WIKI_SURV_GUIDE "https://cm-ss13.com/wiki/Survivor"
+#define URL_WIKI_WJ_GUIDE "https://cm-ss13.com/wiki/Seegson_Working_Joe_Manual"
 
 // ------ FORUM LINKS ------ //
 #define URL_FORUM "https://forum.cm-ss13.com/"

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/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
@@ -154,6 +155,22 @@
 #define WEED_BASE_GROW_SPEED (5 SECONDS)
 #define WEED_BASE_DECAY_SPEED (10 SECONDS)
 
+/// The time you must be dead to join as a xeno larva
+#define XENO_JOIN_DEAD_LARVA_TIME (2.5 MINUTES)
+/// The time you must be dead to join as xeno (not larva)
+#define XENO_JOIN_DEAD_TIME (5 MINUTES)
+/// The time of inactivity you cannot exceed to join as a xeno
+#define XENO_JOIN_AFK_TIME_LIMIT (5 MINUTES)
+/// The amount of time after round start before buried larva spawns are disallowed
+#define XENO_BURIED_LARVA_TIME_LIMIT (30 MINUTES)
+
+/// The time against away_timer when an AFK xeno larva can be replaced
+#define XENO_LEAVE_TIMER_LARVA 80 //80 seconds
+/// The time against away_timer when an AFK xeno (not larva) can be replaced
+#define XENO_LEAVE_TIMER 300 //300 seconds
+/// The time against away_timer when an AFK xeno gets listed in the available list so ghosts can get ready
+#define XENO_AVAILABLE_TIMER 60 //60 seconds
+
 /// Between 2% to 10% of explosion severity
 #define WEED_EXPLOSION_DAMAGEMULT rand(2, 10)*0.01
 

code/__HELPERS/_time.dm

@@ -15,10 +15,6 @@
 
 #define DECISECONDS_TO_HOURS /36000
 
-#define XENO_LEAVE_TIMER_LARVA 80 //80 seconds
-#define XENO_LEAVE_TIMER 300 //300 seconds
-#define XENO_AVAILABLE_TIMER 60 //60 seconds, when to add a xeno to the avaliable list so ghosts can get ready
-
 var/midnight_rollovers = 0
 var/rollovercheck_last_timeofday = 0
 

code/__HELPERS/cmp.dm

@@ -57,3 +57,12 @@ var/atom/cmp_dist_origin=null
 
 /proc/cmp_typepaths_asc(A, B)
 	return sorttext("[B]","[A]")
+
+/// Compares mobs based on their timeofdeath value in ascending order
+/proc/cmp_mob_deathtime_asc(mob/A, mob/B)
+	return A.timeofdeath - B.timeofdeath
+
+/// 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.player_details.larva_queue_time - B.client.player_details.larva_queue_time

code/__HELPERS/files.dm

@@ -12,11 +12,6 @@
 
 	return text
 
-//Sends resource files to client cache
-/client/proc/getFiles()
-	for(var/file in args)
-		src << browse_rsc(file)
-
 /client/proc/browse_files(root="data/logs/", max_iterations=10, list/valid_extensions=list(".txt",".log",".htm"))
 	var/path = root