Merge branch 'master' of https://github.com/Wallemations/MapleStation…

…Wallem into umef

code/__DEFINES/alerts.dm

@@ -19,7 +19,6 @@
 #define ALERT_BUCKLED "buckled"
 #define ALERT_HANDCUFFED "handcuffed"
 #define ALERT_LEGCUFFED "legcuffed"
-#define ALERT_WOUNDED "wound"
 #define ALERT_IRRADIATED "irradiated"
 #define ALERT_EMBEDDED_OBJECT "embeddedobject"
 #define ALERT_SHOES_KNOT "shoealert"

code/__DEFINES/chat.dm

@@ -46,3 +46,7 @@
 #define debug_world_log(msg) if (GLOB.Debug2) log_world("DEBUG: [msg]")
 /// Adds a generic box around whatever message you're sending in chat. Really makes things stand out.
 #define examine_block(str) ("<div class='examine_block'>" + str + "</div>")
+/// Makes a horizontal line with text in the middle
+#define separator_hr(str) ("<div class='separator'>" + str + "</div>")
+/// Helper which creates a chat message which may have a tooltip in some contexts, but not others.
+#define conditional_tooltip(normal_text, tooltip_text, condition) ((condition) ? (span_tooltip(tooltip_text, normal_text)) : (normal_text))

code/__DEFINES/dcs/signals/signals_mob/signals_mob_carbon.dm

@@ -42,8 +42,8 @@
 
 /// Called from update_health_hud, whenever a bodypart is being updated on the health doll
 #define COMSIG_BODYPART_UPDATING_HEALTH_HUD "bodypart_updating_health_hud"
-	/// Return to override that bodypart's health hud with your own icon
-	#define COMPONENT_OVERRIDE_BODYPART_HEALTH_HUD (1<<0)
+	/// Return to override that bodypart's health hud with whatever is returned by the list
+	#define OVERRIDE_BODYPART_HEALTH_HUD (1<<0)
 
 /// Called from /obj/item/bodypart/check_for_injuries (mob/living/carbon/examiner, list/check_list)
 #define COMSIG_BODYPART_CHECKED_FOR_INJURY "bodypart_injury_checked"

code/__DEFINES/mobs.dm

