Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into lavaland_megafauna

# Conflicts:
#	code/__DEFINES/is_helpers.dm
#	code/_globalvars/lists/objects.dm
#	code/game/machinery/turrets.dm
#	config/example/config.txt
#	goon/browserassets/css/browserOutput.css
#	icons/obj/library.dmi
#	icons/turf/floors.dmi

code/game/objects/structures/displaycase.dm

@@ -266,6 +266,9 @@ var/global/list/captain_display_cases = list()
 			to_chat(user, "<span class='warning'>It's locked, you can't put anything into it.</span>")
 			return
 		if(!occupant)
+			if(!user.drop_item())
+				to_chat(user, "<span class='notice'>[W] is stuck to you. You cannot put it in [src]!</span>")
+				return
 			to_chat(user, "<span class='notice'>You insert \the [W] into \the [src], and it floats as the hoverfield activates.</span>")
 			user.drop_item()
 			W.forceMove(src)
@@ -312,4 +315,4 @@ var/global/list/captain_display_cases = list()
 				"You hear someone streaking glass with their greasy hands.")
 
 #undef DISPLAYCASE_FRAME_CIRCUIT
-#undef DISPLAYCASE_FRAME_SCREWDRIVER
+#undef DISPLAYCASE_FRAME_SCREWDRIVER

code/game/objects/structures/morgue.dm

@@ -382,8 +382,8 @@
 			if(M.stat!=2)
 				M.emote("scream")
 			if(istype(user))
-				M.attack_log += "\[[time_stamp()]\] <font color='orange'>Has been cremated by [user.name] ([user.ckey])</font>"
-				user.attack_log +="\[[time_stamp()]\] <font color='red'>Cremated [M.name] ([M.ckey])</font>"
+				M.create_attack_log("<font color='orange'>Has been cremated by [user.name] ([user.ckey])</font>")
+				user.create_attack_log("<font color='red'>Cremated [M.name] ([M.ckey])</font>")
 				log_attack("[user.name] ([user.ckey]) cremated [M.name] ([M.ckey])")
 			M.death(1)
 			if(!M || !isnull(M.gcDestroyed))