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

code/controllers/subsystem/timer.dm

@@ -79,12 +79,12 @@ var/datum/controller/subsystem/timer/SStimer
 		do
 			var/datum/callback/callBack = timer.callBack
 			if (!callBack)
+				message_admins("The timer SS has crashed because a timer did not return a callback. MC restarted automatically. Timer hash: [timer.hash]")
 				qdel(timer)
 				bucket_resolution = null //force bucket recreation
-				CRASH("Invalid timer: timer.timeToRun=[timer.timeToRun]||QDELETED(timer)=[QDELETED(timer)]||world.time=[world.time]||head_offset=[head_offset]||practical_offset=[practical_offset]||timer.spent=[timer.spent]")
-				//Temporary fix
 				Recreate_MC()
-				message_admins("The timer SS has crashed. A full report can be found in the runtime viewer. MC restarted automatically.")
+				//I really don't know if I should keep this crash log in; I feel like it might cause problems.
+//				CRASH("Invalid timer: timer.timeToRun=[timer.timeToRun]||QDELETED(timer)=[QDELETED(timer)]||world.time=[world.time]||head_offset=[head_offset]||practical_offset=[practical_offset]||timer.spent=[timer.spent]")
 
 			if (!timer.spent)
 				spent += timer

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

@@ -184,6 +184,16 @@
 	for(var/i in 1 to 5)
 		new /obj/item/weapon/reagent_containers/hypospray/medipen/stimpack(src)
 
+/obj/item/weapon/storage/box/medipens/survival
+	name = "Survival pen bundle"
+	desc = "a box with several survival pens inside, welcome to immortality!!"
+	illustration = "syringe"
+
+/obj/item/weapon/storage/box/medipens/survival/New()
+	..()
+	for(var/i in 1 to 5)
+		new /obj/item/weapon/reagent_containers/hypospray/medipen/survival(src)
+
 /obj/item/weapon/storage/box/beakers
 	name = "box of beakers"
 	illustration = "beaker"

code/modules/client/preferences.dm

@@ -133,7 +133,6 @@ var/list/preferences_datums = list()
 
 		//Mob preview
 	var/icon/preview_icon = null
-	var/icon/nude_preview_icon = null
 
 		//Jobs, uses bitflags
 	var/job_civilian_high = 0

code/modules/mining/machine_vending.dm

@@ -51,6 +51,10 @@
 		new /datum/data/mining_equipment("Drone Ranged Upgrade",/obj/item/device/mine_bot_ugprade/cooldown,								600),
 		new /datum/data/mining_equipment("Drone AI Upgrade",	/obj/item/slimepotion/sentience/mining,									1000),
 		new /datum/data/mining_equipment("Jump Boots",			/obj/item/clothing/shoes/bhop,											2500),
+		new /datum/data/mining_equipment("Survival Knife",		/obj/item/weapon/kitchen/knife/combat/survival,							350),
+		new /datum/data/mining_equipment("Survival Pen Economy Pack",/obj/item/weapon/storage/box/medipens/survival,							2000),
+		new /datum/data/mining_equipment("Stimpack",			/obj/item/weapon/reagent_containers/hypospray/medipen/stimpack,			250),
+		new /datum/data/mining_equipment("Stimpack Economy Pack",/obj/item/weapon/storage/box/medipens/utility,							1000)
 		)
 
 /datum/data/mining_equipment

code/modules/mob/living/emote.dm

@@ -376,6 +376,7 @@
 	key = "me"
 	key_third_person = "custom"
 	message = null
+	mob_type_blacklist_typecache = list(/mob/living/brain)
 
 /datum/emote/living/custom/proc/check_invalid(mob/user, input)
 	. = TRUE