Updating from Neb dev.

code/_helpers/emissive.dm

@@ -1,5 +1,6 @@
-/proc/emissive_overlay(var/icon, var/icon_state, var/loc, var/dir, var/color)
+/proc/emissive_overlay(icon, icon_state, loc, dir, color, flags)
 	var/image/I = image(icon, loc, icon_state, EMISSIVE_LAYER, dir)
 	I.plane = EMISSIVE_PLANE
 	I.color = color
+	I.appearance_flags |= flags
 	return I

code/_helpers/time.dm

@@ -85,7 +85,7 @@ var/global/round_start_time = 0
 		out += "[seconds] second\s"
 	if(length(out))
 		return english_list(out)
-	return null
+	return "less than a second"
 
 /proc/roundduration2text()
 	if(!round_start_time)

code/_helpers/unsorted.dm

@@ -719,11 +719,8 @@ Turf and target are seperate in case you want to teleport some distance from a t
 /obj/item/weldingtool/can_puncture()
 	return 1
 
-/obj/item/screwdriver/can_puncture()
-	return 1
-
 /obj/item/clothing/mask/smokable/cigarette/can_puncture()
-	return src.lit
+	return ..() || lit // in case someone has a sharp cigarette for some reason
 
 /*
 Checks if that loc and dir has a item on the wall

code/_helpers/visual_filters.dm

@@ -52,8 +52,8 @@
 		LAZYREMOVE(filter_data, filter_name)
 		filters -= thing
 		update_filters()
-		return FALSE
-	return TRUE
+		return TRUE
+	return FALSE
 
 /// Animate a given filter on this atom. All params after the first are passed to animate().
 /atom/movable/proc/animate_filter(filter_name, list/params)

code/_onclick/click.dm

@@ -116,11 +116,6 @@
 	var/sdepth = A.storage_depth(src)
 	if((!isturf(A) && A == loc) || (sdepth != -1 && sdepth <= 1))
 		if(holding)
-
-			// AI driven mobs have a melee telegraph that needs to be handled here.
-			if(check_intent(I_FLAG_HARM) && istype(A) && (!do_attack_windup_checking(A) || holding != get_active_held_item()))
-				return TRUE
-
 			var/resolved = holding.resolve_attackby(A, src, params)
 			if(!resolved && A && holding)
 				holding.afterattack(A, src, 1, params) // 1 indicates adjacency
@@ -143,10 +138,6 @@
 		if(A.Adjacent(src)) // see adjacent.dm
 			if(holding)
 
-				// AI driven mobs have a melee telegraph that needs to be handled here.
-				if(check_intent(I_FLAG_HARM) && istype(A) && (!do_attack_windup_checking(A) || holding != get_active_held_item()))
-					return TRUE
-
 				// Return 1 in attackby() to prevent afterattack() effects (when safely moving items for example)
 				var/resolved = holding.resolve_attackby(A, src, params)
 				if(!resolved && A && holding)
@@ -217,18 +208,7 @@
 	if(istype(G) && G.Touch(A,1))
 		return TRUE
 
-	// Pick up items.
-	if(check_dexterity(DEXTERITY_HOLD_ITEM, silent = TRUE))
-		return A.attack_hand(src)
-
-	// TODO: some way to check if we SHOULD be doing an attack windup here;
-	// corgis attacking a tree, for example, will do the windup animation despite
-	// having no interaction or message shown at the end of it.
-	// AI driven mobs have a melee telegraph that needs to be handled here.
-	if(check_intent(I_FLAG_HARM) && istype(A) && !do_attack_windup_checking(A))
-		return TRUE
-
-	return FALSE
+	return A.attack_hand(src)
 
 /*
 	Ranged unarmed attack:

code/_onclick/other_mobs.dm

@@ -8,9 +8,15 @@
 /atom/proc/can_interact_with_storage(user, strict = FALSE)
 	return isliving(user)
 
+/atom/proc/get_required_interaction_dexterity()
+	return DEXTERITY_NONE
+
 /atom/proc/attack_hand(mob/user)
 	SHOULD_CALL_PARENT(TRUE)
 
+	if(!user.check_dexterity(get_required_interaction_dexterity(), silent = TRUE))
+		return FALSE
+
 	if(can_interact_with_storage(user, strict = TRUE) && storage && user.check_dexterity((DEXTERITY_HOLD_ITEM|DEXTERITY_EQUIP_ITEM), TRUE))
 		add_fingerprint(user)
 		storage.open(user)

code/controllers/subsystems/ambience.dm

@@ -63,10 +63,23 @@ SUBSYSTEM_DEF(ambience)
 
 		// Grab what we need to set ambient light from our level handler.
 		var/datum/level_data/level_data = SSmapping.levels_by_z[z]
+		var/daycycle_id = level_data.daycycle_id
+		// if we don't have a daycycle ourselves, and we're indoors because of a turf blocking us
+		// find the first daycycle above us to use
+		if(!outsideness && !daycycle_id && HasAbove(z))
+			var/turf/above = src
+			var/datum/level_data/above_level_data
+			while ((above = GetAbove(above)))
+				if((above.z_flags & ZM_TERMINATOR) || !HasAbove(above.z))
+					break
+				above_level_data = SSmapping.levels_by_z[above.z]
+				if(above_level_data.daycycle_id)
+					daycycle_id = above_level_data.daycycle_id
+					break
 
 		// Check for daycycle ambience.
-		if(level_data.daycycle_id)
-			var/datum/daycycle/daycycle = SSdaycycle.get_daycycle(level_data.daycycle_id)
+		if(daycycle_id)
+			var/datum/daycycle/daycycle = SSdaycycle.get_daycycle(daycycle_id)
 			var/new_power = daycycle?.current_period?.power
 			if(!isnull(new_power))
 				if(new_power > 0)

code/controllers/subsystems/initialization/modpacks.dm

@@ -7,6 +7,7 @@ SUBSYSTEM_DEF(modpacks)
 	// Compiled modpack information.
 	var/list/default_submap_whitelisted_species = list()
 	var/list/default_submap_blacklisted_species = list(SPECIES_ALIEN, SPECIES_GOLEM)
+	var/list/modpack_nanoui_directories = list()
 
 /datum/controller/subsystem/modpacks/Initialize()
 	var/list/all_modpacks = decls_repository.get_decls_of_subtype(/decl/modpack)

code/datums/ai/aggressive.dm

@@ -90,10 +90,14 @@
 	return TRUE
 
 /datum/mob_controller/aggressive/proc/attack_target()
+
+	set waitfor = FALSE
+
 	var/atom/target = get_target()
 	if(!istype(target))
 		lose_target()
 		return
+
 	if(isliving(target) && body.buckled_mob == target && (!body.faction || body.buckled_mob.faction != body.faction))
 		body.visible_message(SPAN_DANGER("\The [body] attempts to unseat \the [body.buckled_mob]!"))
 		body.set_dir(pick(global.cardinal))
@@ -105,11 +109,21 @@
 				var/mob/living/victim = target
 				SET_STATUS_MAX(victim, STAT_WEAK, 3)
 		return target
-	if(body.Adjacent(target))
-		body.set_intent(I_FLAG_HARM)
-		body.ClickOn(target)
+
+	if(!body.Adjacent(target))
+		return target
+
+	// AI-driven mobs have a melee telegraph that needs to be handled here.
+	if(!body.do_attack_windup_checking(target))
 		return target
 
+	if(QDELETED(body) || body.incapacitated() || QDELETED(target))
+		return target
+
+	body.set_intent(I_FLAG_HARM)
+	body.ClickOn(target)
+	return target
+
 /datum/mob_controller/aggressive/destroy_surroundings()
 
 	if(!body.can_act())
@@ -172,27 +186,25 @@
 	if(!(. = ..()))
 		return
 
-	if(!only_attack_enemies)
-		if(source)
-			set_target(source)
-			move_to_target(move_only = TRUE)
-		return
-
-	var/list/allies
-	var/list/around = view(body, 7)
-	for(var/atom/movable/A in around)
-		if(A == body || !isliving(A))
-			continue
-		var/mob/living/M = A
-		if(attack_same_faction || M.faction != body.faction)
-			add_enemy(M)
-		else if(istype(M.ai))
-			LAZYADD(allies, M.ai)
-
-	var/list/enemies = get_enemies()
-	if(LAZYLEN(enemies) && LAZYLEN(allies))
-		for(var/datum/mob_controller/ally as anything in allies)
-			ally.add_enemies(enemies)
+	if(only_attack_enemies)
+		var/list/allies
+		var/list/around = view(body, 7)
+		for(var/atom/movable/A in around)
+			if(A == body || !isliving(A))
+				continue
+			var/mob/living/M = A
+			if(attack_same_faction || M.faction != body.faction)
+				add_enemy(M)
+			else if(istype(M.ai))
+				LAZYADD(allies, M.ai)
+		var/list/enemies = get_enemies()
+		if(LAZYLEN(enemies) && LAZYLEN(allies))
+			for(var/datum/mob_controller/ally as anything in allies)
+				ally.add_enemies(enemies)
+
+	if(source)
+		set_target(source)
+		move_to_target(move_only = TRUE)
 
 /datum/mob_controller/aggressive/move_to_target(var/move_only = FALSE)
 	if(!body.can_act())

code/datums/communication/dsay.dm

@@ -61,12 +61,8 @@
 
 	keyname = C.key
 	if(C.mob) //Most of the time this is the dead/observer mob; we can totally use him if there is no better name
-		var/mindname
+		var/mindname = C.mob.mind?.name // the mind's "original name"
 		var/realname = C.mob.real_name
-		if(C.mob.mind)
-			mindname = C.mob.mind.name
-			if(C.mob.mind.original && C.mob.mind.original.real_name)
-				realname = C.mob.mind.original.real_name
 		if(mindname && mindname != realname)
 			name = "[realname] died as [mindname]"
 		else

code/datums/datum.dm

@@ -111,10 +111,3 @@
  */
 /datum/proc/PopulateClone(var/datum/clone)
 	return clone
