Merge pull request Civ13#2412 from savethetreez/branch

Minor fixes

code/game/mob/living/carbon/human/emotes/emote.dm

@@ -14,7 +14,8 @@ var/list/vocal_emotes = list(
 	"sneeze",
 	"yawn",
 	"charge",
-	"gasp")
+	"gasp",
+	"burp")
 
 /mob/living/human/emote(var/act,var/m_type=1,var/message = null)
 
@@ -613,6 +614,18 @@ var/list/vocal_emotes = list(
 					else
 						message = "makes a strange noise."
 						m_type = 2
+			if ("burp")
+				if (miming)
+					message = "burps."
+					m_type = 1
+				else
+					if (!muzzled)
+						message = "burps."
+						m_type = 2
+						//TO-DO: Add burping sound
+					else
+						message = "muffles a burp."
+						m_type = 1
 
 			if ("sniff")
 				message = "sniffs."

code/modules/1713/jobs/ruhr_uprising.dm

@@ -130,21 +130,23 @@
 	else
 		H.equip_to_slot_or_del(new /obj/item/clothing/head/helmet/ww/stahlhelm(H), slot_head)
 //back
-	var/obj/item/clothing/under/uniform = H.w_uniform
 	var/pickunifreikorps = rand(1,3)
 	switch(pickunifreikorps)
 		if (1)
 			H.equip_to_slot_or_del(new /obj/item/weapon/gun/projectile/boltaction/gewehr98(H), slot_shoulder)
+			var/obj/item/clothing/under/uniform = H.w_uniform
 			uniform.attackby(fullwebbing, H)
 			for (var/i=1, i<= 8, i++)
 				fullwebbing.attackby(new/obj/item/ammo_magazine/gewehr98, H)
 		if (2)
 			H.equip_to_slot_or_del(new /obj/item/weapon/gun/projectile/boltaction/gewehr98/karabiner98a(H), slot_shoulder)
+			var/obj/item/clothing/under/uniform = H.w_uniform
 			uniform.attackby(fullwebbing, H)
 			for (var/i=1, i<= 8, i++)
 				fullwebbing.attackby(new/obj/item/ammo_magazine/gewehr98, H)
 		if (3)
 			H.equip_to_slot_or_del(new /obj/item/weapon/gun/projectile/boltaction/gewehr71(H), slot_shoulder)
+			var/obj/item/clothing/under/uniform = H.w_uniform
 			uniform.attackby(fullwebbing, H)
 			for (var/i=1, i<= 8, i++)
 				fullwebbing.attackby(new/obj/item/ammo_magazine/gewehr71, H)