Merge branch 'master' of https://github.com/PolarisSS13/Polaris into polaris-sync-2017-05-08

# Conflicts:
#	code/modules/mob/dead/observer/observer.dm
#	code/modules/mob/living/carbon/human/life.dm
#	code/modules/mob/mob_defines.dm
#	html/changelogs/.all_changelog.yml
#	vorestation.dme

code/datums/repositories/decls.dm

@@ -0,0 +1,39 @@
+/var/repository/decls/decls_repository = new()
+
+/repository/decls
+	var/list/fetched_decls
+	var/list/fetched_decl_types
+	var/list/fetched_decl_subtypes
+
+/repository/decls/New()
+	..()
+	fetched_decls = list()
+	fetched_decl_types = list()
+	fetched_decl_subtypes = list()
+
+/repository/decls/proc/decls_of_type(var/decl_prototype)
+	. = fetched_decl_types[decl_prototype]
+	if(!.)
+		. = get_decls(typesof(decl_prototype))
+		fetched_decl_types[decl_prototype] = .
+
+/repository/decls/proc/decls_of_subtype(var/decl_prototype)
+	. = fetched_decl_subtypes[decl_prototype]
+	if(!.)
+		. = get_decls(subtypesof(decl_prototype))
+		fetched_decl_subtypes[decl_prototype] = .
+
+/repository/decls/proc/get_decl(var/decl_type)
+	. = fetched_decls[decl_type]
+	if(!.)
+		. = new decl_type()
+		fetched_decls[decl_type] = .
+
+/repository/decls/proc/get_decls(var/list/decl_types)
+	. = list()
+	for(var/decl_type in decl_types)
+		.[decl_type] =  get_decl(decl_type)
+
+/decls/Destroy()
+	crash_with("Prevented attempt to delete a decl instance: [log_info_line(src)]")
+	return 1 // Prevents Decl destruction

code/datums/repositories/repository.dm

@@ -1,4 +1,19 @@
+/repository/New()
+	return
+
 /datum/cache_entry
 	var/timestamp
 	var/data
 
+/datum/cache_entry/New()
+	timestamp = world.time
+
+/datum/cache_entry/proc/is_valid()
+	return FALSE
+
+/datum/cache_entry/valid_until/New(var/valid_duration)
+	..()
+	timestamp += valid_duration
+
+/datum/cache_entry/valid_until/is_valid()
+	return world.time < timestamp

code/datums/supplypacks/contraband.dm

@@ -32,6 +32,17 @@
 	containername = "Special Ops crate"
 	contraband = 1
 
+/datum/supply_packs/supply/moghes
+	name = "Moghes imports"
+	contains = list(
+			/obj/item/weapon/reagent_containers/food/drinks/bottle/redeemersbrew = 2,
+			/obj/item/weapon/reagent_containers/food/snacks/unajerky = 4
+			)
+	cost = 25
+	containertype = /obj/structure/closet/crate
+	containername = "Moghes imports crate"
+	contraband = 1
+
 /datum/supply_packs/security/bolt_rifles_mosin
  	name = "Surplus militia rifles"
  	contains = list(

code/datums/supplypacks/security.dm

@@ -200,6 +200,7 @@
 			/obj/item/clothing/under/det/black = 2,
 			/obj/item/clothing/under/det/grey = 2,
 			/obj/item/clothing/head/det/grey = 2,
+			/obj/item/clothing/under/det/skirt = 2,
 			/obj/item/clothing/under/det = 2,
 			/obj/item/clothing/head/det = 2,
 			/obj/item/clothing/suit/storage/det_trench,

code/datums/underwear/undershirts.dm

@@ -8,11 +8,6 @@
 	icon_state = "undershirt"
 	has_color = TRUE
 
-/datum/category_item/underwear/undershirt/shirt_long
-	name = "Long Shirt"
-	icon_state = "undershirt_long"
-	has_color = TRUE
-
 /datum/category_item/underwear/undershirt/shirt_fem
 	name = "Babydoll shirt"
 	icon_state = "undershirt_fem"
@@ -23,11 +18,22 @@
 	icon_state = "undershirt_long"
 	has_color = TRUE
 
+/datum/category_item/underwear/undershirt/shirt_long_s
+	name = "Shirt, button-down"
+	icon_state = "shirt_long_s"
+	has_color = TRUE
+
 /datum/category_item/underwear/undershirt/shirt_long_fem
 	name = "Longsleeve Shirt, feminine"
 	icon_state = "undershirt_long_fem"
 	has_color = TRUE
 
+/datum/category_item/underwear/undershirt/shirt_long_female_s
+	name = "Button-down Shirt, feminine"
+	icon_state = "shirt_long_female_s"
+	has_color = TRUE
+
+
 /datum/category_item/underwear/undershirt/tank_top
 	name = "Tank top"
 	icon_state = "tanktop"

code/datums/uplink/medical.dm

@@ -22,12 +22,12 @@
 /datum/uplink_item/item/medical/clotting
 	name = "Clotting Medicine injector"
 	item_cost = 10
-	path = /obj/item/weapon/reagent_containers/hypospray/autoinjector/clotting
+	path = /obj/item/weapon/reagent_containers/hypospray/autoinjector/biginjector/clotting
 
 /datum/uplink_item/item/medical/bonemeds
 	name = "Bone Repair injector"
 	item_cost = 10
-	path = /obj/item/weapon/reagent_containers/hypospray/autoinjector/bonemed
+	path = /obj/item/weapon/reagent_containers/hypospray/autoinjector/biginjector/bonemed
 
 /datum/uplink_item/item/medical/ambrosiadeusseeds
 	name = "Box of 7x ambrosia deus seed packets"