-
-/////////////////////////////////////////////////////////////
-//Common implementations
-/////////////////////////////////////////////////////////////
-
-/image/GetCloneArgs()
-	return list(icon, loc, icon_state, layer, dir)

code/datums/extensions/abilities/abilities_predator.dm

@@ -5,12 +5,26 @@
 	return istype(user) && !user.incapacitated() && isatom(target) && target.Adjacent(user)
 
 /datum/ability_handler/predator/do_melee_invocation(mob/user, atom/target)
-	// Nibbles
+
+	// Nibbles!
 	if(user.check_intent(I_FLAG_HARM))
 		if(isliving(target))
 			return handle_dismemberment(user, target)
 		if(istype(target, /obj/item/organ))
 			return handle_organ_destruction(user, target)
+
+	// Digging!
+	var/static/list/diggable_types = list(
+		/turf/floor,
+		/turf/wall,
+		/obj/structure/pit,
+		/obj/machinery/portable_atmospherics/hydroponics/soil
+	)
+	if(is_type_in_list(target, diggable_types))
+		var/obj/item/organ/external/paw = user.get_usable_hand_slot_organ()
+		if(paw)
+			return target.attackby(paw, user)
+
 	return FALSE
 
 /datum/ability_handler/predator/proc/handle_organ_destruction(mob/user, obj/item/organ/chewtoy)