@@ -978,3 +978,7 @@ GLOBAL_LIST_INIT(layers_to_offset, list(
 
 /// Types of bullets that mining mobs take full damage from
 #define MINING_MOB_PROJECTILE_VULNERABILITY list(BRUTE)
+
+/// Distance which you can see someone's ID card
+/// Short enough that you can inspect over tables (bartender checking age)
+#define ID_EXAMINE_DISTANCE 3

code/__DEFINES/span.dm

@@ -117,18 +117,21 @@
 #define span_secradio(str) ("<span class='secradio'>" + str + "</span>")
 #define span_servradio(str) ("<span class='servradio'>" + str + "</span>")
 #define span_singing(str) ("<span class='singing'>" + str + "</span>")
+#define span_slightly_larger(str) ("<span class='slightly_larger'>" + str + "</span>")
 #define span_slime(str) ("<span class='slime'>" + str + "</span>")
 #define span_small(str) ("<span class='small'>" + str + "</span>")
+#define span_smalldanger(str) ("<span class='smalldanger'>" + str + "</span>")
 #define span_smallnotice(str) ("<span class='smallnotice'>" + str + "</span>")
 #define span_smallnoticeital(str) ("<span class='smallnoticeital'>" + str + "</span>")
+#define span_spiderbreacher(str) ("<span class='spiderbreacher'>" + str + "</span>")
 #define span_spiderbroodmother(str) ("<span class='spiderbroodmother'>" + str + "</span>")
 #define span_spiderscout(str) ("<span class='spiderscout'>" + str + "</span>")
-#define span_spiderbreacher(str) ("<span class='spiderbreacher'>" + str + "</span>")
 #define span_subheader_announcement_text(str) ("<span class='subheader_announcement_text'>" + str + "</span>")
 #define span_suicide(str) ("<span class='suicide'>" + str + "</span>")
 #define span_suppradio(str) ("<span class='suppradio'>" + str + "</span>")
 #define span_syndradio(str) ("<span class='syndradio'>" + str + "</span>")
 #define span_tape_recorder(str) ("<span class='tape_recorder'>" + str + "</span>")
+#define span_tinydanger(str) ("<span class='tinydanger'>" + str + "</span>")
 #define span_tinynotice(str) ("<span class='tinynotice'>" + str + "</span>")
 #define span_tinynoticeital(str) ("<span class='tinynoticeital'>" + str + "</span>")
 #define span_unconscious(str) ("<span class='unconscious'>" + str + "</span>")

code/__DEFINES/surgery.dm

@@ -26,8 +26,12 @@
 #define ORGAN_HIDDEN (1<<9)
 /// Has the organ already been inserted inside someone
 #define ORGAN_VIRGIN (1<<10)
+/// ALWAYS show this when scanned by advanced scanners, even if it is totally healthy
+#define ORGAN_PROMINENT (1<<11)
+/// An organ that is ostensibly dangerous when inside a body
+#define ORGAN_HAZARDOUS (1<<12)
 
-#define ORGAN_IRRADIATED (1<<11)
+#define ORGAN_IRRADIATED (1<<13)
 
 /// Helper to figure out if a limb is organic
 #define IS_ORGANIC_LIMB(limb) (limb.bodytype & BODYTYPE_ORGANIC)

code/_onclick/hud/hud.dm

@@ -93,7 +93,7 @@ GLOBAL_LIST_INIT(available_ui_styles, list(
 
 	var/atom/movable/screen/healths
 	var/atom/movable/screen/stamina
-	var/atom/movable/screen/healthdoll
+	var/atom/movable/screen/healthdoll/healthdoll
 	var/atom/movable/screen/spacesuit
 	var/atom/movable/screen/hunger
 	// subtypes can override this to force a specific UI style

code/_onclick/hud/human.dm

@@ -271,7 +271,7 @@
 	hunger = new /atom/movable/screen/hunger(null, src)
 	infodisplay += hunger
 
-	healthdoll = new /atom/movable/screen/healthdoll(null, src)
+	healthdoll = new /atom/movable/screen/healthdoll/human(null, src)
 	infodisplay += healthdoll
 
 	stamina = new /atom/movable/screen/stamina(null, src)

code/_onclick/hud/screen_objects.dm

@@ -663,6 +663,88 @@
 	screen_loc = ui_living_healthdoll
 	var/filtered = FALSE //so we don't repeatedly create the mask of the mob every update
 
+/atom/movable/screen/healthdoll/human
+	/// Tracks components of our doll, each limb is a separate atom in our vis_contents
+	VAR_PRIVATE/list/atom/movable/screen/limbs
+	/// Lazylist, tracks all body zones that are wounded currently
+	/// Used so we can sync animations should the list be updated
+	VAR_PRIVATE/list/animated_zones
+
+/atom/movable/screen/healthdoll/human/Initialize(mapload, datum/hud/hud_owner)
+	. = ..()
+	limbs = list()
+	for(var/i in BODY_ZONES_ALL)
+		var/atom/movable/screen/healthdoll_limb/limb = new(src, null)
+		// layer chest above other limbs, it's the center after all
+		limb.layer = i == BODY_ZONE_CHEST ? layer + 0.05 : layer
+		limbs[i] = limb
+		// why viscontents? why not overlays? - because i want to animate filters
+		vis_contents += limb
+	update_appearance()
+
+/atom/movable/screen/healthdoll/human/Destroy()
+	QDEL_LIST_ASSOC_VAL(limbs)
+	vis_contents.Cut()
+	return ..()
+
+/atom/movable/screen/healthdoll/human/update_icon_state()
+	. = ..()
+	var/mob/living/carbon/human/owner = hud?.mymob
+	if(isnull(owner))
+		return
+	if(owner.stat == DEAD)
+		for(var/limb in limbs)
+			limbs[limb].icon_state = "[limb]DEAD"
+		return
+
+	var/list/current_animated = LAZYLISTDUPLICATE(animated_zones)
+
+	for(var/obj/item/bodypart/body_part as anything in owner.bodyparts)
+		var/icon_key = 0
+		var/part_zone = body_part.body_zone
+
+		var/list/overridable_key = list(icon_key)
+		if(body_part.bodypart_disabled)
+			icon_key = 7
+		else if(owner.stat == DEAD)
+			icon_key = "DEAD"
+		else if(SEND_SIGNAL(body_part, COMSIG_BODYPART_UPDATING_HEALTH_HUD, owner, overridable_key) & OVERRIDE_BODYPART_HEALTH_HUD)
+			icon_key = overridable_key[1] // thanks i hate it
+		else if(!owner.has_status_effect(/datum/status_effect/grouped/screwy_hud/fake_healthy))
+			var/damage = body_part.get_damage() / body_part.max_damage
+			// calculate what icon state (1-5, or 0 if undamaged) to use based on damage
+			icon_key = clamp(ceil(damage * 5), 0, 5)
+
+		if(length(body_part.wounds))
+			LAZYSET(animated_zones, part_zone, TRUE)
+		else
+			LAZYREMOVE(animated_zones, part_zone)
+		limbs[part_zone].icon_state = "[part_zone][icon_key]"
+	// handle leftovers
+	for(var/missing_zone in owner.get_missing_limbs())
+		limbs[missing_zone].icon_state = "[missing_zone]6"
+		LAZYREMOVE(animated_zones, missing_zone)
+	// time to re-sync animations, something changed
+	if(animated_zones ~! current_animated)
+		for(var/animated_zone in animated_zones)
+			var/atom/wounded_zone = limbs[animated_zone]
+			var/existing_filter = wounded_zone.get_filter("wound_outline")
+			if(existing_filter)
+				animate(existing_filter) // stop animation so we can resync
+			else
+				wounded_zone.add_filter("wound_outline", 1, list("type" = "outline", "color" = "#FF0033", "alpha" = 0, "size" = 1.2))
+				existing_filter = wounded_zone.get_filter("wound_outline")
+			animate(existing_filter, alpha = 200, time = 1.5 SECONDS, loop = -1)
+			animate(alpha = 0, time = 1.5 SECONDS)
+		if(LAZYLEN(current_animated)) // avoid null - list() runtimes please
+			for(var/lost_zone in current_animated - animated_zones)
+				limbs[lost_zone].remove_filter("wound_outline")
+
+// Basically just holds an icon we can put a filter on
+/atom/movable/screen/healthdoll_limb
+	screen_loc = ui_living_healthdoll
+	vis_flags = VIS_INHERIT_ID | VIS_INHERIT_PLANE
+
 /atom/movable/screen/mood
 	name = "mood"
 	icon_state = "mood5"
@@ -846,7 +928,7 @@ INITIALIZE_IMMEDIATE(/atom/movable/screen/splash)
 			animate(get_filter("hunger_outline"), alpha = 200, time = 1.5 SECONDS, loop = -1)
 			animate(alpha = 0, time = 1.5 SECONDS)
 
-	else if(get_filter("hunger_outline"))
+	else
 		remove_filter("hunger_outline")
 
 	// Update color of the food

code/datums/components/butchering.dm

@@ -42,11 +42,13 @@
 	SIGNAL_HANDLER
 
 	if(!user.combat_mode)
-		return
+		return NONE
 	if(M.stat == DEAD && (M.butcher_results || M.guaranteed_butcher_results)) //can we butcher it?
 		if(butchering_enabled && (can_be_blunt || source.get_sharpness()))
-			INVOKE_ASYNC(src, PROC_REF(startButcher), source, M, user)
-			return COMPONENT_CANCEL_ATTACK_CHAIN
+			if(!DOING_INTERACTION(user, "[REF(M)]_butchering"))
+				INVOKE_ASYNC(src, PROC_REF(startButcher), source, M, user)
+				return COMPONENT_CANCEL_ATTACK_CHAIN
+			return NONE
 
 	if(ishuman(M) && source.force && source.get_sharpness())
 		var/mob/living/carbon/human/H = M
@@ -56,17 +58,34 @@
 				return COMPONENT_CANCEL_ATTACK_CHAIN
 
 			if(H.has_status_effect(/datum/status_effect/neck_slice))
-				return
+				return NONE
 
 			INVOKE_ASYNC(src, PROC_REF(startNeckSlice), source, H, user)
 			return COMPONENT_CANCEL_ATTACK_CHAIN
 
+	return NONE
+
 /datum/component/butchering/proc/startButcher(obj/item/source, mob/living/M, mob/living/user)
 	to_chat(user, span_notice("You begin to butcher [M]..."))
-	playsound(M.loc, butcher_sound, 50, TRUE, -1)
-	if(do_after(user, speed, M) && M.Adjacent(source))
+	playsound(M, butcher_sound, 50, TRUE, -1)
+	if(do_after(user, speed, M, extra_checks = CALLBACK(src, PROC_REF(butcher_effects), source, M, user), interaction_key = "[REF(M)]_butchering") && M.Adjacent(source))
 		on_butchering(user, M)
 
+/datum/component/butchering/proc/butcher_effects(obj/item/source, mob/living/butchering, mob/living/user)
+	if(user.next_move <= world.time)
+		user.face_atom(butchering)
+		// performs an attack against the mob
+		var/old_combat_mode = user.combat_mode
+		user.set_combat_mode(TRUE, TRUE)
+		source.melee_attack_chain(user, butchering)
+		user.set_combat_mode(old_combat_mode, TRUE)
+		// and play the sound
+		playsound(butchering, butcher_sound, 50, TRUE, -1)
+		// start our own click cd
+		user.changeNext_move(0.6 SECONDS)
+	// so the butchering doesn't stop
+	return TRUE
+
 /datum/component/butchering/proc/startNeckSlice(obj/item/source, mob/living/carbon/human/H, mob/living/user)
 	if(DOING_INTERACTION_WITH_TARGET(user, H))
 		to_chat(user, span_warning("You're already interacting with [H]!"))
@@ -221,6 +240,9 @@
 	if(victim.stat == DEAD && (victim.butcher_results || victim.guaranteed_butcher_results))
 		on_butchering(parent, victim)
 
+/datum/component/butchering/recycler/butcher_effects(obj/item/source, mob/living/butchering, mob/living/user)
+	return TRUE // p sure this won't work
+
 /datum/component/butchering/mecha
 
 /datum/component/butchering/mecha/RegisterWithParent()
@@ -242,6 +264,9 @@
 	SIGNAL_HANDLER
 	INVOKE_ASYNC(src, PROC_REF(on_butchering), chassis, target)
 
+/datum/component/butchering/mecha/butcher_effects(obj/item/source, mob/living/butchering, mob/living/user)
+	return TRUE // could give this one, unsure if it's needed though
+
 /datum/component/butchering/wearable
 
 /datum/component/butchering/wearable/RegisterWithParent()
@@ -276,3 +301,18 @@
 	if(!isliving(target))
 		return NONE
 	return onItemAttack(parent, target, user)
+
+/datum/component/butchering/wearable/butcher_effects(obj/item/source, mob/living/butchering, mob/living/user)
+	if(user.next_move <= world.time)
+		user.face_atom(butchering)
+		// performs an attack against the mob
+		var/old_combat_mode = user.combat_mode
+		user.set_combat_mode(TRUE, TRUE)
+		user.UnarmedAttack(butchering, TRUE)
+		user.set_combat_mode(old_combat_mode, TRUE)
+		// and play the sound
+		playsound(butchering, butcher_sound, 50, TRUE, -1)
+		// start our own click cd
+		user.changeNext_move(0.6 SECONDS)
+	// so the butchering doesn't stop
+	return TRUE

code/datums/datum.dm

@@ -404,10 +404,15 @@
 
 	var/list/names = islist(name_or_names) ? name_or_names : list(name_or_names)
 
+	. = FALSE
 	for(var/name in names)
 		if(filter_data[name])
 			filter_data -= name
-	update_filters()
+			. = TRUE
+
+	if(.)
+		update_filters()
+	return .
 
 /datum/proc/clear_filters()
 	ASSERT(isatom(src) || isimage(src))

code/datums/elements/ai_held_item.dm

@@ -52,9 +52,9 @@
 	SIGNAL_HANDLER
 
 	var/obj/item/carried_item = get_held_item(source)
-	if (!carried_item)
+	if (!carried_item || (carried_item.item_flags & (ABSTRACT|EXAMINE_SKIP|HAND_ITEM)))
 		return
-	examine_text += span_notice("[source.p_They()] [source.p_are()] carrying [carried_item.get_examine_string(user)].")
+	examine_text += span_notice("[source.p_They()] [source.p_are()] carrying [carried_item.examine_title(user)].")
 
 /// If we died, drop anything we were carrying
 /datum/element/ai_held_item/proc/on_death(mob/living/ol_yeller)

code/datums/elements/dextrous.dm

@@ -69,5 +69,5 @@
 	for(var/obj/item/held_item in examined.held_items)
 		if(held_item.item_flags & (ABSTRACT|EXAMINE_SKIP|HAND_ITEM))
 			continue
-		examine_list += span_info("[examined.p_They()] [examined.p_have()] [held_item.get_examine_string(user)] in [examined.p_their()] \
+		examine_list += span_info("[examined.p_They()] [examined.p_have()] [held_item.examine_title(user)] in [examined.p_their()] \
 			[examined.get_held_index_name(examined.get_held_index_of_item(held_item))].")

code/datums/greyscale/json_configs/_umbrella.json

@@ -0,0 +1,28 @@
+{
+	"umbrella_on": [
+		{
+			"type": "icon_state",
+			"icon_state": "umbrella_on_handle",
+			"blend_mode": "overlay"
+		},
+		{
+			"type": "icon_state",
+			"icon_state": "umbrella_on",
+			"blend_mode": "overlay",
+			"color_ids": [ 1 ]
+		}
+	],
+	"umbrella": [
+		{
+			"type": "icon_state",
+			"icon_state": "umbrella_handle",
+			"blend_mode": "overlay"
+		},
+		{
+			"type": "icon_state",
+			"icon_state": "umbrella",
+			"blend_mode": "overlay",
+			"color_ids": [ 1 ]
+		}
+	]
+}

code/datums/greyscale/json_configs/_umbrella_inhand.json

@@ -0,0 +1,31 @@
+{
+	"umbrella_closed": [
+		{
+			"type": "icon_state",
+			"icon_state": "umbrella_closed",
+			"blend_mode": "overlay",
+			"color_ids": [ 1 ]
+		}
+	],
+	"umbrella_on": [
+		{
+			"type": "icon_state",
+			"icon_state": "umbrella_handle",
+			"blend_mode": "overlay"
+		},
+		{
+			"type": "icon_state",
+			"icon_state": "umbrella_on",
+			"blend_mode": "overlay",
+			"color_ids": [ 1 ]
+		}
+	],
+	"umbrella_on_BACK": [
+		{
+			"type": "icon_state",
+			"icon_state": "umbrella_on_BACK",
+			"blend_mode": "overlay",
+			"color_ids": [ 1 ]
+		}
+	]
+}