Merge branch 'master' into working-branch

INSTALL

@@ -10,4 +10,4 @@ sudo apt install python3 wget git unzip make sudo
 sudo apt install libstdc++6:i386 libgcc1:i386 libc6-i386 lib32z1 libncurses5 libncurses5:i386
 sudo rm INSTALL.py
 sudo wget https://raw.githubusercontent.com/Civ13/Civ13/master/INSTALL.py
-sudo python3 INSTALL.py 515 1611
+sudo python3 INSTALL.py 515 1639

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"

code/__defines/maps.dm

@@ -70,6 +70,7 @@
 #define MAP_NATIONSRP_TRIPLE "NATIONSRP_TRIPLE"
 #define MAP_NOMADS_UK "NOMADS_UK"
 #define MAP_NOMADS_OCEANIA "NOMADS_OCEANIA"
+#define MAP_NOMADS_NORTH_AMERICA "NOMADS_NORTH_AMERICA"
 
 #define MAP_PEPELSIBIRSK "PEPELSIBIRSK"
 
@@ -78,7 +79,6 @@
 #define MAP_JUNGLE_OF_THE_CHADS "JUNGLE_OF_THE_CHADS"
 #define MAP_FOOTBALL "FOOTBALL"
 #define MAP_FOOTBALL_CMP "FOOTBALL_CMP"
-#define MODE_WAR 1
 
 #define MAP_ABASHIRI "ABASHIRI"
 #define MAP_HILL_203 "HILL_203"
@@ -176,4 +176,4 @@
 #define MAP_TWOTRIBES "TWOTRIBES"
 
 #define MAP_MARCO_POLO_BRIDGE "MARCO_POLO_BRIDGE"
-#define MAP_CONSTANTINOPOLI "CONSTANTINOPOLI"
+#define MAP_CONSTANTINOPOLI "CONSTANTINOPOLI"

code/game/mob/living/carbon/human/nomads_spawn.dm

@@ -498,7 +498,7 @@
 				name = species.get_random_english_name(gender)
 				real_name = name
 				add_note("Known Languages", "English")
-				possible_h_list = list("Light Brown","Dark brown","Black", "Blond")
+				possible_h_list = list("Light Brown","Dark Brown","Black", "Blond")
 				possible_e_list = list("Brown","Green","Blue")
 				possible_s_range = list(-15,-30)
 
@@ -511,7 +511,7 @@
 				name = species.get_random_gaelic_name(gender)
 				real_name = name
 				add_note("Known Languages", "Gaelic")
-				possible_h_list = list("Orange","Light Brown","Red","Dark brown")
+				possible_h_list = list("Orange","Light Brown","Red","Dark Brown")
 				possible_e_list = list("Brown","Green", "Blue")
 				possible_s_range = list(-15,-30)
 
@@ -556,6 +556,70 @@
 
 		update_character_appearance(possible_e_list, possible_h_list, possible_s_range)
 
