Merge remote-tracking branch 'refs/remotes/Citadel-Station-13/master' into crewobjectivesandmiscreants

code/citadel/cit_guns.dm

@@ -596,10 +596,10 @@ obj/item/projectile/bullet/c10mm/soporific
 	if((blocked != 100) && isliving(target))
 		var/mob/living/L = target
 		L.blur_eyes(6)
-		if(L.staminaloss >= 40)
+		if(L.staminaloss >= 60)
 			L.Sleeping(250)
 		else
-			L.adjustStaminaLoss(58)
+			L.adjustStaminaLoss(25)
 	return 1
 
 /obj/item/ammo_casing/c10mm/soporific

code/citadel/custom_loadout/custom_items.dm

@@ -30,6 +30,14 @@
 	item_color = null
 	tagname = null
 
+/obj/item/clothing/accessory/medal/steele
+	name = "Insignia Of Steele"
+	desc = "An intricate pendant given to those who help a key member of the Steele Corporation."
+	icon = 'icons/obj/custom.dmi'
+	icon_state = "steele"
+	item_color = "steele"
+	medaltype = "medal-silver"
+
 /*DirtyOldHarry*/
 
 /obj/item/lighter/gold
@@ -55,6 +63,12 @@
 	item_color = "zombscarf"
 	dog_fashion = /datum/dog_fashion/head
 
+/obj/item/clothing/suit/toggle/labcoat/mad/red
+	name = "\improper The Mad's labcoat"
+	desc = "An oddly special looking coat."
+	icon_state = "labred"
+	item_state = "labred"
+
 
 /*PLACEHOLDER*/
 
@@ -117,4 +131,14 @@
 	desc = "You would swear this was in your nightmares after eating too many veggies."
 	icon_state = "hos-g"
 	item_state = "hos-g"
-	body_parts_covered = CHEST|GROIN|ARMS|LEGS
+	body_parts_covered = CHEST|GROIN|ARMS|LEGS
+
+
+/*Slomek*/
+/obj/item/reagent_containers/food/drinks/flask/russian
+	name = "russian flask"
+	desc = "Every good russian spaceman knows it's a good idea to bring along a couple of pints of whiskey wherever they go."
+	icon = 'icons/obj/custom.dmi'
+	icon_state = "russianflask"
+	item_state = "russianflask"
+	volume = 60