Update workflow triggers

.github/workflows/make_changelogs.yml

@@ -3,7 +3,7 @@ name: Make changelogs
 on:
   push:
     branches:
-    - dev
+    - master
   workflow_dispatch:
 
 jobs:
@@ -28,4 +28,4 @@ jobs:
           BOT_TOKEN: ${{ secrets.BOT_TOKEN }}
           GIT_EMAIL: "${{ secrets.BOT_EMAIL }}"
           GIT_NAME: "${{ secrets.BOT_NAME }}"
-        run: python tools/changelog/generate_cl.py
+        run: python tools/changelog/generate_cl.py

.github/workflows/test.yml

@@ -3,14 +3,8 @@ name: Run Tests
 on:
   push:
     branches:
-      - dev
-      - stable
-      - staging
+      - master
   pull_request:
-    branches:
-      - dev
-      - stable
-      - staging
   workflow_dispatch:
 
 env:

code/modules/backgrounds/citizenship/citizenship_other.dm

@@ -1,6 +1,7 @@
 /decl/background_detail/citizenship/other
-	name = "Other Culture"
-	description = "You are from one of the many small, relatively unknown cultures scattered across the galaxy."
+	name = "Other Polity"
+	uid = "stateless_citizenship"
+	description = "You are from one of the many small, relatively unknown powers scattered across the galaxy."
 	language = /decl/language/human/common
 	secondary_langs = list(
 		/decl/language/human/common,
@@ -9,6 +10,7 @@
 
 /decl/background_detail/citizenship/stateless
 	name = "Stateless"
+	uid = "stateless"
 	description = "Statelessness is an extremely uncommon occurance. Any stateless human or positronic in SolGov space is \
 	automatically extended SolGov citizenship, as are stateless members of other species who cannot regain citizenship in their \
 	homeworld. Most other interstellar states have comperable policies. As such, statelessness tends to be at least semi-voluntary, \
@@ -18,6 +20,7 @@
 
 /decl/background_detail/citizenship/synthetic
 	name = "Stateless Drone"
+	uid = "stateless_drone"
 	description = "Drones are considered property in SolGov, and citizenships extended by the Almach Protectorate are not recognized. \
 	Thus, statelessness is ubiqtuous for them."
 	secondary_langs = list(

code/unit_tests/equipment_tests.dm

@@ -17,8 +17,7 @@
 		return 0
 
 	H = locate(test["mobref"])
-	H.equip_to_slot(new glasses_type(H), slot_glasses_str)
-	return 1
+	return H?.equip_to_slot(new glasses_type(H), slot_glasses_str, TRUE, TRUE)
 
 /datum/unit_test/vision_glasses/check_result()
 

maps/exodus/exodus.dm

@@ -26,11 +26,10 @@
 	// Must come after borers for compatibility.
 	#include "../../mods/content/psionics/_psionics.dme"
 
-	#include "../../mods/species/ascent/_ascent.dme"
-	#include "../../mods/content/pheromones/_pheromones.dme"
-	#include "../../mods/species/serpentid/_serpentid.dme"
-	#include "../../mods/species/utility_frames/_utility_frames.dme"
-	#include "../../mods/species/bayliens/_bayliens.dme"
+	#include "../../mods/species/skrell/_skrell.dme"
+	#include "../../mods/species/tajaran/_tajaran.dme"
+	#include "../../mods/species/unathi/_unathi.dme"
+	#include "../../mods/species/teshari/_teshari.dme"
 
 	#include "../random_ruins/exoplanet_ruins/playablecolony/playablecolony.dm"
 
@@ -78,6 +77,7 @@
 	#include "exodus_jobs.dm"
 	#include "exodus_loadout.dm"
 	#include "exodus_overmap.dm"
+	#include "exodus_overrides.dm"
 	#include "exodus_setup.dm"
 	#include "exodus_shuttles.dm"
 	#include "exodus_unit_testing.dm"

maps/exodus/exodus_define.dm

@@ -52,5 +52,26 @@
 		list("name" = "AI Private",    "key" = "p", "frequency" = 1343, "color" = COMMS_COLOR_AI,        "span_class" = "airadio",  "secured" = list(access_ai_upload))
 	)
 
+	_background_categories = list(
+		/decl/background_category/heritage,
+		/decl/background_category/citizenship,
+		/decl/background_category/faction,
+		/decl/background_category/religion
+	)
+
+	available_background_info = list(
+		/decl/background_category/faction =     list(/decl/background_detail/faction/other),
+		/decl/background_category/heritage =    list(/decl/background_detail/heritage/other),
+		/decl/background_category/religion =    list(/decl/background_detail/religion/other),
+		/decl/background_category/citizenship = list(/decl/background_detail/citizenship/other)
+	)
+
+	default_background_info = list(
+		/decl/background_category/faction =     /decl/background_detail/faction/other,
+		/decl/background_category/heritage =    /decl/background_detail/heritage/other,
+		/decl/background_category/religion =    /decl/background_detail/religion/other,
+		/decl/background_category/citizenship = /decl/background_detail/citizenship/other
+	)
+
 /datum/map/exodus/get_map_info()
 	return "Welcome to Exodus Station, one of the largest remaining stopovers between the core worlds and the rim. Enjoy your stay!"

maps/exodus/exodus_jobs.dm

@@ -40,47 +40,7 @@
 		/datum/job/computer
 	)
 
