Merge branch 'master' of https://github.com/ZomgPonies/Paradise

code/game/gamemodes/nations/flagprocs.dm

@@ -109,36 +109,36 @@
 //Nations/Department flags --Nations Gamemode Specific
 /obj/item/flag/nation/cargo
 	name = "Cargonia flag"
-	desc = "The flag of the independant, sovereign nation of Cargonia."
+	desc = "The flag of the independent, sovereign nation of Cargonia."
 	icon_state = "cargoflag"
 	nation = new /datum/nations/cargonia
 
 /obj/item/flag/nation/med
 	name = "Medistan flag"
-	desc = "The flag of the independant, sovereign nation of Medistan."
+	desc = "The flag of the independent, sovereign nation of Medistan."
 	icon_state = "medflag"
 	nation = new /datum/nations/medistan
 
 /obj/item/flag/nation/sec
 	name = "Brigston flag"
-	desc = "The flag of the independant, sovereign nation of Brigston."
+	desc = "The flag of the independent, sovereign nation of Brigston."
 	icon_state = "secflag"
 	nation = new /datum/nations/brigston
 
 /obj/item/flag/nation/rnd
 	name = "Scientopia flag"
-	desc = "The flag of the independant, sovereign nation of Scientopia."
+	desc = "The flag of the independent, sovereign nation of Scientopia."
 	icon_state = "rndflag"
 	nation = new /datum/nations/scientopia
 
 /obj/item/flag/nation/atmos
 	name = "Atmosia flag"
-	desc = "The flag of the independant, sovereign nation of Atmosia."
+	desc = "The flag of the independent, sovereign nation of Atmosia."
 	icon_state = "atmosflag"
 	nation = new /datum/nations/atmosia
 
 /obj/item/flag/nation/command
 	name = "People's Republic of Commandzakstan flag"
-	desc = "The flag of the independant, sovereign nation of the People's Republic of Commandzakstan."
+	desc = "The flag of the independent, sovereign nation of the People's Republic of Commandzakstan."
 	icon_state = "ntflag"
 	nation = new /datum/nations/command

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

@@ -398,6 +398,7 @@ CIGARETTE PACKETS ARE IN FANCY.DM
 			item_state = icon_on
 			if(istype(src, /obj/item/weapon/lighter/zippo) )
 				user.visible_message("<span class='rose'>Without even breaking stride, [user] flips open and lights [src] in one smooth movement.</span>")
+				playsound(src.loc, 'sound/items/ZippoLight.ogg')
 			else
 				if(prob(75))
 					user.visible_message("<span class='notice'>After a few attempts, [user] manages to light the [src].</span>")
@@ -414,6 +415,7 @@ CIGARETTE PACKETS ARE IN FANCY.DM
 			item_state = icon_off
 			if(istype(src, /obj/item/weapon/lighter/zippo) )
 				user.visible_message("<span class='rose'>You hear a quiet click, as [user] shuts off [src] without even looking at what they're doing. Wow.")
+				playsound(src.loc, 'sound/items/ZippoClose.ogg')
 			else
 				user.visible_message("<span class='notice'>[user] quietly shuts off the [src].")