Conflicts galore

code/datums/components/art.dm

@@ -0,0 +1,56 @@
+
+#define BAD_ART 12.5
+#define GOOD_ART 25
+#define GREAT_ART 50
+
+/datum/component/art
+	var/impressiveness = 0
+
+/datum/component/art/Initialize(impress)
+	impressiveness = impress
+	if(isobj(parent))
+		RegisterSignal(parent, COMSIG_PARENT_EXAMINE, .proc/on_obj_examine)
+	else
+		RegisterSignal(parent, COMSIG_PARENT_EXAMINE, .proc/on_other_examine)
+	if(isstructure(parent))
+		RegisterSignal(parent, COMSIG_ATOM_ATTACK_HAND, .proc/on_attack_hand)
+	if(isitem(parent))
+		RegisterSignal(parent, COMSIG_ITEM_ATTACK_SELF, .proc/apply_moodlet)
+
+/datum/component/art/proc/apply_moodlet(mob/M, impress)
+	M.visible_message("<span class='notice'>[M] stops and looks intently at [parent].</span>", \
+						 "<span class='notice'>You stop to take in [parent].</span>")
+	switch(impress)
+		if (0 to BAD_ART)
+			SEND_SIGNAL(M, COMSIG_ADD_MOOD_EVENT, "artbad", /datum/mood_event/artbad)
+		if (BAD_ART to GOOD_ART)
+			SEND_SIGNAL(M, COMSIG_ADD_MOOD_EVENT, "artok", /datum/mood_event/artok)
+		if (GOOD_ART to GREAT_ART)
+			SEND_SIGNAL(M, COMSIG_ADD_MOOD_EVENT, "artgood", /datum/mood_event/artgood)
+		if(GREAT_ART to INFINITY)
+			SEND_SIGNAL(M, COMSIG_ADD_MOOD_EVENT, "artgreat", /datum/mood_event/artgreat)
+
+
+/datum/component/art/proc/on_other_examine(datum/source, mob/M)
+	apply_moodlet(M, impressiveness)
+
+/datum/component/art/proc/on_obj_examine(datum/source, mob/M)
+	var/obj/O = parent
+	apply_moodlet(M, impressiveness *(O.obj_integrity/O.max_integrity))
+
+/datum/component/art/proc/on_attack_hand(datum/source, mob/M)
+	to_chat(M, "<span class='notice'>You start examining [parent]...</span>")
+	if(!do_after(M, 20, target = parent))
+		return
+	on_obj_examine(source, M)
+
+/datum/component/art/rev
+
+/datum/component/art/rev/apply_moodlet(mob/M, impress)
+	M.visible_message("<span class='notice'>[M] stops to inspect [parent].</span>", \
+						 "<span class='notice'>You take in [parent], inspecting the fine craftsmanship of the proletariat.</span>")
+
+	if(M.mind && M.mind.has_antag_datum(/datum/antagonist/rev))
+		SEND_SIGNAL(M, COMSIG_ADD_MOOD_EVENT, "artgreat", /datum/mood_event/artgreat)
+	else
+		SEND_SIGNAL(M, COMSIG_ADD_MOOD_EVENT, "artbad", /datum/mood_event/artbad)

code/datums/components/crafting/glassware/glassware.dm

@@ -74,7 +74,7 @@
 
 //////////////////////Lens//////////////////////////
 //Six Steps                                       //
-//Sells for 1800 cr, takes 15 glass shets         //
+//Sells for 1600 cr, takes 15 glass shets         //
 //Usefull for selling and later crafting          //
 ////////////////////////////////////////////////////
 
@@ -146,14 +146,14 @@
 
 /obj/item/glasswork/glass_base/glass_lens_part5
 	name = "Unpolished glass lens"
-	desc = "A small unpolished glass lens. Could be polished with some silk."
+	desc = "A small unpolished glass lens. Could be polished with some cloth."
 	icon = 'icons/obj/glass_ware.dmi'
 	icon_state = "glass_optics"
 	next_step = /obj/item/glasswork/glass_base/glass_lens_part6
 
 /obj/item/glasswork/glass_base/glass_lens_part5/attackby(obj/item/I, mob/user, params)
 	..()
-	if(istype(I, /obj/item/stack/sheet/silk))
+	if(istype(I, /obj/item/stack/sheet/cloth))
 		if(do_after(user,10, target = src))
 			new next_step(user.loc, 1)
 			qdel(src)
@@ -324,7 +324,7 @@
 
 //////////////////////Tea Plates////////////////////
 //Three Steps                                     //
-//Sells for 1200 cr, takes 5 glass shets          //
+//Sells for 1000 cr, takes 5 glass shets          //
 //Usefull for selling and chemical things         //
 ////////////////////////////////////////////////////
 
@@ -370,20 +370,20 @@
 
 /obj/item/glasswork/glass_base/tea_plate3
 	name = "Disk of glass"
-	desc = "A disk of glass that can be cant be used for much. Needs to be polished with some silk."
+	desc = "A disk of glass that can be cant be used for much. Needs to be polished with some cloth."
 	icon_state = "glass_base_half"
 	next_step = /obj/item/tea_plate
 
 /obj/item/glasswork/glass_base/tea_plate3/attackby(obj/item/I, mob/user, params)
 	..()
-	if(istype(I, /obj/item/stack/sheet/silk))
+	if(istype(I, /obj/item/stack/sheet/cloth))
 		if(do_after(user,10, target = src))
 			new next_step(user.loc, 1)
 			qdel(src)
 
 //////////////////////Tea Cup///////////////////////
 //Four Steps                                      //
-//Sells for 1800 cr, takes 6 glass shets          //
+//Sells for 1600 cr, takes 6 glass shets          //
 //Usefull for selling and chemical things         //
 ////////////////////////////////////////////////////
 
@@ -429,13 +429,13 @@
 
 /obj/item/glasswork/glass_base/tea_cup3
 	name = "Disk of glass"
-	desc = "A bowl of glass that can be cant be used for much. Needs to be polished with some silk."
+	desc = "A bowl of glass that can be cant be used for much. Needs to be polished with some cloth."
 	icon_state = "glass_base_half"
 	next_step = /obj/item/glasswork/glass_base/tea_cup4
 
 /obj/item/glasswork/glass_base/cup3/attackby(obj/item/I, mob/user, params)
 	..()
-	if(istype(I, /obj/item/stack/sheet/silk))
+	if(istype(I, /obj/item/stack/sheet/cloth))
 		if(do_after(user,10, target = src))
 			new next_step(user.loc, 1)
 			qdel(src)

code/datums/components/crafting/guncrafting.dm

@@ -1,21 +1,20 @@
 //Gun crafting parts til they can be moved elsewhere
 
 // PARTS //
+/obj/item/weaponcrafting
+	icon = 'icons/obj/improvised.dmi'
 
 /obj/item/weaponcrafting/receiver
 	name = "modular receiver"
 	desc = "A prototype modular receiver and trigger assembly for a firearm."
