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

code/datums/components/forensics.dm

@@ -130,7 +130,7 @@
 		var/mob/living/carbon/human/H = M
 		if(H.gloves)
 			hasgloves = "(gloves)"
-	var/current_time = time_stamp()
+	var/current_time = TIME_STAMP("hh:mm:ss", FALSE)
 	if(!LAZYACCESS(hiddenprints, M.key))
 		LAZYSET(hiddenprints, M.key, "First: [M.real_name]\[[current_time]\][hasgloves]. Ckey: [M.ckey]")
 	else

code/datums/components/storage/storage.dm

@@ -297,7 +297,7 @@
 			ND.number++
 
 //This proc determines the size of the inventory to be displayed. Please touch it only if you know what you're doing.
-/datum/component/storage/proc/orient2hud()
+/datum/component/storage/proc/orient2hud(mob/user, maxcolumns)
 	var/atom/real_location = real_location()
 	var/adjusted_contents = real_location.contents.len
 
@@ -307,7 +307,7 @@
 		numbered_contents = _process_numerical_display()
 		adjusted_contents = numbered_contents.len
 
-	var/columns = CLAMP(max_items, 1, screen_max_columns)
+	var/columns = CLAMP(max_items, 1, maxcolumns ? maxcolumns : screen_max_columns)
 	var/rows = CLAMP(CEILING(adjusted_contents / columns, 1), 1, screen_max_rows)
 	standard_orient_objs(rows, columns, numbered_contents)
 
@@ -351,6 +351,8 @@
 /datum/component/storage/proc/show_to(mob/M)
 	if(!M.client)
 		return FALSE
+	var/list/cview = getviewsize(M.client.view)
+	var/maxallowedscreensize = cview[1]-8
 	var/atom/real_location = real_location()
 	if(M.active_storage != src && (M.stat == CONSCIOUS))
 		for(var/obj/item/I in real_location)
@@ -358,7 +360,7 @@
 				return FALSE
 	if(M.active_storage)
 		M.active_storage.hide_from(M)
-	orient2hud()
+	orient2hud(M, (isliving(M) ? maxallowedscreensize : 7))
 	M.client.screen |= boxes
 	M.client.screen |= closer
 	M.client.screen |= real_location.contents

code/datums/explosion.dm

@@ -92,7 +92,7 @@ GLOBAL_LIST_EMPTY(explosions)
 	var/y0 = epicenter.y
 	var/z0 = epicenter.z
 	var/area/areatype = get_area(epicenter)
-	SSblackbox.record_feedback("associative", "explosion", 1, list("dev" = devastation_range, "heavy" = heavy_impact_range, "light" = light_impact_range, "flash" = flash_range, "flame" = flame_range, "orig_dev" = orig_dev_range, "orig_heavy" = orig_heavy_range, "orig_light" = orig_light_range, "x" = x0, "y" = y0, "z" = z0, "area" = areatype.type, "time" = time_stamp("YYYY-MM-DD hh:mm:ss", 1)))
+	SSblackbox.record_feedback("associative", "explosion", 1, list("dev" = devastation_range, "heavy" = heavy_impact_range, "light" = light_impact_range, "flash" = flash_range, "flame" = flame_range, "orig_dev" = orig_dev_range, "orig_heavy" = orig_heavy_range, "orig_light" = orig_light_range, "x" = x0, "y" = y0, "z" = z0, "area" = areatype.type, "time" = TIME_STAMP("YYYY-MM-DD hh:mm:ss", 1)))
 
 	// Play sounds; we want sounds to be different depending on distance so we will manually do it ourselves.
 	// Stereo users will also hear the direction of the explosion!

code/datums/mind.dm

@@ -752,6 +752,11 @@
 	for(var/X in spell_list)
 		var/obj/effect/proc_holder/spell/S = X
 		S.action.Grant(new_character)
+	var/datum/antagonist/changeling/changeling = new_character.mind.has_antag_datum(/datum/antagonist/changeling)
+	if(changeling &&(ishuman(new_character) || ismonkey(new_character)))
+		for(var/P in changeling.purchasedpowers)
+			var/obj/effect/proc_holder/changeling/I = P
+			I.action.Grant(new_character)
 
 /datum/mind/proc/disrupt_spells(delay, list/exceptions = New())
 	for(var/X in spell_list)

code/datums/traits/good.dm

@@ -156,3 +156,16 @@
 	mob_trait = TRAIT_VORACIOUS
 	gain_text = "<span class='notice'>You feel HONGRY.</span>"
 	lose_text = "<span class='danger'>You no longer feel HONGRY.</span>"
+
+/datum/quirk/trandening
+	name = "High Luminosity Eyes"
+	desc = "When the next big fancy implant came out you had to buy one on impluse!"
+	value = 1
+	gain_text = "<span class='notice'>You have to keep up with the next big thing!.</span>"
+	lose_text = "<span class='danger'>High-tech gizmos are a scam...</span>"
+
+/datum/quirk/trandening/on_spawn()
+	var/mob/living/carbon/human/H = quirk_holder
+	var/obj/item/autosurgeon/gloweyes/gloweyes = new(get_turf(H))
+	H.equip_to_slot(gloweyes, SLOT_IN_BACKPACK)
+	H.regenerate_icons()

code/datums/wires/airlock.dm

@@ -79,7 +79,7 @@
 			if(!A.secondsElectrified)
 				A.set_electrified(30)
 				if(usr)
-					LAZYADD(A.shockedby, text("\[[time_stamp()]\] [key_name(usr)]"))
+					LAZYADD(A.shockedby, text("\[[TIME_STAMP("hh:mm:ss", FALSE)]\] [key_name(usr)]"))
 					log_combat(usr, A, "electrified")
 		if(WIRE_SAFETY)
 			A.safe = !A.safe
@@ -134,7 +134,7 @@
 				if(A.secondsElectrified != -1)
 					A.set_electrified(-1)
 					if(usr)
-						LAZYADD(A.shockedby, text("\[[time_stamp()]\] [key_name(usr)]"))
+						LAZYADD(A.shockedby, text("\[[TIME_STAMP("hh:mm:ss", FALSE)]\] [key_name(usr)]"))
 						log_combat(usr, A, "electrified")
 		if(WIRE_SAFETY) // Cut to disable safeties, mend to re-enable.
 			A.safe = mend