Merge pull request Civ13#2874 from savethetreez/branch

Misc stuff

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/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

code/modules/1713/jobs/sovafghan.dm

@@ -96,7 +96,7 @@
 	var/obj/item/clothing/under/uniform = H.w_uniform
 	var/obj/item/clothing/accessory/holster/hip/holsterh = new /obj/item/clothing/accessory/holster/hip(null)
 	uniform.attackby(holsterh, H)
-	var/obj/item/clothing/accessory/armor/coldwar/plates/platecarriergreen/armour = new /obj/item/clothing/accessory/armor/coldwar/plates/platecarriergreen(null)
+	var/obj/item/clothing/accessory/armor/coldwar/plates/b5/armour = new /obj/item/clothing/accessory/armor/coldwar/plates/b5(null)
 	var/obj/item/weapon/armorplates/plates1 = new /obj/item/weapon/armorplates(null)
 	var/obj/item/weapon/armorplates/plates2 = new /obj/item/weapon/armorplates(null)
 	armour.attackby(plates1, H)

code/modules/1713/machinery/vehicles.dm

@@ -252,7 +252,7 @@
 /obj/structure/vehicleparts/axis/heavy/bmd2
 	name = "BMD-2"
 	speeds = 4
-	speedlist = list(1=12,2=8,3=6,4=5)
+	speedlist = list(1=9,2=6,3=4,4=3)
 	reg_number = ""
 	color = "#787859"
 	broken_icon = 'icons/obj/vehicles/apcparts96x96_damaged.dmi'

code/modules/1713/signs_portraits_propaganda.dm

@@ -1,19 +1,9 @@
 /obj/structure/sign/portrait
-
-/* // this has never worked, not sure why, but its disabled now
-/obj/structure/sign/portrait/verb/tear()
-	set category = null
-	set src in oview(1, usr)
-	if (!locate(src) in get_step(usr, usr.dir))
-		return FALSE
-	visible_message("<span class = 'danger'>[usr] starts to tear down [src]...</span>")
-	if (do_after(usr, 30, get_turf(src)))
-		visible_message("<span class = 'danger'>[usr] tears down [src]!</span>")
-		qdel(src)*/
+	name = "portrait (DO NOT USE)"
+	desc = "placeholder, contact a dev."
 
 /obj/structure/sign/portrait/hitler
 	name = "Portrait of Hitler"
-	desc = "Our glorious Fuhrer!"
 	icon_state = "hitler"
 
 /obj/structure/sign/portrait/lenin
@@ -24,6 +14,18 @@
 	name = "Portrait of Stalin"
 	icon_state = "stalin"
 
+/obj/structure/sign/portrait/brezhnev
+	name = "Portrait of Brezhnev"
+	icon_state = "brezhnev"
+
+/obj/structure/sign/portrait/sokolov
+	name = "Portrait of Marshal Sokolov"
+	icon_state = "sokolov"
+
+/obj/structure/sign/portrait/karmal
+	name = "Portrait of Babrak Karmal"
+	icon_state = "karmal"
+
 /obj/structure/sign/portrait/hirohito
 	name = "Portrait of Hirohito"
 	icon_state = "hirohito"