+	else if (map.ID == MAP_NOMADS_NORTH_AMERICA)
+		if (y < 100) // SOUTH
+			if (map.ordinal_age >= 3 && prob(70))
+				add_language("Spanish",TRUE)
+				remove_language("English")
+				remove_note("Known Languages","English")
+				for (var/datum/language/spanish/A in languages)
+					default_language = A
+				name = species.get_random_spanish_name(gender)
+				real_name = name
+				add_note("Known Languages", "Spanish")
+				possible_h_list = list("Black","Dark Brown","Light Brown")
+				possible_e_list = list("Brown","Black")
+				possible_s_range = list(-40,-90)
+			else
+				add_language("Carib",TRUE)
+				remove_language("English")
+				remove_note("Known Languages","English")
+				for (var/datum/language/carib/A in languages)
+					default_language = A
+				name = species.get_random_carib_name(gender)
+				real_name = name
+				add_note("Known Languages", "Carib")
+				possible_h_list = list("Black","Dark Brown")
+				possible_e_list = list("Brown","Black")
+				possible_s_range = list(-80,-115)
+		else
+			if (x < 200) //Temporary, NORTH-WEST
+				add_language("Cherokee",TRUE)
+				remove_language("English")
+				remove_note("Known Languages","English")
+				for (var/datum/language/cherokee/A in languages)
+					default_language = A
+				name = species.get_random_cherokee_name(gender)
+				real_name = name
+				add_note("Known Languages", "Cherokee")
+				possible_h_list = list("Black","Dark Brown","Light Brown")
+				possible_e_list = list("Brown","Black")
+				possible_s_range = list(-40,-90)
+			else
+				if (map.ordinal_age >= 3 && prob(70))
+					for (var/datum/language/english/A in languages)
+						default_language = A
+					name = species.get_random_english_name(gender)
+					real_name = name
+					add_note("Known Languages", "English")
+					possible_h_list = list("Light Brown","Dark Brown","Blond", "Red", "Orange")
+					possible_e_list = list("Brown","Green","Blue")
+					possible_s_range = list(-15,-30)
+				else
+					add_language("Iroquois",TRUE)
+					remove_language("English")
+					remove_note("Known Languages","English")
+					for (var/datum/language/iroquois/A in languages)
+						default_language = A
+					name = species.get_random_iroquois_name(gender)
+					real_name = name
+					add_note("Known Languages", "Iroquois")
+					possible_h_list = list("Black","Dark Brown","Light Brown")
+					possible_e_list = list("Brown","Black")
+					possible_s_range = list(-40,-90)
+
+		update_character_appearance(possible_e_list, possible_h_list, possible_s_range)
+
 	else if (map.ID == MAP_NOMADS_MEDITERRANEAN)
 		if (y<100) //SOUTH
 			if (x<100) 			//SOUTH-WEST

code/game/mob/living/carbon/human/species/species.dm

@@ -582,6 +582,13 @@
 		else
 			return capitalize(pick(first_names_male_cherokee))
 
+/datum/species/proc/get_random_iroquois_name(var/gender)
+	if (!name_language)
+		if (gender == FEMALE)
+			return capitalize(pick(first_names_female_iroquois))
+		else
+			return capitalize(pick(first_names_male_iroquois))
+
 /datum/species/proc/get_random_korean_name(var/gender)
 	if (!name_language)
 		if (gender == FEMALE)

code/game/mob/new_player/new_player.dm

@@ -7,7 +7,7 @@
 
 /mob/new_player
 	var/ready = FALSE
-	var/spawning = FALSE//Referenced when you want to delete the new_player later on in the code.
+	var/spawning = FALSE //Referenced when you want to delete the new_player later on in the code.
 	var/totalPlayers = 0		 //Player counts for the Lobby tab
 	var/totalPlayersReady = 0
 	var/desired_job = null // job title. This is for join queues.
@@ -151,9 +151,8 @@ var/global/redirect_all_players = null
 	return
 
 /mob/new_player/Stat()
-
-// New way
-	if(ticker)
+// Commented out as it is not working as intended and bugs out the Status tab in the Statpanel.
+	/*if(ticker)
 		if(ticker.current_state == GAME_STATE_PLAYING)
 			src << browse(null, "window=playerlist")
 			return
@@ -170,9 +169,8 @@ var/global/redirect_all_players = null
 				//else
 				client << output(list2params(list("Player", "[player.client.key]")), "playerlist.browser:addPlayerCell")
 				client << output(list2params(list()), "playerlist.browser:renderPlayerList")
-				player.updateTimeToStart()
+				player.updateTimeToStart()*/
 
-// Old way
 	if (client.status_tabs && statpanel("Status") && ticker)
 		stat("")
 		stat(stat_header("Lobby"))

code/game/objects/items/weapons/tools.dm

@@ -271,6 +271,26 @@
 
 	attack_verb = list("attacked", "bashed", "battered", "bludgeoned", "whacked")
 
+/*
+ * Saw
+ */
+
+/obj/item/weapon/saw
+	name = "saw"
+	desc = "Used for sawing logs into usable planks."
+	icon = 'icons/obj/items.dmi'
+	icon_state = "saw"
+	item_state = "saw"
+	flags = CONDUCT
+	slot_flags = SLOT_BELT
+	force = WEAPON_FORCE_NORMAL
+	throwforce = WEAPON_FORCE_NORMAL
+	w_class = ITEM_SIZE_SMALL
+	edge = TRUE
+	sharp = TRUE
+
+	attack_verb = list("cut", "slashed", "sawed")
+
 /obj/item/weapon/horn
 	name = "blowing horn"
 	desc = "Good for long range communication."