code/datums/extensions/milkable/milkable.dm

@@ -8,6 +8,10 @@
 	var/milk_min  = 5
 	var/milk_max  = 10
 
+	var/cream_type = /decl/material/liquid/drink/milk/cream
+	var/cream_min  = 2
+	var/cream_max  = 5
+
 	var/impatience = 0
 	var/decl/skill/milking_skill = SKILL_BOTANY
 	var/milking_skill_req        = SKILL_BASIC
@@ -42,9 +46,16 @@
 		create_milk()
 
 /datum/extension/milkable/proc/create_milk()
-	var/create_milk = min(rand(milk_min, milk_max), REAGENTS_FREE_SPACE(udder))
-	if(create_milk > 0)
-		udder.add_reagent(milk_type, create_milk, get_milk_data())
+
+	var/create_milk  = min(rand(milk_min, milk_max), REAGENTS_FREE_SPACE(udder))
+	var/create_cream = min(rand(cream_min, cream_max), REAGENTS_FREE_SPACE(udder) - create_milk)
+
+	if(create_milk <= 0 && create_cream <= 0)
+		return
+
+	var/list/milk_data = get_milk_data()
+	udder.add_reagent(milk_type,  create_milk,  milk_data)
+	udder.add_reagent(cream_type, create_cream, milk_data)
 
 /datum/extension/milkable/proc/get_milk_data()
 	var/static/list/milk_data = list(
@@ -113,7 +124,7 @@
 		SPAN_NOTICE("\The [user] milks \the [critter] into \the [container]."),
 		SPAN_NOTICE("You milk \the [critter] into \the [container].")
 	)
-	udder.trans_type_to(container, milk_type, min(REAGENTS_FREE_SPACE(container.reagents), rand(15, 20)))
+	udder.trans_to(container, min(REAGENTS_FREE_SPACE(container.reagents), rand(15, 20)))
 	return TRUE
 
 /datum/extension/milkable/proc/handle_milking_failure(mob/user, mob/living/critter)

code/datums/inventory_slots/_inventory_slot.dm

@@ -19,6 +19,8 @@
 	var/requires_slot_flags
 	var/requires_organ_tag
 	var/quick_equip_priority = 0 // Higher priority means it will be checked first. If null, will not be considered for quick equip.
+	/// What depth of fluid is necessary for an item in this slot to be considered submerged?
+	var/fluid_height = FLUID_SHALLOW // we're treating FLUID_SHALLOW as waist level, basically
 
 	var/mob_overlay_layer
 	var/alt_mob_overlay_layer

code/datums/inventory_slots/inventory_gripper.dm

@@ -5,6 +5,7 @@
 	/// If set, use this icon_state for the hand slot overlay; otherwise, use slot_id.
 	var/hand_overlay
 	quick_equip_priority = null // you quick-equip stuff by holding it in a gripper, so this ought to be skipped
