Merge branch 'master' into rpg4

code/game/turfs/turf.dm

@@ -366,7 +366,7 @@ var/const/enterloopsanity = 100
 
 			//Shoe sounds
 			if (type == /turf/floor/plating)
-				footstepsound = "platingfootsteps"
+				footstepsound = "erikafootsteps"
 			else if (istype(src, /turf/floor/grass))
 				footstepsound = "grassfootsteps"
 			else if (istype(src, /turf/floor/winter))
@@ -380,6 +380,8 @@ var/const/enterloopsanity = 100
 				footstepsound = "sandfootsteps"
 			else	if (istype(src, /turf/floor/plating/road))
 				footstepsound = "roadfootsteps"
+			else	if (istype(src, /obj/covers))
+				footstepsound = "erikafootsteps"
 			else	if (istype(src, /turf/floor/plating/tiled/woodv))
 				footstepsound = "woodfootsteps"
 			else	if (istype(src, /turf/floor/plating/tiled))

code/modules/1713/jobs/british.dm

@@ -666,7 +666,6 @@
 	spawn_location = "JoinLateRNCap"
 	whitelisted = TRUE
 
-	is_commander = TRUE
 	is_officer = TRUE
 	is_ww1 = TRUE
 
@@ -713,7 +712,6 @@
 	spawn_location = "JoinLateRNCap"
 	whitelisted = TRUE
 
-	is_commander = TRUE
 	is_officer = TRUE
 	is_ww1 = TRUE
 
@@ -757,7 +755,7 @@
 	rank_abbreviation = "Sgt."
 
 	spawn_location = "JoinLateRN"
-	is_officer = TRUE
+
 	is_squad_leader = TRUE
 	uses_squads = TRUE
 	is_ww1 = TRUE
@@ -851,7 +849,6 @@
 
 	is_ww1 = TRUE
 
-
 	min_positions = 6
 	max_positions = 200
 
@@ -914,14 +911,8 @@
 	var/obj/item/clothing/under/uniform = H.w_uniform
 	var/obj/item/clothing/accessory/storage/webbing/ww1/british/fullwebbing = new /obj/item/clothing/accessory/storage/webbing/ww1/british(null)
 	uniform.attackby(fullwebbing, H)
-	fullwebbing.attackby(new/obj/item/ammo_magazine/enfield, H)
-	fullwebbing.attackby(new/obj/item/ammo_magazine/enfield, H)
-	fullwebbing.attackby(new/obj/item/ammo_magazine/enfield, H)
-	fullwebbing.attackby(new/obj/item/ammo_magazine/enfield, H)
-	fullwebbing.attackby(new/obj/item/ammo_magazine/enfield, H)
-	fullwebbing.attackby(new/obj/item/ammo_magazine/enfield, H)
-	fullwebbing.attackby(new/obj/item/ammo_magazine/enfield, H)
-	fullwebbing.attackby(new/obj/item/ammo_magazine/enfield, H)
+	for (var/i=1, i<=8, i++)
+		fullwebbing.attackby(new /obj/item/ammo_magazine/enfield, H)
 	give_random_name(H)
 	H.add_note("Role", "You are a <b>[title]</b>, a simple soldier of the Royal Army. Follow your <b>Sergeant's</b> orders!")
 	H.setStat("strength", STAT_MEDIUM_HIGH)

code/modules/1713/jobs/french.dm

@@ -584,7 +584,7 @@
 
 ////////////////////////////WW1///////////////////////
 /datum/job/french/ww1captain
-	title = "Capitaine de le Armee"
+	title = "Capitaine de l'Armee"
 	en_meaning = "Army Captain"
 	rank_abbreviation = "Cap."
 
@@ -636,15 +636,14 @@
 	return TRUE
 
 /datum/job/french/ww1lieutenant
-	title = "Lieutenant de le Armee"
+	title = "Lieutenant de l'Armee"
 	en_meaning = "1st Lieutenant"
 	rank_abbreviation = "Lt."
 
 
 	spawn_location = "JoinLateRNCap"
 	whitelisted = TRUE
 