@@ -303,8 +323,8 @@
 	icon = 'icons/obj/items.dmi'
 	icon_state = "whistle"
 	attack_verb = list("attacked", "whacked")
-	slot_flags = SLOT_BELT
-	w_class = ITEM_SIZE_SMALL | SLOT_POCKET
+	slot_flags = SLOT_BELT | SLOT_POCKET
+	w_class = ITEM_SIZE_SMALL
 	flags = CONDUCT
 	force = WEAPON_FORCE_HARMLESS
 	throwforce = WEAPON_FORCE_HARMLESS

code/game/objects/map_metadata/ardennes.dm

@@ -24,7 +24,7 @@
 	grace_wall_timer = 3600
 	valid_weather_types = list(WEATHER_NONE, WEATHER_WET)
 	songs = list(
-		"Woody Guthrine - Tear the Fascists Down:1" = 'sound/music/tearthefascists.ogg',)
+		"Over There!:1" = 'sound/music/overthere.ogg',)
 	gamemode = "Siege"
 
 /obj/map_metadata/ardennes/job_enabled_specialcheck(var/datum/job/J)

code/game/objects/map_metadata/kandahar.dm

@@ -39,7 +39,7 @@
 	grace_wall_timer = 4800
 	var/list/supply_points = list(
 		"Soviet Army" = 0,
-		"Mujahideen" = 0,)
+		"Mujahideen" = 0)
 
 /obj/map_metadata/kandahar/New()
 	..()
@@ -51,6 +51,7 @@
 	custom_civs += newnameb
 	custom_civs += newnamec
 	custom_civs += newnamed
+	handle_flags() //Called once in the beginning to set up DRA flags
 	spawn(100)
 		load_new_recipes("config/crafting/material_recipes_sovafghan.txt")
 		override_global_recipes = "sovafghan"
@@ -327,6 +328,7 @@
 						if ("Mujahideen Group Leader")
 							sov_points += 2
 							world << "<font color='orange' size=2>A <b><font color='black'>Mujahideen Group Leader</font></b> is in captivity!</font>"
+	handle_flags()
 	spawn(600) // 1 minute
 		points_check()
 		spawn(300)
@@ -560,3 +562,72 @@
 				return
 	..()
 
+/obj/map_metadata/kandahar/proc/handle_flags()
+	switch (a1_control)
+		if ("Soviets")
+			for (var/obj/structure/flag/objective/one/F in world)
+				F.icon_state = "soviet"
+				F.name = "Soviet flag"
+		if ("Mujahideen")
+			for (var/obj/structure/flag/objective/one/F in world)
+				F.icon_state = "pirates"
+				F.name = "Mujahideen flag"
+		if ("DRA")
+			for (var/obj/structure/flag/objective/one/F in world)
+				F.icon_state = "soviet"
+				F.name = "Soviet flag"
+		else
+			for (var/obj/structure/flag/objective/one/F in world)
+				F.icon_state = "white"
+				F.name = "Unclaimed flag"
+	switch (a2_control)
+		if ("Soviets")
+			for (var/obj/structure/flag/objective/two/F in world)
+				F.icon_state = "soviet"
+				F.name = "Soviet flag"
+		if ("Mujahideen")
+			for (var/obj/structure/flag/objective/two/F in world)
+				F.icon_state = "pirates"
+				F.name = "Mujahideen flag"
+		if ("DRA")
+			for (var/obj/structure/flag/objective/two/F in world)
+				F.icon_state = "soviet"
+				F.name = "Soviet flag"
+		else
+			for (var/obj/structure/flag/objective/two/F in world)
+				F.icon_state = "white"
+				F.name = "Unclaimed flag"
+	switch (a3_control)
+		if ("Soviets")
+			for (var/obj/structure/flag/objective/three/F in world)
+				F.icon_state = "soviet"
+				F.name = "Soviet flag"
+		if ("Mujahideen")
+			for (var/obj/structure/flag/objective/three/F in world)
+				F.icon_state = "pirates"
+				F.name = "Mujahideen flag"
+		if ("DRA")
+			for (var/obj/structure/flag/objective/three/F in world)
+				F.icon_state = "soviet"
+				F.name = "Soviet flag"
+		else
+			for (var/obj/structure/flag/objective/three/F in world)
+				F.icon_state = "white"
+				F.name = "Unclaimed flag"
+	switch (a4_control)
+		if ("Soviets")
+			for (var/obj/structure/flag/objective/four/F in world)
+				F.icon_state = "soviet"
+				F.name = "Soviet flag"
+		if ("Mujahideen")
+			for (var/obj/structure/flag/objective/four/F in world)
+				F.icon_state = "pirates"
+				F.name = "Mujahideen flag"
+		if ("DRA")
+			for (var/obj/structure/flag/objective/four/F in world)
+				F.icon_state = "soviet"
+				F.name = "Soviet flag"
+		else
+			for (var/obj/structure/flag/objective/four/F in world)
+				F.icon_state = "white"
+				F.name = "Unclaimed flag"