-	icon = 'icons/obj/improvised.dmi'
 	icon_state = "receiver"
 
 /obj/item/weaponcrafting/stock
 	name = "rifle stock"
 	desc = "A classic rifle stock that doubles as a grip, roughly carved out of wood."
-	icon = 'icons/obj/improvised.dmi'
 	icon_state = "riflestock"
 
-/obj/item/weaponcrafting/silkstring
-	name = "silkstring"
-	desc = "A long piece of silk with some resemblance to cable coil."
-	icon = 'icons/obj/improvised.dmi'
-	icon_state = "silkstring"
+/obj/item/weaponcrafting/durathread_string
+	name = "durathread string"
+	desc = "A long piece of durathread with some resemblance to cable coil."
+	icon_state = "durastring"

code/datums/components/crafting/recipes/recipes_clothing.dm

@@ -39,14 +39,14 @@
 	time = 10
 	reqs = list(/obj/item/paper = 20)
 	category = CAT_CLOTHING
-	
+
 /datum/crafting_recipe/armwraps
 	name = "Armwraps"
 	result = /obj/item/clothing/gloves/fingerless/pugilist
 	time = 60
 	tools = list(TOOL_WIRECUTTER)
 	reqs = list(/obj/item/stack/sheet/cloth = 4,
-				/obj/item/stack/sheet/silk = 2,
+				/obj/item/stack/sheet/durathread = 2,
 				/obj/item/stack/sheet/leather = 2)
 	category = CAT_CLOTHING
 

code/datums/components/crafting/recipes/recipes_misc.dm

@@ -157,7 +157,7 @@
 /datum/crafting_recipe/goldenbox
 	name = "Gold Plated Toolbox"
 	result = /obj/item/storage/toolbox/gold_fake