-	is_commander = TRUE
 	is_officer = TRUE
 	is_ww1 = TRUE
 
@@ -687,15 +686,14 @@
 
 
 /datum/job/french/ww1second_lieutenant
-	title = "Sous-Lieutenant de le Armee"
+	title = "Sous-Lieutenant de l'Armee"
 	en_meaning = "2nd Lieutenant"
 	rank_abbreviation = "Slt."
 
 
 	spawn_location = "JoinLateRNCap"
 	whitelisted = TRUE
 
-	is_commander = TRUE
 	is_officer = TRUE
 	is_ww1 = TRUE
 
@@ -738,12 +736,12 @@
 
 
 /datum/job/french/ww1sergeant
-	title = "Sergeant de le Armee"
+	title = "Sergent de l'Armee"
 	en_meaning = "Squad Leader"
 	rank_abbreviation = "Sgt."
 
 	spawn_location = "JoinLateRN"
-	is_officer = TRUE
+
 	is_squad_leader = TRUE
 	uses_squads = TRUE
 	is_ww1 = TRUE
@@ -786,7 +784,7 @@
 	return TRUE
 
 /datum/job/french/ww1doctor
-	title = "Docteur de le Armee"
+	title = "Docteur de l'Armee"
 	en_meaning = "Doctor"
 	rank_abbreviation = "Dr."
 
@@ -831,7 +829,7 @@
 
 /datum/job/french/ww1shocktroop
 	title = "Chasseur Leger"
-	en_meaning = "Shock Troop"
+	en_meaning = "Shock Trooper"
 	rank_abbreviation = ""
 
 	spawn_location = "JoinLateRN" //for testing!
@@ -875,7 +873,7 @@
 	return TRUE
 
 /datum/job/french/ww1infantry
-	title = "Soldat de infanterie"
+	title = "Soldat d'infanterie"
 	en_meaning = "Private"
 	rank_abbreviation = ""
 

code/modules/1713/jobs/german.dm

@@ -8,6 +8,7 @@
 		H.h_style = pick("Bald","Crewcut","Undercut","Short Hair","Cut Hair","Skinhead","Average Joe","Fade","Combover","Father")
 	if(H.f_style != "Goatee" && H.f_style != "Selleck Mustache" && H.f_style != "Shaved" && H.f_style != "Short Facial Hair")
 		H.f_style = pick("Full Beard","Goatee","Selleck Mustache","Shaved", "Short Facial Hair")
+
 /datum/job/german/captain
 	title = "Heer Hauptmann"
 	en_meaning = "Army Captain"
@@ -65,7 +66,6 @@
 	spawn_location = "JoinLateGECap"
 	whitelisted = TRUE
 
-	is_commander = TRUE
 	is_officer = TRUE
 	is_ww1 = TRUE
 
@@ -112,7 +112,6 @@
 	spawn_location = "JoinLateGECap"
 	whitelisted = TRUE
 
-	is_commander = TRUE
 	is_officer = TRUE
 	is_ww1 = TRUE
 
@@ -312,14 +311,8 @@
 	var/obj/item/clothing/accessory/storage/webbing/ww1/german/fullwebbing = new /obj/item/clothing/accessory/storage/webbing/ww1/german(null)
 	uniform.attackby(fullwebbing, H)
 	give_random_name(H)
-	fullwebbing.attackby(new/obj/item/ammo_magazine/gewehr98, H)
-	fullwebbing.attackby(new/obj/item/ammo_magazine/gewehr98, H)
-	fullwebbing.attackby(new/obj/item/ammo_magazine/gewehr98, H)
-	fullwebbing.attackby(new/obj/item/ammo_magazine/gewehr98, H)
-	fullwebbing.attackby(new/obj/item/ammo_magazine/gewehr98, H)
-	fullwebbing.attackby(new/obj/item/ammo_magazine/gewehr98, H)
-	fullwebbing.attackby(new/obj/item/ammo_magazine/gewehr98, H)
-	fullwebbing.attackby(new/obj/item/ammo_magazine/gewehr98, H)
+	for (var/i=1, i<=8, i++)
+		fullwebbing.attackby(new/obj/item/ammo_magazine/gewehr98, H)
 	H.add_note("Role", "You are a <b>[title]</b>, a simple soldier of the Imperial German Army. Follow your <b>Sergeant's</b> orders!")
 	H.setStat("strength", STAT_MEDIUM_HIGH)
 	H.setStat("crafting", STAT_MEDIUM_LOW)

