Removes removed, adjusts allowed factions

shiptest-ss13 · Dec 11, 2024 · 0edec45 · 0edec45
1 parent 787e72a
commit 0edec45
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 7 deletions.
diff --git a/code/modules/autowiki/pages/shiptable.dm b/code/modules/autowiki/pages/shiptable.dm
@@ -45,10 +45,4 @@
 			"ships" = ships_output.Join(", ")
 		))
 
-	output += include_template("Autowiki/ShipTable/Row", list(
-		"name" = "Removed/Deprecated",
-		"color" = "C8C8C8",
-		"ships" = "{{{removed}}}" //allows for manual editing
-	))
-
 	return output.Join("\n")
diff --git a/code/modules/faction/faction_datum.dm b/code/modules/faction/faction_datum.dm
@@ -18,8 +18,11 @@
 	if(!short_name)
 		short_name = uppertext(copytext_char(name, 3))
 
-	allowed_factions += parent_faction
+	//All subtypes of this faction, all subtypes of specifically allowed factions, and SPECIFICALLY the parent faction (no subtypes) are allowed.
+	//Try not to nest factions too deeply, yeah?
+	allowed_factions += src
 	allowed_factions = typecacheof(allowed_factions)
+	allowed_factions[parent_faction] = TRUE
 
 /// Easy way to check if something is "allowed", checks to see if it matches the name or faction typepath because factions are a fucking mess
 /datum/faction/proc/allowed_faction(value_to_check)