Merge pull request Civ13#2667 from Terra1/Pepelsibirsk-alpha

Pepelsibirsk, a Soviet city RP map for Nomads

civ13.dme

@@ -516,6 +516,7 @@
 #include "code\game\objects\map_metadata\operation_falcon.dm"
 #include "code\game\objects\map_metadata\osowiec.dm"
 #include "code\game\objects\map_metadata\pavlov_house.dm"
+#include "code\game\objects\map_metadata\pepelsibirsk.dm"
 #include "code\game\objects\map_metadata\pioneers.dm"
 #include "code\game\objects\map_metadata\port_arthur.dm"
 #include "code\game\objects\map_metadata\recife.dm"
@@ -783,7 +784,6 @@
 #include "code\modules\1713\jobs\ruhr_uprising.dm"
 #include "code\modules\1713\jobs\russian.dm"
 #include "code\modules\1713\jobs\samurai.dm"
-#include "code\modules\1713\jobs\siberiad.dm"
 #include "code\modules\1713\jobs\skyrim.dm"
 #include "code\modules\1713\jobs\sovafghan.dm"
 #include "code\modules\1713\jobs\spanish.dm"
@@ -1112,5 +1112,5 @@
 #include "code\processes\lighting\sources.dm"
 #include "interface\interface.dm"
 #include "interface\skin.dmf"
-#include "maps\special\battle_ships.dmm"
+#include "maps\1969\pepelsibirsk.dmm"
 // END_INCLUDE

code/__defines/maps.dm

@@ -70,6 +70,8 @@
 #define MAP_NATIONSRP_TRIPLE "NATIONSRP_TRIPLE"
 #define MAP_NOMADS_UK "NOMADS_UK"
 
+#define MAP_PEPELSIBIRSK "PEPELSIBIRSK"
+
 #define MAP_THE_ART_OF_THE_DEAL "THE_ART_OF_THE_DEAL"
 
 #define MAP_JUNGLE_OF_THE_CHADS "JUNGLE_OF_THE_CHADS"

code/_helpers/debugger.dm

@@ -11,12 +11,12 @@
 /world/New()
 	var/debug_server = world.GetConfig("env", "AUXTOOLS_DEBUG_DLL")
 	if (debug_server)
-		call(debug_server, "auxtools_init")()
+		call_ext(debug_server, "auxtools_init")()
 		enable_debugging()
 	. = ..()
 
 /world/Del()
 	var/debug_server = world.GetConfig("env", "AUXTOOLS_DEBUG_DLL")
 	if (debug_server)
-		call(debug_server, "auxtools_shutdown")()
+		call_ext(debug_server, "auxtools_shutdown")()
 	. = ..()

code/datums/vote.dm

@@ -62,7 +62,7 @@ var/global/list/round_voters = list() //Keeps track of the individuals voting fo
 						C << browse(vote.interface(C),"window=vote")
 
 	proc/autogamemode()