-	species_to_job_whitelist = list(
-		/decl/species/adherent = list(
-			/datum/job/computer,
-			/datum/job/robot,
-			/datum/job/assistant,
-			/datum/job/janitor,
-			/datum/job/chef,
-			/datum/job/bartender,
-			/datum/job/cargo_tech,
-			/datum/job/engineer,
-			/datum/job/roboticist,
-			/datum/job/chemist,
-			/datum/job/scientist,
-			/datum/job/mining
-		),
-		/decl/species/utility_frame = list(
-			/datum/job/computer,
-			/datum/job/robot,
-			/datum/job/assistant,
-			/datum/job/janitor,
-			/datum/job/chef,
-			/datum/job/bartender,
-			/datum/job/cargo_tech,
-			/datum/job/engineer,
-			/datum/job/roboticist,
-			/datum/job/chemist,
-			/datum/job/scientist,
-			/datum/job/mining
-		),
-		/decl/species/serpentid = list(
-			/datum/job/computer,
-			/datum/job/robot,
-			/datum/job/assistant,
-			/datum/job/janitor,
-			/datum/job/chef,
-			/datum/job/bartender,
-			/datum/job/cargo_tech,
-			/datum/job/roboticist,
-			/datum/job/chemist
-		)
-	)
+	species_to_job_whitelist = list()
 
 #define HUMAN_ONLY_JOBS /datum/job/captain, /datum/job/hop, /datum/job/hos
 	species_to_job_blacklist = list(

maps/exodus/exodus_overrides.dm

@@ -0,0 +1,11 @@
+/decl/species/monkey
+	force_background_info = list(
+		/decl/background_category/heritage =   /decl/background_detail/heritage/hidden/monkey,
+		/decl/background_category/faction =   /decl/background_detail/faction/other
+	)
+
+/decl/species/golem
+	force_background_info = list(
+		/decl/background_category/heritage =   /decl/background_detail/heritage/hidden/cultist,
+		/decl/background_category/faction =   /decl/background_detail/faction/other
+	)

maps/exodus/jobs/synthetics.dm

@@ -29,7 +29,7 @@
 	return H
 
 /datum/job/computer/do_spawn_special(var/mob/living/character, var/mob/new_player/new_player_mob, var/latejoin)
-	character = character.AIize(move=0) // AIize the character, but don't move them yet
+	character = character.AIize() // AIize the character, but don't move them yet
 
 	// is_available for AI checks that there is an empty core available in this list
 	var/obj/structure/aicore/deactivated/C = empty_playable_ai_cores[1]

maps/tradeship/tradeship_overrides.dm

@@ -16,3 +16,23 @@
 
 /obj/item/stack/cable_coil/random/three
 	amount = 3
+
+/decl/species/monkey
+	force_background_info = list(
+		/decl/background_category/heritage =   /decl/background_detail/heritage/hidden/monkey,
+		/decl/background_category/faction =   /decl/background_detail/faction/other
+	)
+
+/decl/species/golem
+	force_background_info = list(
+		/decl/background_category/heritage =   /decl/background_detail/heritage/hidden/cultist,
+		/decl/background_category/faction =   /decl/background_detail/faction/other
+	)
+
+/decl/species/grafadreka
+	force_background_info = list(
+		/decl/background_category/heritage   = /decl/background_detail/heritage/grafadreka,
+		/decl/background_category/citizenship = /decl/background_detail/citizenship/grafadreka,
+		/decl/background_category/faction   = /decl/background_detail/faction/grafadreka,
+		/decl/background_category/religion  = /decl/background_detail/religion/grafadreka
+	)

maps/~mapsystem/maps.dm

@@ -180,7 +180,13 @@ var/global/const/MAP_HAS_RANK = 2		//Rank system, also togglable
 		"reinforced"
 	)
 	var/background_categories_generated = FALSE
-	var/list/_background_categories
+	var/list/_background_categories = list(
+		/decl/background_category/heritage,
+		/decl/background_category/homeworld,
+		/decl/background_category/faction,
+		/decl/background_category/religion
+	)
+
 
 /datum/map/proc/get_background_categories()
 	if(!background_categories_generated)