Merge branch 'master' into giant_armored_seprentids

ss220club · Dec 23, 2024 · 581e9e1 · 581e9e1
2 parents f2d6f55 + d334185
commit 581e9e1
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 8 deletions.
diff --git a/code/modules/admin/verbs/one_click_antag.dm b/code/modules/admin/verbs/one_click_antag.dm
@@ -21,13 +21,10 @@
 		<a href='byond://?src=[UID()];makeAntag=6'>Make Vampires</a><br>
 		<a href='byond://?src=[UID()];makeAntag=7'>Make Abductor Team (Requires Ghosts)</a><br>
 		<a href='byond://?src=[UID()];makeAntag=8'>Make Mindflayers</a><br>
+		<a href='byond://?src=[UID()];makeAntag=9'>Make Blood Brothers Team</a><br>
+		<a href='byond://?src=[UID()];makeAntag=10'>Make Vox Raiders</a><br>
 		"}
-	// SS220 ADD - Start
-	dat += {"
-		<a href='byond://?src=[UID()];makeAntag=8'>Make Blood Brothers Team</a><br>
-		<a href='byond://?src=[UID()];makeAntag=9'>Make Vox Raiders</a><br>
-		"}
-	// SS220 ASS - End
+
 	usr << browse(dat, "window=oneclickantag;size=400x400")
 	return
 

diff --git a/modular_ss220/antagonists/code/mind/memory_edit.dm b/modular_ss220/antagonists/code/mind/memory_edit.dm
@@ -61,11 +61,11 @@
 	. = ..()
 	if(href_list["makeAntag"])
 		switch(href_list["makeAntag"])
-			if("8")
+			if("9")
 				log_admin("[key_name(usr)] has spawned a blood brothers.")
 				if(!makeBloodBrothersTeam())
 					to_chat(usr, "<span class='warning'>К сожалению, недостаточно кандидатов.</span>")
-			if("9")
+			if("10")
 				log_admin("[key_name(usr)] has spawned a vox raiders.")
 				if(!makeVoxRaidersTeam())
 					to_chat(usr, "<span class='warning'>К сожалению, недостаточно кандидатов.</span>")