-		if (map.ID == MAP_NATIONSRP || map.ID == MAP_NATIONSRP_TRIPLE || map.ID == MAP_NATIONSRPMED || map.ID == MAP_NATIONSRP_WW2 || map.ID == MAP_NATIONSRP_COLDWAR || map.ID == MAP_NATIONSRP_COLDWAR_CAMPAIGN || map.ID == MAP_NOMADS_PERSISTENCE_BETA || map.ID == MAP_CAMPAIGN || map.ID == MAP_GLADIATORS || map.ID == MAP_ALLEYWAY || map.ID == MAP_FOOTBALL || map.ID == MAP_FOOTBALL_CAMPAIGN || map.ID == MAP_NOMADS_EXTENDED || map.ID == MAP_CIVILIZATIONS || map.ID == MAP_TRIBES || map.ID == MAP_JUNGLE_OF_THE_CHADS || map.ID == MAP_NOMADS_WASTELAND || map.ID == MAP_NOMADS_WASTELAND_2 || map.ID == MAP_TESTING || map.battleroyale || map.ID == MAP_THE_ART_OF_THE_DEAL || map.ID == MAP_FOUR_KINGDOMS)
+		if (map.ID == MAP_NATIONSRP || map.ID == MAP_NATIONSRP_TRIPLE || map.ID == MAP_NATIONSRPMED || map.ID == MAP_NATIONSRP_WW2 || map.ID == MAP_NATIONSRP_COLDWAR || map.ID == MAP_NATIONSRP_COLDWAR_CAMPAIGN || map.ID == MAP_NOMADS_PERSISTENCE_BETA || map.ID == MAP_CAMPAIGN || map.ID == MAP_GLADIATORS || map.ID == MAP_ALLEYWAY || map.ID == MAP_FOOTBALL || map.ID == MAP_FOOTBALL_CAMPAIGN || map.ID == MAP_NOMADS_EXTENDED || map.ID == MAP_CIVILIZATIONS || map.ID == MAP_TRIBES || map.ID == MAP_JUNGLE_OF_THE_CHADS || map.ID == MAP_NOMADS_WASTELAND || map.ID == MAP_NOMADS_WASTELAND_2 || map.ID == MAP_TESTING || map.battleroyale || map.ID == MAP_THE_ART_OF_THE_DEAL || map.ID == MAP_FOUR_KINGDOMS || map.ID == MAP_PEPELSIBIRSK)
 			return
 		if (map.persistence)
 			return

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

@@ -1070,6 +1070,90 @@
 		b_eyes = hex2num(copytext(hex_eyes, 6, 8))
 		change_eye_color(r_eyes, g_eyes, b_eyes)
 
+	else if (map.ID == MAP_PEPELSIBIRSK)
+		var/new_hair = "Black"
+		var/new_eyes = "Black"
+		var/list/possible_h_list = list("Black")
+		var/list/possible_e_list = list("Black")
+		var/list/possible_s_list = list(-10,-60)
+		spawn(5)
+			var/randpick = rand(1,100)
+			switch(randpick)
+				if (1 to 10)
+					add_language("Polish",TRUE)
+					add_language("Russian",TRUE)
+					add_note("Known Languages", "Polish", "Russian")
+					remove_language("English")
+					remove_note("Known Languages","English")
+					name = species.get_random_polish_name(gender)
+					real_name = name
+					for (var/datum/language/polish/A in languages)
+						default_language = A
+					src.nationality = "Polish"
+					possible_h_list = list("Black", "Dark Brown","Light Brown","Red")
+					possible_e_list = list("Black","Brown","Green")
+					possible_s_list = list(-25,-60)
+					give_languages()
+				if (11 to 70)
+					add_language("Russian",TRUE)
+					add_note("Known Languages", "Russian")
+					remove_language("English")
+					remove_note("Known Languages","English")
+					name = species.get_random_russian_name(gender)
+					real_name = name
+					for (var/datum/language/russian/A in languages)
+						default_language = A
+					src.nationality = "Russian"
+					possible_h_list = list("Black", "Dark Brown","Light Brown","Red")
+					possible_e_list = list("Black","Brown","Green")
+					possible_s_list = list(-25,-60)
+					give_languages()
+				if (71 to 80)
+					add_language("Russian",TRUE)
+					add_language("German,",TRUE)
+					add_note("Known Languages", "German", "Russian")
+					remove_language("English")
+					remove_note("Known Languages","English")
+					name = species.get_random_german_name(gender)
+					real_name = name
+					for (var/datum/language/german/A in languages)
+						default_language = A
+					src.nationality = "German"
+					possible_h_list = list("Light Brown","Blond","Dirty Blond")
+					possible_e_list = list("Blue","Green")
+					possible_s_list = list(-15,-30)
+					give_languages()
+				if (81 to 100)
+					add_language("Russian",TRUE)
+					add_language("Ukrainian",TRUE)
+					add_note("Known Languages", "Ukrainian", "Russian")
+					remove_language("English")
+					remove_note("Known Languages","English")
+					name = species.get_random_ukrainian_name(gender)
+					real_name = name
+					src.nationality = "Ukrainian"
+					for (var/datum/language/ukrainian/A in languages)
+						default_language = A
+					possible_h_list = list("Black", "Dark Brown","Light Brown","Red")
+					possible_e_list = list("Black","Brown","Green")
+					possible_s_list = list(-25,-60)
+					give_languages()
+		new_hair = pick(possible_h_list)
+		new_eyes = pick(possible_e_list)
+		s_tone = rand(possible_s_list[2],possible_s_list[1])
+		var/hex_hair = hair_colors[new_hair]
+		r_hair = hex2num(copytext(hex_hair, 2, 4))
+		g_hair = hex2num(copytext(hex_hair, 4, 6))
+		b_hair = hex2num(copytext(hex_hair, 6, 8))
+		r_facial = hex2num(copytext(hex_hair, 2, 4))
+		g_facial = hex2num(copytext(hex_hair, 4, 6))
+		b_facial = hex2num(copytext(hex_hair, 6, 8))
+		var/hex_eyes = eye_colors[new_eyes]
+		r_eyes = hex2num(copytext(hex_eyes, 2, 4))
+		g_eyes = hex2num(copytext(hex_eyes, 4, 6))
+		b_eyes = hex2num(copytext(hex_eyes, 6, 8))
+		change_eye_color(r_eyes, g_eyes, b_eyes)
+
 	else if (map.ID == MAP_NATIONSRP)
 		var/new_hair = "Black"
 		var/new_eyes = "Black"

