Merge branch 'master' of https://github.com/quotefox/Hyper-Station-13

code/modules/clothing/suits/jobs.dm

@@ -158,6 +158,18 @@
 	item_state = "hosbluejacket"
 	body_parts_covered = CHEST|ARMS
 
+/obj/item/clothing/suit/storage/blueshield //Look man I don't know, this is the file it was in on Oracle. Don't shoot me. Please.
+	name = "blueshield coat"
+	desc = "An armored coat often worn by bodyguards. Tough because everyone knows deep down you're a softie."
+	icon_state = "blueshieldcoat"
+	item_state = "blueshieldcoat"
+	body_parts_covered = CHEST|LEGS|ARMS
+	allowed = list(/obj/item/gun/energy, /obj/item/reagent_containers/spray/pepper, /obj/item/ammo_box, /obj/item/ammo_casing,/obj/item/melee/baton, /obj/item/restraints/handcuffs, /obj/item/flashlight/seclite, /obj/item/melee/classic_baton)
+	armor = list(melee = 25, bullet = 10, laser = 25, energy = 10, bomb = 0, bio = 0, rad = 0)
+	cold_protection = CHEST|LEGS|ARMS
+	heat_protection = CHEST|LEGS|ARMS
+	mutantrace_variation = NO_MUTANTRACE_VARIATION //you don't need it
+
 //Surgeon
 /obj/item/clothing/suit/apron/surgical
 	name = "surgical apron"

code/modules/clothing/under/jobs/medsci.dm

@@ -212,6 +212,7 @@
 	icon_state = "emt"
 	item_state = "w_suit"
 	item_color = "emt"
+	mutantrace_variation = NO_MUTANTRACE_VARIATION //sorry guys im too lazy to make digitigrade sprites for these.
 
 /obj/item/clothing/under/rank/medical/emt/skirt
 	name = "paramedic jumpskirt"

code/modules/clothing/under/jobs/security.dm

@@ -224,3 +224,13 @@
 	item_state = "spacepol"
 	item_color = "spacepol"
 	can_adjust = FALSE
+/*
+ *Blueshield
+ */
+/obj/item/clothing/under/rank/security/blueshield
+	desc = "Blue trim on space-black cloth, this uniform displays the rank of \"Blueshield\" on the left shoulder. Wonder what that is."
+	name = "blueshield uniform"
+	icon_state = "bs_uniform"
+	item_state = "bl_suit"
+	item_color = "bs_uniform"
+	alt_covers_chest = FALSE

code/modules/projectiles/projectile.dm

@@ -202,11 +202,8 @@
 		L.on_hit(src)
 
 	var/reagent_note
-	if(reagents && reagents.reagent_list)
-		reagent_note = " REAGENTS:"
-		for(var/datum/reagent/R in reagents.reagent_list)
-			reagent_note += R.type + " ("
-			reagent_note += num2text(R.volume) + ") "
+	if(reagents)
+		reagent_note = reagents.log_list()
 
 	if(ismob(firer))
 		log_combat(firer, L, "shot", src, reagent_note)

code/modules/reagents/reagent_containers/glass.dm

@@ -25,10 +25,6 @@
 			M.visible_message("<span class='danger'>[user] splashes the contents of [src] onto [M]!</span>", \
 							"<span class='userdanger'>[user] splashes the contents of [src] onto [M]!</span>")
 			var/R = reagents?.log_list()
-			if(reagents)
-				for(var/datum/reagent/A in reagents.reagent_list)
-					R += A.type + " ("
-					R += num2text(A.volume) + "),"
 			if(isturf(target) && reagents.reagent_list.len && thrownby)
 				log_combat(thrownby, target, "splashed (thrown) [english_list(reagents.reagent_list)]")
 				message_admins("[ADMIN_LOOKUPFLW(thrownby)] splashed (thrown) [english_list(reagents.reagent_list)] on [target] at [ADMIN_VERBOSEJMP(target)].")

code/modules/vending/wardrobes.dm

@@ -29,7 +29,9 @@
 					/obj/item/clothing/under/rank/security/stripper = 5,
 					/obj/item/clothing/shoes/jackboots/tall = 5,
 					/obj/item/clothing/head/beret/sec/bitch = 5,
-					/obj/item/clothing/gloves/latexsleeves/security = 5)
+					/obj/item/clothing/gloves/latexsleeves/security = 5,
+					/obj/item/clothing/under/rank/security/blueshield = 1,
+					/obj/item/clothing/suit/storage/blueshield =1)
 	refill_canister = /obj/item/vending_refill/wardrobe/sec_wardrobe
 
 /obj/item/vending_refill/wardrobe/sec_wardrobe