code/modules/1713/weapons/guns/rocket.dm

@@ -8,6 +8,7 @@
 	var/release_force = 0
 	var/firing_range = 18
 	fire_sound_text = "a launcher firing"
+	var/datum/effect/effect/system/smoke_spread/puff
 
 /obj/item/weapon/gun/launcher/rocket/New()
 	..()
@@ -100,10 +101,10 @@
 			user.drop_item()
 			I.loc = src
 			rockets += I
-			user << "You put the rocket in \the [src]."
+			to_chat(user, "You put the rocket in \the [src].")
 			update_icon()
 		else
-			user << "\The [src] cannot hold more rockets."
+			to_chat(user, "\The [src] cannot hold more rockets.")
 
 /obj/item/weapon/gun/launcher/rocket/proc/unload(mob/user)
 	if(rockets.len)
@@ -132,7 +133,23 @@
 		return M
 	return null
 
+/obj/item/weapon/gun/launcher/New()
+	..()
+	puff = new /datum/effect/effect/system/smoke_spread()
+	puff.attach(src)
+	update_icon()
+
 /obj/item/weapon/gun/launcher/rocket/handle_post_fire(mob/user, atom/target)
+	sleep(1)
+	var/smoke_dir = user.dir
+	if(user)
+		switch(smoke_dir) //We want the opposite of their direction.
+			if(2,8)
+				smoke_dir /= 2
+			if(1,4)
+				smoke_dir *= 2
+	puff.set_up(1,,,smoke_dir)
+	puff.start()
 	message_admins("[key_name_admin(user)] fired a rocket from a rocket launcher ([src.name]) at [target].", key_name_admin(user))
 	log_game("[key_name_admin(user)] used a rocket launcher ([src.name]) at [target].")
 	update_icon()

code/modules/multiz/open_space.dm

@@ -125,22 +125,18 @@ var/list/sky_drop_map = list()
 						affecting.fracture()
 					H.updatehealth()
 				else
-					H.pixel_y = 60
 					spawn (5)
 						H.client.canmove = FALSE
 						var/image/I = image('icons/effects/parachute.dmi', H, layer = MOB_LAYER + 1.0)
 						I.pixel_x = -16
 						I.pixel_y = 16
 
 						H.overlays += I
-
-						for (var/v in 1 to 6)
-							spawn (5)
-								H.pixel_y -= 10
-
+						H.pixel_y = 8*32 // 8 tiles and 32 pixels per tile
+						animate(H, time = 20, pixel_y = 0, easing = SINE_EASING | EASE_OUT)
 						spawn (20)
 							flick("closing", I)
-							spawn (10) // animation is over now
+							spawn (5) // closing animation is over now
 								H.overlays -= I
 								H.pixel_y = 0
 								qdel(I)

code/modules/reagents/reagent_containers/food/snacks.dm

@@ -252,7 +252,7 @@ var/const/debug_snacks = FALSE //if you want to see new food creating logs set i
 			msg_admin_attack("[key_name(user)] fed [key_name(M)] with [name] Reagents: [reagentlist(src)] (INTENT: [uppertext(user.a_intent)])", key_name(user), key_name(M))
 			user.visible_message("<span class='danger'>[user] feeds [M] [src].</span>")
 		//A spoon for mom, a spoon for dad. If we are here, then food is go to mouth to human type species, not others!
-		playsound(M.loc,"eat", rand(20,45), TRUE)
+		playsound(M.loc,"eat", rand(40,85), TRUE)
 		if (reagents.total_volume > bitesize)
 			reagents.trans_to_mob(M, bitesize, CHEM_INGEST)
 		else