code/game/objects/map_metadata/nomads_north_america.dm

@@ -0,0 +1,41 @@
+/obj/map_metadata/nomads_north_america
+	ID = MAP_NOMADS_NORTH_AMERICA
+	title = "Nomads (North America)"
+	lobby_icon = 'icons/lobby/north_america.png'
+	no_winner = "The round is proceeding normally."
+	caribbean_blocking_area_types = list(/area/caribbean/no_mans_land/invisible_wall/)
+	respawn_delay = 10 MINUTES
+	has_hunger = TRUE
+	faction_organization = list(
+		CIVILIAN,)
+
+	roundend_condition_sides = list(
+		list(CIVILIAN) = /area/caribbean/british
+		)
+	age = "5000 B.C."
+	civilizations = TRUE
+	var/tribes_nr = 1
+	faction_distribution_coeffs = list(CIVILIAN = 1)
+	battle_name = "the civilizations"
+	mission_start_message = "<big>After ages as hunter-gatherers, people are starting to form groups and settle down. Will they be able to work together?</big><br><b>Wiki Guide: https://civ13.github.io/civ13-wiki/Civilizations_and_Nomads</b>"
+	ambience = list('sound/ambience/jungle1.ogg')
+	faction1 = CIVILIAN
+	availablefactions = list("Nomad")
+	songs = list(
+		"North America:1" = "sound/music/north_america.ogg")
+	research_active = TRUE
+	nomads = TRUE
+	gamemode = "Classic (Stone Age Start)"
+	var/list/arealist_r = list()
+	var/list/arealist_g = list()
+
+/obj/map_metadata/nomads_north_america/New()
+	..()
+	spawn(18000)
+		seasons()
+
+/obj/map_metadata/nomads_north_america/job_enabled_specialcheck(var/datum/job/J)
+	if (J.is_nomad == TRUE)
+		. = TRUE
+	else
+		. = FALSE

code/game/objects/structures/signs.dm

@@ -522,14 +522,29 @@
 	desc = "An icon depicting Archangel Michael. Often used in Eastern Orthodox cultures."
 	icon_state = "orthodox3"
 
-/obj/structure/sign/khalif_ali1
+/obj/structure/sign/khalif_ali
 	name = "portrait of Khalif Ali"
 	desc = "A portrait of Khalif Ali."
 	icon_state = "khalif_ali1"
 
-/obj/structure/sign/khalif_ali2
+/obj/structure/sign/khalif_ali/alt
 	icon_state = "khalif_ali2"
 
+/obj/structure/sign/soviet_poster
+	name = "military poster"
+	desc = "A Soviet military poster depicting a saluting soldier in front of the Soviet flag."
+	icon_state = "soviet_poster"
+
+/obj/structure/sign/sovafghan_poster
+	name = "Soviet-Afghan friendship poster"
+	desc = "A poster depicting a Soviet and DRA soldier smiling at each other while holding a rifle together."
+	icon_state = "sovafghan_poster_1"
+
+/obj/structure/sign/sovafghan_poster/alt
+	name = "Soviet-Afghan friendship poster"
+	desc = "A poster depicting armed men holding the Soviet and DRA flags."
+	icon_state = "sovafghan_poster_2"
+
 //BILLBOARDS
 
 /obj/structure/billboard