Merge branch 'master' into master

code/datums/diseases/advance/presets.dm

@@ -71,3 +71,19 @@
 	name = "Blueberry virus bottle"
 	desc = "A small bottle. Contains blueberry virus in synthblood medium."
 	spawned_disease = /datum/disease/advance/berry_virus
+
+
+//admin variant of berry virus
+
+/datum/disease/advance/berry_virus_extreme
+	copy_type = /datum/disease/advance
+
+/datum/disease/advance/berry_virus_extreme/New(make_typecache = TRUE)
+	name = "Blueberry Virus"
+	symptoms = list(new/datum/symptom/berry/extreme)
+	..()
+
+/obj/item/reagent_containers/glass/bottle/berry_extreme
+	name = "Blueberry virus bottle"
+	desc = "A small bottle. Contains blueberry virus in synthblood medium."
+	spawned_disease = /datum/disease/advance/berry_virus_extreme

code/datums/ruins/lavaland.dm

@@ -273,4 +273,13 @@
 	description = "Somewhere on this planet, a gluttony deity is worshipped for food and life."
 	suffix = "lavaland_surface_caloriteshrine.dmm"
 	allow_duplicates = TRUE
-	cost = 0
+	cost = 0
+
+
+/datum/map_template/ruin/lavaland/blueberry_shrine //GS13
+	name = "Blueberry Shrine"
+	id = "blueberryshrine"
+	description = "A strange temple, littered with oddly round sculptures and peculiar blue stains."
+	suffix = "lavaland_surface_blueberryarea.dmm"
+	allow_duplicates = TRUE
+	cost = 0

code/game/objects/structures/statues.dm

@@ -316,7 +316,7 @@
 
 /obj/structure/statue/blueberry
 	name = "blueberry statue"
-	desc = "A statue resembling a poor humanoid creature shaped like a ball."
+	desc = "A statue resembling a humanoid bloated into a round spherical shape."
 	icon_state = "blueberry"
 
 

code/modules/cargo/packs/misc.dm

@@ -84,17 +84,17 @@
 					/obj/item/clothing/shoes/kindleKicks)
 	crate_name = "footie crate"
 
-// /datum/supply_pack/misc/modular_greysuits
-// 	name = "Modular Greysuits Crate"
-// 	desc = "In case of sudden obesity, this stretchable jumpsuit pack can help cover up any exposed bodies!"
-// 	cost = 2000
-// 	contains = list(/obj/item/clothing/under/color/grey/modular,
-// 					/obj/item/clothing/under/color/grey/modular,
-// 					/obj/item/clothing/under/color/grey/modular,
-// 					/obj/item/clothing/under/color/grey/modular,
-// 					/obj/item/clothing/under/color/grey/modular,
-// 					/obj/item/clothing/under/color/grey/modular)
-// 	crate_name = "modular jumpsuits crate"
+/datum/supply_pack/misc/modular_greysuits
+	name = "Modular Greysuits Crate"
+	desc = "In case of sudden obesity, this stretchable jumpsuit pack can help cover up any exposed bodies!"
+	cost = 2000
+	contains = list(/obj/item/clothing/under/color/grey/modular,
+					/obj/item/clothing/under/color/grey/modular,
+					/obj/item/clothing/under/color/grey/modular,
+					/obj/item/clothing/under/color/grey/modular,
+					/obj/item/clothing/under/color/grey/modular,
+					/obj/item/clothing/under/color/grey/modular)
+	crate_name = "modular jumpsuits crate"
 
 /datum/supply_pack/misc/randombedsheets
 	name = "Bedsheet Crate (R)"