-	tools = list(/obj/item/stock_parts/cell/upgraded/plus)
+	tools = list(/obj/item/stock_parts/cell/high)
 	reqs = list(/obj/item/stack/sheet/cardboard = 1, //so we dont null items in crafting
 				/obj/item/stack/cable_coil = 10,
 				/obj/item/stack/sheet/mineral/gold = 1,
@@ -184,7 +184,7 @@
 
 /datum/crafting_recipe/bronze_driver
 	name = "Bronze Plated Screwdriver"
-	tools = list(/obj/item/stock_parts/cell/upgraded/plus)
+	tools = list(/obj/item/stock_parts/cell/high)
 	result = /obj/item/screwdriver/bronze
 	reqs = list(/obj/item/screwdriver = 1,
 				/obj/item/stack/cable_coil = 10,
@@ -196,7 +196,7 @@
 
 /datum/crafting_recipe/bronze_welder
 	name = "Bronze Plated Welding Tool"
-	tools = list(/obj/item/stock_parts/cell/upgraded/plus)
+	tools = list(/obj/item/stock_parts/cell/high)
 	result = /obj/item/weldingtool/bronze
 	reqs = list(/obj/item/weldingtool = 1,
 				/obj/item/stack/cable_coil = 10,
@@ -208,7 +208,7 @@
 
 /datum/crafting_recipe/bronze_wirecutters
 	name = "Bronze Plated Wirecutters"
-	tools = list(/obj/item/stock_parts/cell/upgraded/plus)
+	tools = list(/obj/item/stock_parts/cell/high)
 	result = /obj/item/wirecutters/bronze
 	reqs = list(/obj/item/wirecutters = 1,
 				/obj/item/stack/cable_coil = 10,
@@ -220,7 +220,7 @@
 
 /datum/crafting_recipe/bronze_crowbar
 	name = "Bronze Plated Crowbar"
-	tools = list(/obj/item/stock_parts/cell/upgraded/plus)
+	tools = list(/obj/item/stock_parts/cell/high)
 	result = /obj/item/crowbar/bronze
 	reqs = list(/obj/item/crowbar = 1,
 				/obj/item/stack/cable_coil = 10,
@@ -232,7 +232,7 @@
 
 /datum/crafting_recipe/bronze_wrench
 	name = "Bronze Plated Wrench"
-	tools = list(/obj/item/stock_parts/cell/upgraded/plus)
+	tools = list(/obj/item/stock_parts/cell/high)
 	result = /obj/item/wrench/bronze
 	reqs = list(/obj/item/wrench = 1,
 				/obj/item/stack/cable_coil = 10,

code/datums/components/crafting/recipes/recipes_weapon_and_ammo.dm

@@ -192,7 +192,7 @@
 	result =  /obj/item/gun/ballistic/bow/pipe
 	reqs = list(/obj/item/pipe = 5,
 	/obj/item/stack/sheet/plastic = 15,
-	/obj/item/weaponcrafting/silkstring = 5)
+	/obj/item/weaponcrafting/durathread_string = 5)
 	time = 450
 	category = CAT_WEAPONRY
 	subcategory = CAT_WEAPON
@@ -281,7 +281,7 @@
 	result = /obj/item/ammo_casing/caseless/arrow/wood
 	time = 30
 	reqs = list(/obj/item/stack/sheet/mineral/wood = 1,
-				 /obj/item/stack/sheet/silk = 1,
+				 /obj/item/stack/sheet/durathread = 1,
 				 /obj/item/stack/rods = 1) // 1 metal sheet = 2 rods = 2 arrows
 	category = CAT_WEAPONRY
 	subcategory = CAT_AMMO

code/datums/components/field_of_vision.dm

@@ -0,0 +1,354 @@
+#define CENTERED_RENDER_SOURCE(img, atom, FoV) \
+	atom.render_target = atom.render_target || ref(atom);\
+	img.render_source = atom.render_target;\
+	if(atom.icon){\
+		var/_cached_sizes = FoV.width_n_height_offsets[atom.icon];\
+		if(!_cached_sizes){\
+			var/icon/_I = icon(atom.icon);\
+			var/list/L = list();\
+			L += (_I.Width() - world.icon_size)/2;\
+			L += (_I.Height() - world.icon_size)/2;\
+			_cached_sizes = FoV.width_n_height_offsets[atom.icon] = L\
+		}\
+		img.pixel_x = _cached_sizes[1];\
+		img.pixel_y = _cached_sizes[2];\
+		img.loc = atom\
+	}
+
+#define REGISTER_NESTED_LOCS(source, list, comsig, proc) \
+	for(var/k in get_nested_locs(source)){\
+		var/atom/_A = k;\
+		RegisterSignal(_A, comsig, proc);\
+		list += _A\
+	}
+
+#define UNREGISTER_NESTED_LOCS(list, comsig, index) \
+	for(var/k in index to length(list)){\
+		var/atom/_A = list[k];\
+		UnregisterSignal(_A, comsig);\
+		list -= _A\
+	}
+
+/**
+  * Field of Vision component. Does totally what you probably think it does,
+  * ergo preventing players from seeing what's behind them.
+  */
+/datum/component/field_of_vision
+	can_transfer = TRUE
+
+/**
+  * That special invisible, almost neigh indestructible movable
+  * that holds both shadow cone mask and image and follows the player around.
+  */
+	var/atom/movable/fov_holder/fov
+	///The current screen size this field of vision is meant to fit for.
+	var/current_fov_size = list(15, 15)
+	///How much is the cone rotated clockwise, purely backend. Please use rotate_shadow_cone() if you must.
+	var/angle = 0
+	/// Used to scale the shadow cone when rotating it to fit over the edges of the screen.
+	var/rot_scale = 1
+	/// The inner angle of this cone, right hardset to 90, 180, or 270 degrees, until someone figures out a way to make it dynamic.
+	var/shadow_angle = FOV_90_DEGREES
+	/// The mask portion of the cone, placed on a * render target plane so while not visible it still applies the filter.
+	var/image/shadow_mask
+	/// The visual portion of the cone, placed on the highest layer of the wall plane
+	var/image/visual_shadow
+/**
+  * An image whose render_source is kept up to date to prevent the mob (or the topmost movable holding it) from being hidden by the mask.
+  * Will make it use vis_contents instead once a few byonds bugs with images and vis contents are fixed.
+  */
+	var/image/owner_mask
+/**
+  * A circle image used to somewhat uncover the adjacent portion of the shadow cone, making mobs and objects behind us somewhat visible.
+  * The owner mask is still required for those mob going over the default 32x32 px size btw.
+  */
+	var/image/adj_mask
+	/// A list of nested locations the mob is in, to ensure the above image works correctly.
+	var/list/nested_locs = list()
+/**
+  * A static list of offsets based on icon width and height, because render sources are centered unlike most other visuals,
+  * and that gives us some problems when the icon is larger or smaller than world.icon_size
+  */
+	var/static/list/width_n_height_offsets = list()
+
+/datum/component/field_of_vision/Initialize(fov_type = FOV_90_DEGREES, _angle = 0)
+	if(!ismob(parent))
+		return COMPONENT_INCOMPATIBLE
+	angle = _angle
+	shadow_angle = fov_type
+
+/datum/component/field_of_vision/RegisterWithParent()
+	. = ..()
+	var/mob/M = parent
+	if(M.client)
+		generate_fov_holder(M, angle)
+	RegisterSignal(M, COMSIG_MOB_CLIENT_LOGIN, .proc/on_mob_login)
+	RegisterSignal(M, COMSIG_MOB_CLIENT_LOGOUT, .proc/on_mob_logout)
+	RegisterSignal(M, COMSIG_MOB_GET_VISIBLE_MESSAGE, .proc/on_visible_message)
+	RegisterSignal(M, COMSIG_MOB_EXAMINATE, .proc/on_examinate)
+	RegisterSignal(M, COMSIG_MOB_FOV_VIEW, .proc/on_fov_view)
+	RegisterSignal(M, COMSIG_MOB_CLIENT_CHANGE_VIEW, .proc/on_change_view)
+	RegisterSignal(M, COMSIG_MOB_RESET_PERSPECTIVE, .proc/on_reset_perspective)
+	RegisterSignal(M, COMSIG_MOB_FOV_VIEWER, .proc/is_viewer)
+
+/datum/component/field_of_vision/UnregisterFromParent()
+	. = ..()
+	var/mob/M = parent
+	if(!QDELETED(fov))
+		if(M.client)
+			UnregisterSignal(M, list(COMSIG_ATOM_DIR_CHANGE, COMSIG_MOVABLE_MOVED, COMSIG_MOB_DEATH, COMSIG_LIVING_REVIVE))
+			M.client.images -= owner_mask
+			M.client.images -= shadow_mask
+			M.client.images -= visual_shadow
+			M.client.images -= adj_mask
+		qdel(fov, TRUE) // Forced.
+		fov = null
+		QDEL_NULL(owner_mask)
+		QDEL_NULL(adj_mask)
+	if(length(nested_locs))
+		UNREGISTER_NESTED_LOCS(nested_locs, COMSIG_MOVABLE_MOVED, 1)
+	UnregisterSignal(M, list(COMSIG_MOB_CLIENT_LOGIN, COMSIG_MOB_CLIENT_LOGOUT,
+							COMSIG_MOB_GET_VISIBLE_MESSAGE, COMSIG_MOB_EXAMINATE,
+							COMSIG_MOB_FOV_VIEW, COMSIG_MOB_RESET_PERSPECTIVE,
+							COMSIG_MOB_CLIENT_CHANGE_VIEW, COMSIG_MOB_FOV_VIEWER))
+
+/**
+  * Generates the holder and images (if not generated yet) and adds them to client.images.
+  * Run when the component is registered to a player mob, or upon login.
+  */
+/datum/component/field_of_vision/proc/generate_fov_holder(mob/M, _angle = 0)
+	if(QDELETED(fov))
+		fov = new(get_turf(M))
+		fov.icon_state = "[shadow_angle]"
+		fov.dir = M.dir
+		shadow_mask = image('icons/misc/field_of_vision.dmi', fov, "[shadow_angle]", FIELD_OF_VISION_LAYER)
+		shadow_mask.plane = FIELD_OF_VISION_PLANE
+		visual_shadow = image('icons/misc/field_of_vision.dmi', fov, "[shadow_angle]_v", FIELD_OF_VISION_LAYER)
+		visual_shadow.plane = FIELD_OF_VISION_VISUAL_PLANE
+		owner_mask = new
+		owner_mask.appearance_flags = RESET_TRANSFORM
+		owner_mask.plane = FIELD_OF_VISION_BLOCKER_PLANE
+		adj_mask = image('icons/misc/field_of_vision.dmi', fov, "adj_mask", FIELD_OF_VISION_LAYER)
+		adj_mask.appearance_flags = RESET_TRANSFORM
+		adj_mask.plane = FIELD_OF_VISION_BLOCKER_PLANE
+		if(_angle)
+			rotate_shadow_cone(_angle)
+	fov.alpha = M.stat == DEAD ? 0 : 255
+	RegisterSignal(M, COMSIG_MOB_DEATH, .proc/hide_fov)
+	RegisterSignal(M, COMSIG_LIVING_REVIVE, .proc/show_fov)
+	RegisterSignal(M, COMSIG_ATOM_DIR_CHANGE, .proc/on_dir_change)
+	RegisterSignal(M, COMSIG_MOVABLE_MOVED, .proc/on_mob_moved)
+	RegisterSignal(M, COMSIG_ROBOT_UPDATE_ICONS, .proc/manual_centered_render_source)
+	var/atom/A = M
+	if(M.loc && !isturf(M.loc))
+		REGISTER_NESTED_LOCS(M, nested_locs, COMSIG_MOVABLE_MOVED, .proc/on_loc_moved)
+		A = nested_locs[nested_locs.len]
+	CENTERED_RENDER_SOURCE(owner_mask, A, src)
+	M.client.images += shadow_mask
+	M.client.images += visual_shadow
+	M.client.images += owner_mask
+	M.client.images += adj_mask
+	if(M.client.view != "[current_fov_size[1]]x[current_fov_size[2]]")
+		resize_fov(current_fov_size, getviewsize(M.client.view))
+
+///Rotates the shadow cone to a certain degree. Backend shenanigans.
+/datum/component/field_of_vision/proc/rotate_shadow_cone(new_angle)
+	var/simple_degrees = SIMPLIFY_DEGREES(new_angle - angle)
+	var/to_scale = cos(simple_degrees) * sin(simple_degrees)
+	if(to_scale)
+		var/old_rot_scale = rot_scale
+		rot_scale = 1 + to_scale
+		if(old_rot_scale != rot_scale)
+			visual_shadow.transform = shadow_mask.transform = shadow_mask.transform.Scale(rot_scale/old_rot_scale)
+	visual_shadow.transform = shadow_mask.transform = shadow_mask.transform.Turn(fov.transform, simple_degrees)
+
+/**
+  * Resizes the shadow to match the current screen size.
+  * Run when the client view size is changed, or if the player has a viewsize different than "15x15" on login/comp registration.
+  */
+/datum/component/field_of_vision/proc/resize_fov(list/old_view, list/view)
+	current_fov_size = view
+	var/old_size = max(old_view[1], old_view[2])
+	var/new_size = max(view[1], view[2])
+	if(old_size == new_size) //longest edges are still of the same length.
+		return
+	visual_shadow.transform = shadow_mask.transform = shadow_mask.transform.Scale(new_size/old_size)
+
+/datum/component/field_of_vision/proc/on_mob_login(mob/source, client/client)
+	generate_fov_holder(source, angle)
+
+/datum/component/field_of_vision/proc/on_mob_logout(mob/source, client/client)
+	UnregisterSignal(source, list(COMSIG_ATOM_DIR_CHANGE, COMSIG_MOVABLE_MOVED, COMSIG_MOB_DEATH,
+								COMSIG_LIVING_REVIVE, COMSIG_ROBOT_UPDATE_ICONS))
+	if(length(nested_locs))
+		UNREGISTER_NESTED_LOCS(nested_locs, COMSIG_MOVABLE_MOVED, 1)
+
+/datum/component/field_of_vision/proc/on_dir_change(mob/source, old_dir, new_dir)
+	fov.dir = new_dir
+
+///Hides the shadow, other visibility comsig procs will take it into account. Called when the mob dies.
+/datum/component/field_of_vision/proc/hide_fov(mob/source)
+	fov.alpha = 0
+
+/// Shows the shadow. Called when the mob is revived.
+/datum/component/field_of_vision/proc/show_fov(mob/source)
+	fov.alpha = 255
+
+/// Hides the shadow when looking through other items, shows it otherwise.
+/datum/component/field_of_vision/proc/on_reset_perspective(mob/source, atom/target)
+	if(source.client.eye == source || source.client.eye == source.loc)
+		fov.alpha = 255
+	else
+		fov.alpha = 0
+
+/// Called when the client view size is changed.
+/datum/component/field_of_vision/proc/on_change_view(mob/source, client, list/old_view, list/view)
+	resize_fov(old_view, view)
+
+/**
+  * Called when the owner mob moves around. Used to keep shadow located right behind us,
+  * As well as modify the owner mask to match the topmost item.
+  */
+/datum/component/field_of_vision/proc/on_mob_moved(mob/source, atom/oldloc, dir, forced)
+	var/turf/T
+	if(!isturf(source.loc)) //Recalculate all nested locations.
+		UNREGISTER_NESTED_LOCS( nested_locs, COMSIG_MOVABLE_MOVED, 1)
+		REGISTER_NESTED_LOCS(source, nested_locs, COMSIG_MOVABLE_MOVED, .proc/on_loc_moved)
+		var/atom/movable/topmost = nested_locs[nested_locs.len]
+		T = topmost.loc
+		CENTERED_RENDER_SOURCE(owner_mask, topmost, src)
+	else
+		T = source.loc
+		if(length(nested_locs))
+			UNREGISTER_NESTED_LOCS(nested_locs, COMSIG_MOVABLE_MOVED, 1)
+			CENTERED_RENDER_SOURCE(owner_mask, source, src)
+	if(T)
+		fov.forceMove(T, harderforce = TRUE)
+
+/// Pretty much like the above, but meant for other movables the mob is stored in (bodybags, boxes, mechs etc).
+/datum/component/field_of_vision/proc/on_loc_moved(atom/movable/source, atom/oldloc, dir, forced)
+	if(isturf(source.loc) && isturf(oldloc)) //This is the case of the topmost movable loc moving around the world, skip.
+		fov.forceMove(source.loc, harderforce = TRUE)
+		return
+	var/atom/movable/prev_topmost = nested_locs[nested_locs.len]
+	if(prev_topmost != source)
+		UNREGISTER_NESTED_LOCS(nested_locs, COMSIG_MOVABLE_MOVED, nested_locs.Find(source) + 1)
+	REGISTER_NESTED_LOCS(source, nested_locs, COMSIG_MOVABLE_MOVED, .proc/on_loc_moved)
+	var/atom/movable/topmost = nested_locs[nested_locs.len]
+	if(topmost != prev_topmost)
+		CENTERED_RENDER_SOURCE(owner_mask, topmost, src)
+		if(topmost.loc)
+			fov.forceMove(topmost.loc, harderforce = TRUE)
+
+/// A hacky comsig proc for things that somehow decide to change icon on the go. may make a change_icon_file() proc later but...
+/datum/component/field_of_vision/proc/manual_centered_render_source(mob/source, old_icon)
+	if(!isturf(source.loc))
+		return
+	CENTERED_RENDER_SOURCE(owner_mask, source, src)
+
+#undef CENTERED_RENDER_SOURCE
+#undef REGISTER_NESTED_LOCS
+#undef UNREGISTER_NESTED_LOCS
+
+/**
+  * Byond doc is not entirely correct on the integrated arctan() proc.
+  * When both x and y are negative, the output is also negative, cycling clockwise instead of counter-clockwise.
+  * That's also why I am extensively using the SIMPLIFY_DEGREES macro here.
+  *
+  * Overall this is the main macro that calculates wheter a target is within the shadow cone angle or not.
+  */
+#define FOV_ANGLE_CHECK(mob, target, zero_x_y_statement, success_statement) \
+	var/turf/T1 = get_turf(target);\
+	var/turf/T2 = get_turf(mob);\
+	if(!T1 || !T2){\
+		zero_x_y_statement\
+	}\
+	var/_x = (T1.x - T2.x);\
+	var/_y = (T1.y - T2.y);\
+	if(ISINRANGE(_x, -1, 1) && ISINRANGE(_y, -1, 1)){\
+		zero_x_y_statement\
+	}\
+	var/dir = (mob.dir & (EAST|WEST)) || mob.dir;\
+	var/_degree = -angle;\
+	var/_half = shadow_angle/2;\
+	switch(dir){\
+		if(EAST){\
+			_degree += 180;\
+		}\
+		if(NORTH){\
+			_degree += 270;\
+		}\
+		if(SOUTH){\
+			_degree += 90;\
+		}\
+	}\
+	var/_min = SIMPLIFY_DEGREES(_degree - _half);\
+	var/_max = SIMPLIFY_DEGREES(_degree + _half);\
+	if((_min > _max) ? !ISINRANGE(SIMPLIFY_DEGREES(arctan(_x, _y)), _max, _min) : ISINRANGE(SIMPLIFY_DEGREES(arctan(_x, _y)), _min, _max)){\
+		success_statement;\
+	}
+
+/datum/component/field_of_vision/proc/on_examinate(mob/source, atom/target)
+	if(fov.alpha)
+		FOV_ANGLE_CHECK(source, target, return, return COMPONENT_DENY_EXAMINATE|COMPONENT_EXAMINATE_BLIND)
+
+/datum/component/field_of_vision/proc/on_visible_message(mob/source, atom/target, message, range, list/ignored_mobs)
+	if(fov.alpha)
+		FOV_ANGLE_CHECK(source, target, return, return COMPONENT_NO_VISIBLE_MESSAGE)
+
+/datum/component/field_of_vision/proc/on_fov_view(mob/source, list/atoms)
+	if(!fov.alpha)
+		return
+	for(var/k in atoms)
+		var/atom/A = k
+		FOV_ANGLE_CHECK(source, A, continue, atoms -= A)
+
+/datum/component/field_of_vision/proc/is_viewer(mob/source, atom/center, depth, list/viewers_list)
+	if(fov.alpha)
+		FOV_ANGLE_CHECK(source, center, return, viewers_list -= source)
+
+#undef FOV_ANGLE_CHECK
+
+/**
+  * The shadow cone's mask and visual images holder which can't locate inside the mob,
+  * lest they inherit the mob opacity and cause a lot of hindrance
+  */
+/atom/movable/fov_holder
+	name = "field of vision holder"
+	pixel_x = -224 //the image is about 480x480 px, ergo 15 tiles (480/32) big, and we gotta center it.
+	pixel_y = -224
+	mouse_opacity = MOUSE_OPACITY_TRANSPARENT
+	plane = FIELD_OF_VISION_PLANE
+	anchored = TRUE
+
+/atom/movable/fov_holder/ConveyorMove()
+	return
+
+/atom/movable/fov_holder/has_gravity(turf/T)
+	return FALSE
+
+/atom/movable/fov_holder/ex_act(severity)
+	return FALSE
+
+/atom/movable/fov_holder/singularity_act()
+	return
+
+/atom/movable/fov_holder/singularity_pull()
+	return
+
+/atom/movable/fov_holder/blob_act()
+	return
+
+/atom/movable/fov_holder/onTransitZ()
+	return
+
+/// Prevents people from moving these after creation, because they shouldn't be.
+/atom/movable/fov_holder/forceMove(atom/destination, no_tp=FALSE, harderforce = FALSE)
+	if(harderforce)
+		return ..()
+
+/// Last but not least, these shouldn't be deleted by anything but the component itself
+/atom/movable/fov_holder/Destroy(force = FALSE)
+	if(!force)
+		return QDEL_HINT_LETMELIVE
+	return ..()

code/datums/components/footstep.dm

@@ -1,26 +1,52 @@
+///Footstep component. Plays footsteps at parents location when it is appropriate.
 /datum/component/footstep
+	///How many steps the parent has taken since the last time a footstep was played
 	var/steps = 0
+	///volume determines the extra volume of the footstep. This is multiplied by the base volume, should there be one.
 	var/volume
+	///e_range stands for extra range - aka how far the sound can be heard. This is added to the base value and ignored if there isn't a base value.
 	var/e_range
+	///footstep_type is a define which determines what kind of sounds should get chosen.
+	var/footstep_type
+	///This can be a list OR a soundfile OR null. Determines whatever sound gets played.
+	var/footstep_sounds
 
-/datum/component/footstep/Initialize(volume_ = 0.5, e_range_ = -1)
+/datum/component/footstep/Initialize(footstep_type_ = FOOTSTEP_MOB_BAREFOOT, volume_ = 0.5, e_range_ = -1)
 	if(!isliving(parent))
 		return COMPONENT_INCOMPATIBLE
 	volume = volume_
 	e_range = e_range_
-	RegisterSignal(parent, list(COMSIG_MOVABLE_MOVED), .proc/play_footstep)
+	footstep_type = footstep_type_
+	switch(footstep_type)
+		if(FOOTSTEP_MOB_HUMAN)
+			if(!ishuman(parent))
+				return COMPONENT_INCOMPATIBLE
+			RegisterSignal(parent, COMSIG_MOVABLE_MOVED, .proc/play_humanstep)
+			return
+		if(FOOTSTEP_MOB_CLAW)
+			footstep_sounds = GLOB.clawfootstep
+		if(FOOTSTEP_MOB_BAREFOOT)
+			footstep_sounds = GLOB.barefootstep
+		if(FOOTSTEP_MOB_HEAVY)
+			footstep_sounds = GLOB.heavyfootstep
+		if(FOOTSTEP_MOB_SHOE)
+			footstep_sounds = GLOB.footstep
+		if(FOOTSTEP_MOB_SLIME)
+			footstep_sounds = 'sound/effects/footstep/slime1.ogg'
+		if(FOOTSTEP_MOB_CRAWL)
+			footstep_sounds = 'sound/effects/footstep/crawl1.ogg'
+	RegisterSignal(parent, COMSIG_MOVABLE_MOVED, .proc/play_simplestep) //Note that this doesn't get called for humans.
 
-/datum/component/footstep/proc/play_footstep()
+///Prepares a footstep. Determines if it should get played. Returns the turf it should get played on. Note that it is always a /turf/open
+/datum/component/footstep/proc/prepare_step()
 	var/turf/open/T = get_turf(parent)
 	if(!istype(T))
 		return
 
 	var/mob/living/LM = parent
-	var/v = volume
-	var/e = e_range
 	if(!T.footstep || LM.buckled || !CHECK_MOBILITY(LM, MOBILITY_STAND) || LM.buckled || LM.throwing || (LM.movement_type & (VENTCRAWLING | FLYING)))
 		if (LM.lying && !LM.buckled && !(!T.footstep || LM.movement_type & (VENTCRAWLING | FLYING))) //play crawling sound if we're lying
-			playsound(T, 'sound/effects/footstep/crawl1.ogg', 15 * v)
+			playsound(T, 'sound/effects/footstep/crawl1.ogg', 15 * volume)
 		return
 
 	if(HAS_TRAIT(LM, TRAIT_SILENT_STEP))
@@ -30,79 +56,83 @@
 		var/mob/living/carbon/C = LM
 		if(!C.get_bodypart(BODY_ZONE_L_LEG) && !C.get_bodypart(BODY_ZONE_R_LEG))
 			return
-		if(ishuman(C) && C.m_intent == MOVE_INTENT_WALK)
-			v /= 2
-			e -= 5
+		if(C.m_intent == MOVE_INTENT_WALK)
+			return
 	steps++
 
-	if(steps >= 3)
+	if(steps >= 6)
 		steps = 0
 
-	else
+	if(steps % 2)
 		return
 
-	if(prob(80) && !LM.has_gravity(T)) // don't need to step as often when you hop around
+	if(steps != 0 && !LM.has_gravity(T)) // don't need to step as often when you hop around
 		return
+	return T
 
-	//begin playsound shenanigans//
-
-	//for barefooted non-clawed mobs like monkeys
-	if(isbarefoot(LM))
-		playsound(T, pick(GLOB.barefootstep[T.barefootstep][1]),
-			GLOB.barefootstep[T.barefootstep][2] * v,
-			TRUE,
-			GLOB.barefootstep[T.barefootstep][3] + e)
+/datum/component/footstep/proc/play_simplestep()
+	var/turf/open/T = prepare_step()
+	if(!T)
 		return
-
-	//for xenomorphs, dogs, and other clawed mobs
-	if(isclawfoot(LM))
-		if(isalienadult(LM)) //xenos are stealthy and get quieter footsteps
-			v /= 3
-			e -= 5
-
-		playsound(T, pick(GLOB.clawfootstep[T.clawfootstep][1]),
-				GLOB.clawfootstep[T.clawfootstep][2] * v,
-				TRUE,
-				GLOB.clawfootstep[T.clawfootstep][3] + e)
+	if(isfile(footstep_sounds) || istext(footstep_sounds))
+		playsound(T, footstep_sounds, volume)
 		return
-
-	//for megafauna and other large and imtimidating mobs such as the bloodminer
-	if(isheavyfoot(LM))
-		playsound(T, pick(GLOB.heavyfootstep[T.heavyfootstep][1]),
-				GLOB.heavyfootstep[T.heavyfootstep][2] * v,
-				TRUE,
-				GLOB.heavyfootstep[T.heavyfootstep][3] + e)
+	var/turf_footstep
+	switch(footstep_type)
+		if(FOOTSTEP_MOB_CLAW)
+			turf_footstep = T.clawfootstep
+		if(FOOTSTEP_MOB_BAREFOOT)
+			turf_footstep = T.barefootstep
+		if(FOOTSTEP_MOB_HEAVY)
+			turf_footstep = T.heavyfootstep
+		if(FOOTSTEP_MOB_SHOE)
+			turf_footstep = T.footstep
+	if(!turf_footstep)
 		return
+	playsound(T, pick(footstep_sounds[turf_footstep][1]), footstep_sounds[turf_footstep][2] * volume, TRUE, footstep_sounds[turf_footstep][3] + e_range)
 
-	//for slimes
-	if(isslime(LM))
-		playsound(T, 'sound/effects/footstep/slime1.ogg', 15 * v)
+/datum/component/footstep/proc/play_humanstep()
+	var/turf/open/T = prepare_step()
+	if(!T)
 		return
-
-	//for (simple) humanoid mobs (clowns, russians, pirates, etc.)
-	if(isshoefoot(LM))
-		if(!ishuman(LM))
-			playsound(T, pick(GLOB.footstep[T.footstep][1]),
-				GLOB.footstep[T.footstep][2] * v,
-				TRUE,
-				GLOB.footstep[T.footstep][3] + e)
-			return
-		if(ishuman(LM)) //for proper humans, they're special
-			var/mob/living/carbon/human/H = LM
-			var/feetCover = (H.wear_suit && (H.wear_suit.body_parts_covered & FEET)) || (H.w_uniform && (H.w_uniform.body_parts_covered & FEET) || (H.shoes && (H.shoes.body_parts_covered & FEET)))
-
-			if (H.dna.features["taur"] == "Naga" || H.dna.features["taur"] == "Tentacle") //are we a naga or tentacle taur creature
-				playsound(T, 'sound/effects/footstep/crawl1.ogg', 15 * v)
+	var/mob/living/carbon/human/H = parent
+	var/list/L = GLOB.barefootstep
+	var/turf_footstep = T.barefootstep
+	var/special = FALSE
+	if(H.physiology.footstep_type)
+		switch(H.physiology.footstep_type)
+			if(FOOTSTEP_MOB_CLAW)
+				turf_footstep = T.clawfootstep
+				L = GLOB.clawfootstep
+			if(FOOTSTEP_MOB_BAREFOOT)
+				turf_footstep = T.barefootstep
+				L = GLOB.barefootstep
+			if(FOOTSTEP_MOB_HEAVY)
+				turf_footstep = T.heavyfootstep
+				L = GLOB.heavyfootstep
+			if(FOOTSTEP_MOB_SHOE)
+				turf_footstep = T.footstep
+				L = GLOB.footstep
+			if(FOOTSTEP_MOB_SLIME)
+				playsound(T, 'sound/effects/footstep/slime1.ogg', 50 * volume)
 				return
+			if(FOOTSTEP_MOB_CRAWL)
+				playsound(T, 'sound/effects/footstep/crawl1.ogg', 50 * volume)
+				return
+		special = TRUE
+	else
+		var/feetCover = (H.wear_suit && (H.wear_suit.body_parts_covered & FEET)) || (H.w_uniform && (H.w_uniform.body_parts_covered & FEET) || (H.shoes && (H.shoes.body_parts_covered & FEET)))
+		if(feetCover) //are we wearing shoes
+			playsound(T, pick(GLOB.footstep[T.footstep][1]),
+				GLOB.footstep[T.footstep][2] * volume,
+				TRUE,
+				GLOB.footstep[T.footstep][3] + e_range)
+			return
 
-			if(feetCover) //are we wearing shoes
-				playsound(T, pick(GLOB.footstep[T.footstep][1]),
-					GLOB.footstep[T.footstep][2] * v,
-					TRUE,
-					GLOB.footstep[T.footstep][3] + e)
-
-			if(!feetCover) //are we NOT wearing shoes
-				playsound(T, pick(GLOB.barefootstep[T.barefootstep][1]),
-					GLOB.barefootstep[T.barefootstep][2] * v,
-					TRUE,
-					GLOB.barefootstep[T.barefootstep][3] + e)
+	if(!special && H.dna.species.special_step_sounds)
+		playsound(T, pick(H.dna.species.special_step_sounds), 50, TRUE)
+	else
+		playsound(T, pick(L[turf_footstep][1]),
+			L[turf_footstep][2] * volume,
+			TRUE,
+			L[turf_footstep][3] + e_range)

code/datums/components/mood.dm

@@ -1,41 +1,52 @@
+#define ECSTATIC_SANITY_PEN -1
 #define SLIGHT_INSANITY_PEN 1
 #define MINOR_INSANITY_PEN 5
 #define MAJOR_INSANITY_PEN 10
-#define MOOD_INSANITY_MALUS 0.0054 // per point of sanity below SANITY_DISTURBED, a 40% debuff to skills at rock bottom depression.
+#define MOOD_INSANITY_MALUS 0.13 // 13% debuff per sanity_level above the default of 4 (higher is worser), overall a 39% debuff to skills at rock bottom depression.
 
 /datum/component/mood
 	var/mood //Real happiness
 	var/sanity = 100 //Current sanity
 	var/shown_mood //Shown happiness, this is what others can see when they try to examine you, prevents antag checking by noticing traitors are always very happy.
 	var/mood_level = 5 //To track what stage of moodies they're on
-	var/sanity_level = 5 //To track what stage of sanity they're on
+	var/sanity_level = 3 //To track what stage of sanity they're on
 	var/mood_modifier = 1 //Modifier to allow certain mobs to be less affected by moodlets
 	var/list/datum/mood_event/mood_events = list()
 	var/insanity_effect = 0 //is the owner being punished for low mood? If so, how much?
 	var/obj/screen/mood/screen_obj
+	var/datum/skill_modifier/bad_mood/malus
+	var/datum/skill_modifier/great_mood/bonus
+	var/static/malus_id = 0
+	var/static/list/free_maluses = list()
 
 /datum/component/mood/Initialize()
 	if(!isliving(parent))
 		return COMPONENT_INCOMPATIBLE
 
-	START_PROCESSING(SSmood, src)
+	var/mob/living/owner = parent
+	if(owner.stat != DEAD)
+		START_PROCESSING(SSdcs, src)
 
 	RegisterSignal(parent, COMSIG_ADD_MOOD_EVENT, .proc/add_event)
 	RegisterSignal(parent, COMSIG_CLEAR_MOOD_EVENT, .proc/clear_event)
 	RegisterSignal(parent, COMSIG_MODIFY_SANITY, .proc/modify_sanity)
 	RegisterSignal(parent, COMSIG_LIVING_REVIVE, .proc/on_revive)
 	RegisterSignal(parent, COMSIG_MOB_HUD_CREATED, .proc/modify_hud)
-	var/mob/living/owner = parent
+	RegisterSignal(parent, COMSIG_MOB_DEATH, .proc/stop_processing)
+
 	if(owner.hud_used)
 		modify_hud()
 		var/datum/hud/hud = owner.hud_used
 		hud.show_hud(hud.hud_version)
 
 /datum/component/mood/Destroy()
-	STOP_PROCESSING(SSmood, src)
+	STOP_PROCESSING(SSdcs, src)
 	unmodify_hud()
 	return ..()
 
+/datum/component/mood/proc/stop_processing()
+	STOP_PROCESSING(SSdcs, src)
+
 /datum/component/mood/proc/print_mood(mob/user)
 	var/msg = "<span class='info'>*---------*\n<EM>Your current mood</EM>\n"
 	msg += "<span class='notice'>My mental status: </span>" //Long term
@@ -127,7 +138,7 @@
 		else
 			screen_obj.icon_state = "mood[mood_level]"
 
-/datum/component/mood/process() //Called on SSmood process
+/datum/component/mood/process() //Called on SSdcs process
 	if(QDELETED(parent)) // workaround to an obnoxious sneaky periodical runtime.
 		qdel(src)
 		return
@@ -167,13 +178,13 @@
 	else if(sanity > maximum && amount > sanity - 0.5)
 		amount = sanity - 0.5
 
-	var/old_sanity = sanity
 	// Disturbed stops you from getting any more sane
 	if(HAS_TRAIT(master, TRAIT_UNSTABLE))
 		sanity = min(amount,sanity)
 	else
 		sanity = amount
 
+	var/old_sanity_level = sanity_level
 	switch(sanity)
 		if(-INFINITY to SANITY_CRAZY)
 			setInsanityEffect(MAJOR_INSANITY_PEN)
@@ -196,27 +207,43 @@
 			master.remove_movespeed_modifier(MOVESPEED_ID_SANITY)
 			sanity_level = 2
 		if(SANITY_GREAT+1 to INFINITY)
-			setInsanityEffect(0)
+			setInsanityEffect(ECSTATIC_SANITY_PEN) //It's not a penalty but w/e
 			master.remove_movespeed_modifier(MOVESPEED_ID_SANITY)
 			sanity_level = 1
 
-	if(old_sanity > 1 && sanity == 1)
-		RegisterSignal(master, COMSIG_MOB_SKILL_GET_AFFINITY, .proc/on_get_skill_affinity)
-	else if(old_sanity == 1 && sanity > 1)
-		UnregisterSignal(master, COMSIG_MOB_SKILL_GET_AFFINITY)
+	if(sanity_level != old_sanity_level)
+		if(sanity_level >= 4)
+			if(!malus)
+				if(!length(free_maluses))
+					ADD_SKILL_MODIFIER_BODY(/datum/skill_modifier/bad_mood, malus_id++, master, malus)
+				else
+					malus = pick_n_take(free_maluses)
+					if(master.mind)
+						master.mind.add_skill_modifier(malus.identifier)
+					else
+						malus.RegisterSignal(master, COMSIG_MOB_ON_NEW_MIND, /datum/skill_modifier.proc/on_mob_new_mind, TRUE)
+			malus.value_mod = malus.level_mod = 1 - (sanity_level - 3) * MOOD_INSANITY_MALUS
+		else if(malus)
+			if(master.mind)
+				master.mind.remove_skill_modifier(malus.identifier)
+			else
+				malus.UnregisterSignal(master, COMSIG_MOB_ON_NEW_MIND)
+			free_maluses += malus
+			malus = null
 
 	//update_mood_icon()
 
 /datum/component/mood/proc/setInsanityEffect(newval)//More code so that the previous proc works
 	if(newval == insanity_effect)
 		return
-	//var/mob/living/master = parent
-	//master.crit_threshold = (master.crit_threshold - insanity_effect) + newval
-	if(!insanity_effect && newval)
-		RegisterSignal(parent, COMSIG_MOB_ACTION_SKILL_MOD, .proc/on_mob_action_skill_mod)
-		RegisterSignal(parent, COMSIG_MOB_ITEM_ACTION_SKILLS_MOD, .proc/on_item_action_skills_mod)
-	else if(insanity_effect && !newval)
-		UnregisterSignal(parent, list(COMSIG_MOB_ACTION_SKILL_MOD, COMSIG_MOB_ITEM_ACTION_SKILLS_MOD))
+
+	var/mob/living/L = parent
+	if(newval == ECSTATIC_SANITY_PEN && !bonus)
+		ADD_SKILL_MODIFIER_BODY(/datum/skill_modifier/great_mood, null, L, bonus)
+	else if(bonus)
+		REMOVE_SKILL_MODIFIER_BODY(/datum/skill_modifier/great_mood, null, L)
+		bonus = null
+
 	insanity_effect = newval
 
 /datum/component/mood/proc/modify_sanity(datum/source, amount, minimum = SANITY_INSANE, maximum = SANITY_AMAZING)
@@ -294,46 +321,15 @@
 		if(0 to NUTRITION_LEVEL_STARVING)
 			add_event(null, "nutrition", /datum/mood_event/starving)
 
-///Called when parent is ahealed.
+///Called when parent is revived.
 /datum/component/mood/proc/on_revive(datum/source, full_heal)
+	START_PROCESSING(SSdcs, src)
 	if(!full_heal)
 		return
 	remove_temp_moods()
 	setSanity(initial(sanity))
 
-/datum/component/mood/proc/on_mob_action_skill_mod(mob/source, list/skill_args, list/mod_values)
-	var/datum/skill/S = GLOB.skill_datums[skill_args[ACTION_SKILL_MOD_SKILL]]
-	if(!(S.skill_flags & SKILL_USE_MOOD))
-		return
-	var/debuff = 1 - (SANITY_DISTURBED - sanity) * MOOD_INSANITY_MALUS
-	mod_values[MOD_VALUES_SKILL_MOD] *= skill_args[ACTION_SKILL_MOD_IS_MULTI] ? debuff : 1/debuff
-
-/datum/component/mood/proc/on_item_action_skills_mod(mob/source, list/skill_args, list/mod_values)
-	if(skill_args[ITEM_SKILLS_MOD_BAD_FLAGS] & SKILL_USE_MOOD)
-		return
-	var/divisor = mod_values[MOD_VALUES_ITEM_SKILLS_DIV]
-	if(!divisor)
-		return
-	var/obj/item/I = skill_args[ITEM_SKILLS_MOD_ITEM]
-	var/list/L = mod_values[MOD_VALUES_ITEM_SKILLS_CHECKED]
-	var/skills_len = length(L)
-	var/affected_skills = skills_len
-	for(var/k in L)
-		var/datum/skill/S = k
-		var/our_flags = I.used_skills[S.type]|S.skill_flags
-		if(!(our_flags & SKILL_USE_MOOD))
-			affected_skills--
-	if(!affected_skills)
-		return
-	var/debuff = 1 - (SANITY_DISTURBED - sanity) * MOOD_INSANITY_MALUS * (affected_skills/skills_len)
-	mod_values[MOD_VALUES_ITEM_SKILLS_SUM] *= skill_args[ITEM_SKILLS_MOD_IS_MULTI] ? debuff : 1/debuff
-
-/datum/component/mood/proc/on_get_skill_affinity(mob/source, skill_path, list/return_value)
-	var/datum/skill/S = GLOB.skill_datums[skill_path]
-	if(!S || !(S.skill_flags & SKILL_TRAIN_MOOD))
-		return
-	return_value[1] *= SKILL_AFFINITY_MOOD_BONUS
-
+#undef ECSTATIC_SANITY_PEN
 #undef SLIGHT_INSANITY_PEN
 #undef MINOR_INSANITY_PEN
 #undef MAJOR_INSANITY_PEN

code/datums/components/storage/storage.dm

@@ -353,8 +353,12 @@
 /datum/component/storage/proc/_remove_and_refresh(datum/source, atom/movable/thing)
 	_removal_reset(thing)
 	if(LAZYACCESS(ui_item_blocks, thing))
-		qdel(ui_item_blocks[thing])
+		var/obj/screen/storage/volumetric_box/center/C = ui_item_blocks[thing]
+		for(var/i in can_see_contents())		//runtimes result if mobs can access post deletion.
+			var/mob/M = i
+			M.client?.screen -= C.on_screen_objects()
 		ui_item_blocks -= thing
+		qdel(C)
 	refresh_mob_views()
 
 //Call this proc to handle the removal of an item from the storage item. The item will be moved to the new_location target, if that is null it's being deleted
@@ -567,10 +571,9 @@
 		return
 	if(rustle_sound)
 		playsound(parent, "rustle", 50, 1, -5)
-	for(var/mob/viewing in viewers(user, null))
-		if(M == viewing)
-			to_chat(usr, "<span class='notice'>You put [I] [insert_preposition]to [parent].</span>")
-		else if(in_range(M, viewing)) //If someone is standing close enough, they can tell what it is...
+	to_chat(user, "<span class='notice'>You put [I] [insert_preposition]to [parent].</span>")
+	for(var/mob/viewing in fov_viewers(world.view, user)-M)
+		if(in_range(M, viewing)) //If someone is standing close enough, they can tell what it is...
 			viewing.show_message("<span class='notice'>[M] puts [I] [insert_preposition]to [parent].</span>", MSG_VISUAL)
 		else if(I && I.w_class >= 3) //Otherwise they can only see large or normal items from a distance...
 			viewing.show_message("<span class='notice'>[M] puts [I] [insert_preposition]to [parent].</span>", MSG_VISUAL)

code/datums/components/storage/ui.dm

@@ -92,6 +92,8 @@
 	var/list/volume_by_item = list()
 	var/list/percentage_by_item = list()
 	for(var/obj/item/I in contents)
+		if(QDELETED(I))
+			continue
 		volume = I.get_w_volume()
 		used += volume
 		volume_by_item[I] = volume
@@ -123,6 +125,7 @@
 	var/obj/item/I
 	// start at this pixel from screen_start_x.
 	var/current_pixel = VOLUMETRIC_STORAGE_EDGE_PADDING
+	var/first = TRUE
 	var/row = 1
 
 	LAZYINITLIST(ui_item_blocks)
@@ -140,10 +143,10 @@
 			addrow = TRUE
 
 		// now that we have pixels_to_use, place our thing and add it to the returned list.
-
-		B.screen_loc = I.screen_loc = "[screen_start_x]:[round(current_pixel + (pixels_to_use * 0.5) + VOLUMETRIC_STORAGE_ITEM_PADDING, 1)],[screen_start_y+row-1]:[screen_pixel_y]"
+		B.screen_loc = I.screen_loc = "[screen_start_x]:[round(current_pixel + (pixels_to_use * 0.5) + (first? 0 : VOLUMETRIC_STORAGE_ITEM_PADDING), 1)],[screen_start_y+row-1]:[screen_pixel_y]"
 		// add the used pixels to pixel after we place the object
-		current_pixel += pixels_to_use + VOLUMETRIC_STORAGE_ITEM_PADDING
+		current_pixel += pixels_to_use + (first? 0 : VOLUMETRIC_STORAGE_ITEM_PADDING)
+		first = FALSE		//apply padding to everything after this
 
 		// set various things
 		B.set_pixel_size(pixels_to_use)
@@ -163,6 +166,7 @@
 		// go up a row if needed
 		if(addrow)
 			row++
+			first = TRUE		//first in the row, don't apply between-item padding.
 			current_pixel = VOLUMETRIC_STORAGE_EDGE_PADDING
 
 	// Then, continuous section.
@@ -233,7 +237,7 @@
 	if(!M.client)
 		return TRUE
 	UnregisterSignal(M, COMSIG_MOB_CLIENT_LOGOUT)
-	M.client.screen -= list(ui_boxes, ui_close, ui_left, ui_continuous) + get_ui_item_objects_hide()
+	M.client.screen -= list(ui_boxes, ui_close, ui_left, ui_continuous) + get_ui_item_objects_hide(M)
 	if(M.active_storage == src)
 		M.active_storage = null
 	LAZYREMOVE(is_using, M)
@@ -249,8 +253,8 @@
 /**
   * Gets the ui item objects to ui_hide.
   */
-/datum/component/storage/proc/get_ui_item_objects_hide()
-	if(!volumetric_ui())
+/datum/component/storage/proc/get_ui_item_objects_hide(mob/M)
+	if(!volumetric_ui() || M.client?.prefs?.no_tetris_storage)
 		var/atom/real_location = real_location()
 		return real_location.contents
 	else