Merge pull request Civ13#2543 from savethetreez/branch

Small additions and tweaks

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

@@ -116,9 +116,9 @@
 				if (original_job.is_commander)
 					switch (faction_text)
 						if (RUSSIAN)
-							world << "<font color='red' size=4>The <b>Russian Army</b> Commander played has been killed!</font>"
+							world << "<font color='red' size=4>The <b>Russian Army</b> Commander has been killed!</font>"
 						if (DUTCH)
-							world << "<font color='red' size=4>The <b>Dutch Army</b> Commander played has been killed!</font>"
+							world << "<font color='red' size=4>The <b>Dutch Army</b> Commander has been killed!</font>"
 
 			if (MAP_CAPITOL_HILL)
 				if (civilization && civilization in map.scores)

code/game/objects/items/weapons/storage/boxes.dm

@@ -270,8 +270,30 @@
 /obj/item/weapon/storage/box/flare
 	name = "box of flares"
 	desc = "Contains 10 red flares."
-	icon_state = "donk_kit"
+	icon_state = "flare_box"
+	can_hold = list(/obj/item/flashlight/flare)
 	New()
 		..()
 		for (var/i=1, i<= 10, i++)
-			new /obj/item/flashlight/flare(src)
+			new /obj/item/flashlight/flare(src)
+
+/obj/item/weapon/storage/box/flare/attack_hand(mob/user as mob)
+	..()
+	update_icon()
+/obj/item/weapon/storage/attack_self(mob/user as mob)
+	..()
+	update_icon()
+
+/obj/item/weapon/storage/box/flare/update_icon()
+	if (contents.len > 0)
+		switch(contents.len)
+			if (1 to 3)
+				icon_state = "flare_box_33"
+			if (4 to 7)
+				icon_state = "flare_box_66"
+			if (8 to INFINITY)
+				icon_state = "flare_box_full"
+	else
+		icon_state = "flare_box_empty"
+
+

code/game/objects/map_metadata/battle_ships.dm

@@ -1,8 +1,8 @@
 /obj/map_metadata/battle_ships
 	ID = MAP_BATTLE_SHIPS
 	title = "Battle Ships"
-	no_winner = "The battle is going on."
-	lobby_icon = "icons/lobby/campaign.png"
+	no_winner = "The battle is still going on."
+	lobby_icon = "icons/lobby/battleships.png"
 	caribbean_blocking_area_types = list(/area/caribbean/no_mans_land/invisible_wall, /area/caribbean/no_mans_land/invisible_wall/sea)
 	faction_organization = list(
 		PIRATES,

code/modules/1713/jobs/civilian.dm

@@ -2473,7 +2473,7 @@
 			H.equip_to_slot_or_del(new /obj/item/weapon/gun/projectile/shotgun/pump/remington870(H), slot_shoulder)
 			H.equip_to_slot_or_del(new /obj/item/weapon/gun/projectile/revolver/snw10(H), slot_l_hand)
 			H.equip_to_slot_or_del(new /obj/item/ammo_magazine/shellbox(H), slot_r_store)
-			H.equip_to_slot_or_del(new /obj/item/ammo_magazine/shellbox/slug(H), slot_l_store)
+			H.equip_to_slot_or_del(new /obj/item/ammo_magazine/shellbox/rubber(H), slot_l_store)
 			H.equip_to_slot_or_del(new /obj/item/weapon/storage/belt/police/bank/c38(H), slot_belt)
 		if(3)
 			H.equip_to_slot_or_del(new /obj/item/ammo_magazine/p220(H), slot_l_store)