Merge pull request Civ13#2888 from savethetreez/branch

Restoring
KanohaShinobi · May 28, 2024 · 7ffe61f · 7ffe61f
2 parents 51b2398 + 44deb31
commit 7ffe61f
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 3 deletions.
diff --git a/civ13.dme b/civ13.dme
@@ -538,6 +538,7 @@
 #include "code\game\objects\map_metadata\nomads_mediterranean.dm"
 #include "code\game\objects\map_metadata\nomads_mountain.dm"
 #include "code\game\objects\map_metadata\nomads_new_world.dm"
+#include "code\game\objects\map_metadata\nomads_north_america.dm"
 #include "code\game\objects\map_metadata\nomads_oceania.dm"
 #include "code\game\objects\map_metadata\nomads_pangea.dm"
 #include "code\game\objects\map_metadata\nomads_persistence_beta.dm"

diff --git a/code/game/mob/living/carbon/human/death.dm b/code/game/mob/living/carbon/human/death.dm
@@ -117,8 +117,6 @@
 										to_chat(world, "<font color='red' size=3>The <b>Russian Army</b> Lieutenant has been killed!</font>")
 									else
 										map.scores["Militia"] += 1
-							else
-								map.scores["Militia"] += 1
 						else
 							map.scores["Russian Army"] += 1
 
@@ -182,7 +180,7 @@
 									to_chat(world, "<font color='red' size=3>The <b>Mujahideen Warchief</b> has been killed!</font>")
 								if ("Mujahideen Group Leader")
 									MP.sov_points += 5
-									to_chat(world, "<font color='red' size=3>The <b>Mujahideen Group Leader</b> has been killed!</font>")
+									to_chat(world, "<font color='red' size=3>A <b>Mujahideen Group Leader</b> has been killed!</font>")
 
 			if (MAP_KANDAHAR)
 				var/obj/map_metadata/kandahar/MP = map