Merge branch 'master' into clothing_edding_v1.0

.gitattributes

@@ -10,7 +10,7 @@ code/__DEFINES/rust_g.dm eol=lf
 ## Enforce text mode and LF line breaks
 *.bat text eol=lf
 *.cjs text eol=lf
-*.css text eol=lf
+## *.css text eol=lf stop enforcing, dripstation edit
 *.dm text eol=lf
 *.dme text eol=lf
 *.dmf text eol=lf

code/__HELPERS/names.dm

@@ -172,15 +172,21 @@ GLOBAL_VAR(command_name)
 	var/name = ""
 
 	// Prefix
+	/* dripstation edit
 	name += pick("Clandestine", "Prima", "Blue", "Zero-G", "Max", "Blasto", "Waffle", "North", "Omni", "Newton", "Cyber", "Bonk", "Gene", "Gib")
+	*/
+	name += pick("Clandestine", "Prima", "Blue", "Zero-G", "Max", "Blasto", "Waffle", "North", "Omni", "Newton", "Cyber", "Bonk", "Gene", "Gib", "Vahlen")
 
 	// Suffix
 	if (prob(80))
 		name += " "
 
 		// Full
 		if (prob(60))
+			/* dripstation edit
 			name += pick("Syndicate", "Consortium", "Collective", "Corporation", "Group", "Holdings", "Biotech", "Industries", "Systems", "Products", "Chemicals", "Enterprises", "Family", "Creations", "International", "Intergalactic", "Interplanetary", "Foundation", "Positronics", "Hive")
+			*/
+			name += pick("Syndicate", "Consortium", "Collective", "Corporation", "Group", "Holdings", "Biotech", "Industries", "Systems", "Products", "Chemicals", "Pharmaceuticals", "Enterprises", "Creations", "International", "Intergalactic", "Interplanetary", "Foundation", "Positronics", "Hive")
 		// Broken
 		else
 			name += pick("Syndi", "Corp", "Bio", "System", "Prod", "Chem", "Inter", "Hive")
@@ -189,7 +195,10 @@ GLOBAL_VAR(command_name)
 	// Small
 	else
 		name += pick("-", "*", "")
+		/* dripstation edit
 		name += pick("Tech", "Sun", "Co", "Tek", "X", "Inc", "Gen", "Star", "Dyne", "Code", "Hive")
+		*/
+		name += pick("Tech", "Sun", "Co", "Tek", "X", "Inc", "Gen", "Star", "Dyne", "Code", "Hive", "Group")
 
 	return name
 

modular_dripstation/code/modules/antagonists/nukeop/nukeop.dm

@@ -36,33 +36,6 @@
 	H.equipOutfit(nukeop_outfit)
 	return TRUE
 
-//naming
-/syndicate_name()
-	var/name = ""
-
-	// Prefix
-	name += pick("Clandestine", "Prima", "Blue", "Zero-G", "Max", "Blasto", "Waffle", "North", "Omni", "Newton", "Cyber", "Bonk", "Gene", "Gib", "Vahlen")
-
-	// Suffix
-	if (prob(80))
-		name += " "
-
-		// Full
-		if (prob(60))
-			name += pick("Syndicate", "Consortium", "Collective", "Corporation", "Group", "Holdings", "Biotech", "Industries", "Systems", "Products", "Chemicals", "Pharmaceuticals", "Enterprises", "Creations", "International", "Intergalactic", "Interplanetary", "Foundation", "Positronics", "Hive")
-		// Broken
-		else
-			name += pick("Syndi", "Corp", "Bio", "System", "Prod", "Chem", "Inter", "Hive")
-			name += pick("", "-")
-			name += pick("Tech", "Sun", "Co", "Tek", "X", "Inc", "Dyne", "Code")
-	// Small
-	else
-		name += pick("-", "")
-		name += pick("Tech", "Sun", "Co", "Tek", "X", "Inc", "Gen", "Star", "Dyne", "Code", "Hive", "Group")
-
-	return name
-
-
 /datum/antagonist/nukeop/give_alias()
 	if(nuke_team && nuke_team.syndicate_name)
 		var/mob/living/carbon/human/H = owner.current