Add seed vault and animal hospital

code/game/objects/effects/decals/Cleanable/misc.dm

@@ -202,3 +202,11 @@
 	icon_state = "confetti1"
 	random_icon_states = list("confetti1", "confetti2", "confetti3")
 	anchored = TRUE
+
+/obj/effect/decal/cleanable/insectguts
+	name = "cockroach guts"
+	desc = "One bug squashed. Four more will rise in its place."
+	icon = 'icons/effects/blood.dmi'
+	icon_state = "xfloor1"
+	random_icon_states = list("xfloor1", "xfloor2", "xfloor3", "xfloor4", "xfloor5", "xfloor6", "xfloor7")
+	anchored = 1

code/game/objects/effects/spawners/windowspawner.dm

@@ -47,3 +47,8 @@
 	name = "reinforced plasma window spawner"
 	icon_state = "pwindow_spawner"
 	windowtospawn = /obj/structure/window/plasmareinforced
+
+/obj/effect/spawner/window/shuttle
+	name = "shuttle window spawner"
+	icon_state = "swindow_spawner"
+	windowtospawn = /obj/structure/window/shuttle

code/game/objects/items/toys.dm

@@ -1440,6 +1440,17 @@ obj/item/toy/cards/deck/syndicate/black
 	else
 		icon_state = "chainsaw0"
 
+/*
+ * Cat Toy
+  */
+/obj/item/toy/cattoy
+	name = "toy mouse"
+	desc = "A colorful toy mouse!"
+	icon = 'icons/obj/toy.dmi'
+	icon_state = "toy_mouse"
+	w_class = WEIGHT_CLASS_SMALL
+	resistance_flags = FLAMMABLE
+
 /*
  * Action Figures
  */

code/game/objects/items/weapons/kitchen.dm

@@ -165,6 +165,13 @@
 	origin_tech = "materials=3;combat=4"
 	attack_verb = list("slashed", "stabbed", "sliced", "torn", "ripped", "cut")
 
+/obj/item/kitchen/knife/combat/survival
+	name = "survival knife"
+	icon_state = "survivalknife"
+	desc = "A hunting grade survival knife."
+	force = 15
+	throwforce = 15
+
 /obj/item/kitchen/knife/combat/cyborg
 	name = "cyborg knife"
 	icon = 'icons/obj/items_cyborg.dmi'

code/game/objects/items/weapons/melee/misc.dm

@@ -60,4 +60,38 @@
 	force = 10
 	throwforce = 7
 	w_class = WEIGHT_CLASS_NORMAL
-	attack_verb = list("slashed", "stabbed", "sliced", "caned")
+	attack_verb = list("slashed", "stabbed", "sliced", "caned")
+
+/obj/item/melee/flyswatter
+	name = "flyswatter"
+	desc = "Useful for killing insects of all sizes."
+	icon_state = "flyswatter"
+	item_state = "flyswatter"
+	force = 1
+	throwforce = 1
+	attack_verb = list("swatted", "smacked")
+	hitsound = 'sound/effects/snap.ogg'
+	w_class = WEIGHT_CLASS_SMALL
+	//Things in this list will be instantly splatted.  Flyman weakness is handled in the flyman species weakness proc.
+	var/list/strong_against
+
+/obj/item/melee/flyswatter/Initialize()
+	. = ..()
+	strong_against = typecacheof(list(
+					/mob/living/simple_animal/hostile/poison/bees/,
+					/mob/living/simple_animal/butterfly,
+					/mob/living/simple_animal/cockroach,
+					/obj/item/queen_bee
+	))
+
+/obj/item/melee/flyswatter/afterattack(atom/target, mob/user, proximity_flag)
+	. = ..()
+	if(proximity_flag)
+		if(is_type_in_typecache(target, strong_against))
+			new /obj/effect/decal/cleanable/insectguts(target.drop_location())
+			to_chat(user, "<span class='warning'>You easily splat the [target].</span>")
+			if(istype(target, /mob/living/))
+				var/mob/living/bug = target
+				bug.death(1)
+			else
+				qdel(target)

code/game/objects/items/weapons/storage/boxes.dm

@@ -1083,6 +1083,22 @@
 		new /obj/item/stock_parts/micro_laser/quadultra(src)
 		new /obj/item/stock_parts/matter_bin/bluespace(src)
 
+/obj/item/storage/box/hug
+	name = "box of hugs"
+	desc = "A special box for sensitive people."
+	icon_state = "hugbox"
+	foldable = null
+
+/obj/item/storage/box/hug/suicide_act(mob/user)
+	user.visible_message("<span class='suicide'>[user] clamps the box of hugs on [user.p_their()] jugular! Guess it wasn't such a hugbox after all..</span>")
+	return (BRUTELOSS)
+
+/obj/item/storage/box/hug/attack_self(mob/user)
+	..()
+	user.changeNext_move(CLICK_CD_MELEE)
+	playsound(loc, "rustle", 50, 1, -5)
+	user.visible_message("<span class='notice'>[user] hugs \the [src].</span>","<span class='notice'>You hug \the [src].</span>")
+
 #undef NODESIGN
 #undef NANOTRASEN
 #undef SYNDI

code/game/objects/structures/bedsheet_bin.dm

@@ -87,6 +87,12 @@ LINEN BINS
 	dream_messages = list("yellow")
 	nightmare_messages = list("locker full of banana peels")
 
+/obj/item/bedsheet/black
+	icon_state = "sheetblack"
+	item_color = "sheetblack"
+	dream_messages = list("black")
+	nightmare_messages = list("the void of space")
+
 /obj/item/bedsheet/mime
 	name = "mime's blanket"
 	desc = "A very soothing striped blanket.  All the noise just seems to fade out when you're under the covers in this."

code/game/objects/structures/fluff.dm

@@ -22,6 +22,34 @@
 		return
 	..()
 
+/obj/structure/fluff/empty_terrarium //Empty terrariums are created when a preserved terrarium in a lavaland seed vault is activated.
+	name = "empty terrarium"
+	desc = "An ancient machine that seems to be used for storing plant matter. Its hatch is ajar."
+	icon = 'icons/obj/lavaland/spawners.dmi'
+	icon_state = "terrarium_open"
+	density = TRUE
+
+/obj/structure/fluff/empty_sleeper //Empty sleepers are created by a good few ghost roles in lavaland.
+	name = "empty sleeper"
+	desc = "An open sleeper. It looks as though it would be awaiting another patient, were it not broken."
+	icon = 'icons/obj/cryogenic2.dmi'
+	icon_state = "sleeper-open"
+
+/obj/structure/fluff/empty_sleeper/nanotrasen
+	name = "broken hypersleep chamber"
+	desc = "A Nanotrasen hypersleep chamber - this one appears broken. \
+		There are exposed bolts for easy disassembly using a wrench."
+	icon_state = "sleeper-o"
+
+/obj/structure/fluff/empty_sleeper/syndicate
+	icon_state = "sleeper_s-open"
+
+/obj/structure/fluff/empty_cryostasis_sleeper //Empty cryostasis sleepers are created when a malfunctioning cryostasis sleeper in a lavaland shelter is activated
+	name = "empty cryostasis sleeper"
+	desc = "Although comfortable, this sleeper won't function as anything but a bed ever again."
+	icon = 'icons/obj/lavaland/spawners.dmi'
+	icon_state = "cryostasis_sleeper_open"
+
 /obj/structure/fluff/drake_statue //Ash drake status spawn on either side of the necropolis gate in lavaland.
 	name = "drake statue"
 	desc = "A towering basalt sculpture of a proud and regal drake. Its eyes are six glowing gemstones."