code/game/mob/new_player/new_player.dm

@@ -47,6 +47,10 @@ var/global/redirect_all_players = null
 			var/htmlfile = "<!DOCTYPE html><HTML><HEAD><TITLE>Wiki Guide</TITLE><META http-equiv=\"X-UA-Compatible\" content=\"IE=edge\"></HEAD> \
 			<BODY><iframe src=\"https://civ13.github.io/civ13-wiki/Gulag_13\"  style=\"position: absolute; height: 97%; width: 97%; border: none\"></iframe></BODY></HTML>"
 			src << browse(htmlfile,"window=wiki;size=820x650")
+		if (map && map.ID == MAP_PEPELSIBIRSK)
+			var/htmlfile = "<!DOCTYPE html><HTML><HEAD><TITLE>Wiki Guide</TITLE><META http-equiv=\"X-UA-Compatible\" content=\"IE=edge\"></HEAD> \
+			<BODY><iframe src=\"https://civ13.github.io/civ13-wiki/Pepelsibirsk\"  style=\"position: absolute; height: 97%; width: 97%; border: none\"></iframe></BODY></HTML>"
+			src << browse(htmlfile,"window=wiki;size=820x650")
 
 /mob/new_player/Destroy()
 	new_player_mob_list -= src

code/game/objects/map_metadata/operation_falcon.dm

@@ -650,8 +650,8 @@ var/global/list/fob_names_russian = list("Anna", "Boris", "Dmitri", "Yelena", "I
 	var/faction_text = null // To what faction does it belong?
 
 /obj/structure/milsim/anti_air/attack_hand(mob/living/human/H as mob)
-	if (!faction_text)
+	if (!faction_text && map.ID != MAP_PEPELSIBIRSK)
 		faction_text = H.faction_text
 		name = "[map.roundend_condition_def2name(faction_text)] [name]"
 		message_admins("[H.ckey] ([H.faction_text]) has built an Anti-Air at ([src.x], [src.y], [src.z] - <A HREF='?_src_=holder;adminplayerobservecoodjump=1;X=[src.x];Y=[src.y];Z=[src.z]'>JMP</a>).", H.ckey)
-	return
+	return