+	fluid_height = (FLUID_SHALLOW + FLUID_OVER_MOB_HEAD) / 2 // halfway between waist and top of head, so roughly chest level, reasoning that you can just hold it up out of the water
 
 	// For reference, grippers do not use ui_loc, they have it set dynamically during /datum/hud/proc/rebuild_hands()
 

code/datums/inventory_slots/slots/slot_back.dm

@@ -7,6 +7,7 @@
 	requires_slot_flags = SLOT_BACK
 	mob_overlay_layer = HO_BACK_LAYER
 	quick_equip_priority = 14
+	fluid_height = (FLUID_SHALLOW + FLUID_OVER_MOB_HEAD) / 2 // halfway between waist and top of head, so roughly chest level
 
 /datum/inventory_slot/back/simple
 	requires_organ_tag = null

code/datums/inventory_slots/slots/slot_ears.dm

@@ -10,6 +10,7 @@
 	requires_slot_flags = SLOT_EARS
 	mob_overlay_layer = HO_L_EAR_LAYER
 	quick_equip_priority = 7
+	fluid_height = (FLUID_SHALLOW * 0.25 + FLUID_OVER_MOB_HEAD * 0.75) // 3/4 of the way between waist-level and the top of your head
 
 /datum/inventory_slot/ear/update_mob_equipment_overlay(var/mob/living/user, var/obj/item/prop, var/redraw_mob = TRUE)
 	for(var/slot in global.airtight_slots)

code/datums/inventory_slots/slots/slot_glasses.dm

@@ -11,6 +11,7 @@
 	mob_overlay_layer = HO_GLASSES_LAYER
 	alt_mob_overlay_layer = HO_GOGGLES_LAYER
 	quick_equip_priority = 5
+	fluid_height = (FLUID_SHALLOW * 0.25 + FLUID_OVER_MOB_HEAD * 0.75) // 3/4 of the way between waist-level and the top of your head
 
 /datum/inventory_slot/glasses/get_examined_string(mob/owner, mob/user, distance, hideflags, decl/pronouns/pronouns)
 	if(_holding && !(hideflags & HIDEEYES))

code/datums/inventory_slots/slots/slot_head.dm

@@ -9,6 +9,7 @@
 	requires_slot_flags = SLOT_HEAD
 	mob_overlay_layer = HO_HEAD_LAYER
 	quick_equip_priority = 9
+	fluid_height = FLUID_OVER_MOB_HEAD
 
 /datum/inventory_slot/head/simple
 	requires_organ_tag = null

code/datums/inventory_slots/slots/slot_id.dm

@@ -6,6 +6,7 @@
 	requires_slot_flags = SLOT_ID
 	mob_overlay_layer = HO_ID_LAYER
 	quick_equip_priority = 13
+	fluid_height = (FLUID_SHALLOW + FLUID_OVER_MOB_HEAD) / 2 // halfway between waist and top of head, so roughly chest level
 
 /datum/inventory_slot/id/update_mob_equipment_overlay(var/mob/living/user, var/obj/item/prop, var/redraw_mob = TRUE)
 	var/obj/item/clothing/clothes = user.get_equipped_item(slot_w_uniform_str)

code/datums/inventory_slots/slots/slot_mask.dm

@@ -10,6 +10,7 @@
 	can_be_hidden = TRUE
 	mob_overlay_layer = HO_FACEMASK_LAYER
 	quick_equip_priority = 10
+	fluid_height = (FLUID_SHALLOW * 0.25 + FLUID_OVER_MOB_HEAD * 0.75) // 3/4 of the way between waist-level and the top of your head
 
 /datum/inventory_slot/mask/update_mob_equipment_overlay(var/mob/living/user, var/obj/item/prop, var/redraw_mob = TRUE)
 	if(prop?.flags_inv & BLOCK_ALL_HAIR)

code/datums/inventory_slots/slots/slot_shoes.dm

@@ -10,6 +10,7 @@
 	)
 	requires_slot_flags = SLOT_FEET
 	quick_equip_priority = 3
+	fluid_height = 3
 
 /datum/inventory_slot/shoes/update_mob_equipment_overlay(var/mob/living/user, var/obj/item/prop, var/redraw_mob = TRUE)
 	var/obj/item/suit =    user.get_equipped_item(slot_wear_suit_str)

code/datums/inventory_slots/slots/slot_suit_storage.dm

@@ -5,6 +5,7 @@
 	slot_id = slot_s_store_str
 	requires_organ_tag = BP_CHEST
 	mob_overlay_layer = HO_SUIT_STORE_LAYER
+	fluid_height = (FLUID_SHALLOW + FLUID_OVER_MOB_HEAD) / 2 // halfway between waist and top of head, so roughly chest level
 
 /datum/inventory_slot/suit_storage/can_equip_to_slot(var/mob/user, var/obj/item/prop, var/disable_warning, var/ignore_equipped)
 	. = ..()