Replaces some progress bars with item bars, makes some bars be visible to the recipients

beestation.dme

@@ -85,6 +85,7 @@
 #include "code\__DEFINES\html_assistant.dm"
 #include "code\__DEFINES\hud.dm"
 #include "code\__DEFINES\icon_smoothing.dm"
+#include "code\__DEFINES\icons.dm"
 #include "code\__DEFINES\important_recursive_contents.dm"
 #include "code\__DEFINES\instruments.dm"
 #include "code\__DEFINES\interaction_flags.dm"

code/__DEFINES/icons.dm

@@ -0,0 +1,7 @@
+/**
+ * Stores a list of items that had their leftmost and rightmost pixels found before, for the sake of optimization
+ *
+ * Format :
+ * * cached_image_borders[type] = list("left" = x, "right" = y, "bottom" = z, "top" = w)
+ */
+GLOBAL_LIST_EMPTY(cached_image_borders)

code/__HELPERS/icons.dm

@@ -1459,3 +1459,85 @@ GLOBAL_LIST_EMPTY(friendly_animal_types)
 	animate(src, pixel_x = pixel_x + shiftx, pixel_y = pixel_y + shifty, time = 0.2, loop = duration)
 	pixel_x = initialpixelx
 	pixel_y = initialpixely
+
+/**
+ * Returns a list that contains the leftmost, rightmost, bottom and top pixels in an atom's icon
+ */
+/atom/proc/get_bounding_box()
+	var/list/return_list = list()
+	for(var/found_type in GLOB.cached_image_borders)
+		if(found_type == type)
+			return_list["left"] = GLOB.cached_image_borders[found_type]["left"]
+			return_list["right"] = GLOB.cached_image_borders[found_type]["right"]
+			return_list["top"] = GLOB.cached_image_borders[found_type]["top"]
+			return_list["bottom"] = GLOB.cached_image_borders[found_type]["bottom"]
+			return return_list
+
+	var/icon/tempicon = icon(icon, icon_state, dir, 1)
+	tempicon = getFlatIcon(src)
+	var/x_coord = 1
+	var/y_coord = 1
+	var/height = tempicon.Height()
+	var/width = tempicon.Width()
+	var/left_border = width
+	var/right_border = 1
+
+	tempicon.Scale(width, 1) //Flatten the icon into a 1 pixel high line
+	height = tempicon.Height()
+	while(y_coord <= height)
+		x_coord = 1
+		while(x_coord <= width)
+			var/pixel = tempicon.GetPixel(x_coord, y_coord)
+			if(!isnull(pixel))
+				if(left_border > x_coord)
+					left_border = x_coord
+					x_coord++
+					break
+			x_coord++
+		x_coord = width
+		while(x_coord > 0)
+			var/pixel = tempicon.GetPixel(x_coord, y_coord)
+			if(!isnull(pixel))
+				if(right_border < x_coord)
+					right_border = x_coord
+					x_coord--
+					break
+			x_coord--
+		y_coord++
+	return_list["left"] = left_border
+	return_list["right"] = right_border
+
+	tempicon = icon(icon, icon_state, dir, 1)
+	height = tempicon.Height()
+	width = tempicon.Width()
+	var/bottom_border = height
+	var/top_border = 1
+	x_coord = 1
+	y_coord = 1
+	tempicon.Scale(1, height) //Squash the icon into a 1 pixel wide pillar
+	width = tempicon.Width()
+
+	while(x_coord <= width)
+		y_coord = 1
+		while(y_coord <= height)
+			var/pixel = tempicon.GetPixel(x_coord, y_coord)
+			if(!isnull(pixel))
+				if(bottom_border > y_coord)
+					bottom_border = y_coord
+					y_coord++
+					break
+			y_coord++
+		y_coord = height
+		while(y_coord > 0)
+			var/pixel = tempicon.GetPixel(x_coord, y_coord)
+			if(!isnull(pixel))
+				if(top_border < y_coord)
+					top_border = y_coord
+					y_coord--
+					break
+			y_coord--
+		x_coord++
+	return_list["top"] = top_border
+	return_list["bottom"] = bottom_border
+	GLOB.cached_image_borders[type] = return_list
+	return return_list

code/__HELPERS/mobs.dm

@@ -5,6 +5,13 @@
 #define FACING_EACHOTHER 2
 /// Two mobs one is facing a person, but the other is perpendicular
 #define FACING_INIT_FACING_TARGET_TARGET_FACING_PERPENDICULAR 3 //! Do I win the most informative but also most stupid define award?
+/// Used for the image that replaces the progressbar in do_after
+#define BOUNDING_BOX_WIDTH 30
+#define BOUNDING_BOX_HEIGHT 25
+
+/// Gets the client of the mob, allowing for mocking of the client.
+/// You only need to use this if you know you're going to be mocking clients somewhere else.
+#define GET_CLIENT(mob) (##mob.client || ##mob.mock_client)
 
 /proc/random_blood_type()
 	return pick(4;"O-", 36;"O+", 3;"A-", 28;"A+", 1;"B-", 20;"B+", 1;"AB-", 5;"AB+")
@@ -229,23 +236,29 @@ GLOBAL_LIST_EMPTY(species_list)
  *
  * Checks that `user` does not move, change hands, get stunned, etc. for the
  * given `delay`. Returns `TRUE` on success or `FALSE` on failure.
- * 
+ *
  * Arguments:
  * * user - the primary "user" of the do_after.
  * * delay - how long the do_after takes. Defaults to 3 SECONDS.
  * * target - the (optional) target mob of the do_after. If they move/cease to exist, the do_after is cancelled.
  * * timed_action_flags - optional flags to override certain do_after checks (see DEFINES/timed_action.dm).
  * * progress - if TRUE, a progress bar is displayed.
+ * * show_to_target - if TRUE, shows the bar and item to the target
  * * extra_checks - a callback that can be used to add extra checks to the do_after. Returning false in this callback will cancel the do_after.
+ * * add_item - shows said item being 'filled up' instead of the progress bar
+ * * x_offset - moves left/right increase/decrease for the item rendered above the bar
+ * * y_offset - moves up/down the item rendered above the bar
  */
-/proc/do_after(mob/user, delay = 3 SECONDS, atom/target, timed_action_flags = NONE, progress = TRUE, datum/callback/extra_checks)
+/proc/do_after(mob/user, delay = 3 SECONDS, atom/target, timed_action_flags = NONE, progress = TRUE, show_to_target = FALSE, \
+datum/callback/extra_checks, atom/add_item, x_offset = 0, y_offset = 0)
 	if(!user)
 		return FALSE
 
 	if(target)
+		if(target in user.do_afters) // No stacking multiple do_afters on one target by a single person
+			return FALSE
 		LAZYADD(user.do_afters, target)
 		LAZYADD(target.targeted_by, user)
-
 	var/atom/user_loc = user.loc
 	var/atom/target_loc = target?.loc
 
@@ -257,13 +270,51 @@ GLOBAL_LIST_EMPTY(species_list)
 
 	delay *= user.cached_multiplicative_actions_slowdown
 
+	var/left_border = 1
+	var/right_border = 32
+	var/bottom_border = 1
+	var/top_border = 32
+	var/scale = 1
+	if(add_item)
+		var/list/temp_list = add_item.get_bounding_box()
+		left_border = temp_list["left"]
+		right_border = temp_list["right"]
+		bottom_border = temp_list["bottom"]
+		top_border = temp_list["top"]
+		var/leftright_diff = 0
+		var/topbottom_diff = 0
+		if((right_border - left_border + 1) > BOUNDING_BOX_WIDTH)
+			leftright_diff = right_border - left_border + 1
+		if((top_border - bottom_border + 1) > BOUNDING_BOX_HEIGHT)
+			topbottom_diff = top_border - bottom_border + 1
+		if(leftright_diff != 0 || topbottom_diff != 0)
+			if(topbottom_diff > leftright_diff)
+				scale = BOUNDING_BOX_HEIGHT / top_border
+			else
+				scale = BOUNDING_BOX_WIDTH / right_border
+	if(y_offset + bottom_border < 7)
+		y_offset = 7 - bottom_border
+	var/client/targeted_client
+	if(show_to_target)
+		if(target == user)
+			show_to_target = FALSE
+		else if(ismob(target))
+			var/mob/temp_mob = target
+			targeted_client = temp_mob.client
+			if(isnull(targeted_client))
+				show_to_target = FALSE
+		else
+			show_to_target = FALSE
 	var/datum/progressbar/progbar
 	if(progress)
-		if(target) // the progress bar needs a target, so if we don't have one just pass it the user.
-			progbar = new(user, delay, target)
+		if(add_item)
+			//var/mutable_appearance/itemappearance = add_item.appearance
+			//itemappearance.color = add_item.color
+			//itemappearance.overlays = add_item.overlays
+			//itemappearance.underlays = add_item.underlays
+			progbar = new(user, delay, target || user, show_to_target, add_item.appearance, left_border, right_border, x_offset, y_offset, scale, targeted_client)
 		else
-			progbar = new(user, delay, user)
-
+			progbar = new(user, delay, target || user, show_to_target, targeted_client = targeted_client)
 	var/endtime = world.time + delay
 	var/starttime = world.time
 	. = TRUE
@@ -307,6 +358,7 @@ GLOBAL_LIST_EMPTY(species_list)
 			break
 
 	if(progress)
+		//progbar.end_progress()
 		qdel(progbar)
 
 	if(!QDELETED(target))
@@ -487,10 +539,6 @@ GLOBAL_LIST_EMPTY(species_list)
 		if(player.stat != DEAD && player.mind && is_station_level(player.z))
 			. |= player.mind
 
-/// Gets the client of the mob, allowing for mocking of the client.
-/// You only need to use this if you know you're going to be mocking clients somewhere else.
-#define GET_CLIENT(mob) (##mob.client || ##mob.mock_client)
-
 ///Return a string for the specified body zone. Should be used for parsing non-instantiated bodyparts, otherwise use [/obj/item/bodypart/var/plaintext_zone]
 /proc/parse_zone(zone)
 	if(zone == BODY_ZONE_PRECISE_R_HAND)
@@ -743,3 +791,5 @@ GLOBAL_DATUM_INIT(dview_mob, /mob/dview, new)
 #undef FACING_SAME_DIR
 #undef FACING_EACHOTHER
 #undef FACING_INIT_FACING_TARGET_TARGET_FACING_PERPENDICULAR
+#undef BOUNDING_BOX_WIDTH
+#undef BOUNDING_BOX_HEIGHT

code/datums/components/crafting/crafting.dm

@@ -178,15 +178,25 @@
 	if(check_contents(a, R, contents))
 		if(check_tools(a, R, contents))
 			//If we're a mob we'll try a do_after; non mobs will instead instantly construct the item
-			if(ismob(a) && !do_after(a, R.time, target = a))
+			var/atom/fake_atom = new(null)
+			var/atom/fake_result = R.result
+			fake_atom.icon = initial(fake_result.icon)
+			fake_atom.icon_state = initial(fake_result.icon_state_preview) || initial(fake_result.icon_state)
+			if(ismob(a) && !do_after(a, R.time, target = a, add_item = fake_atom, x_offset = R.bar_x_offset, y_offset = R.bar_y_offset))
+				qdel(fake_atom)
+				qdel(fake_result)
 				return "."
+			qdel(fake_atom)
+			qdel(fake_result)
 			contents = get_surroundings(a,R.blacklist)
 			if(!check_contents(a, R, contents))
 				return ", missing component."
 			if(!check_tools(a, R, contents))
 				return ", missing tool."
 			var/list/parts = del_reqs(R, a)
 			var/atom/movable/I = new R.result (get_turf(a.loc))
+			I.loc = get_turf(a.loc)
+
 			I.CheckParts(parts, R)
 			if(send_feedback)
 				SSblackbox.record_feedback("tally", "object_crafted", 1, I.type)

code/datums/components/crafting/recipes.dm

@@ -13,6 +13,8 @@
 	var/always_available = TRUE //Set to FALSE if it needs to be learned first.
 	var/one_per_turf = FALSE ///Should only one object exist on the same turf?
 	var/dangerous_craft = FALSE /// Should admins be notified about this getting created by a non-antagonist?
+	var/bar_x_offset = 0
+	var/bar_y_offset = 0
 
 /datum/crafting_recipe/New()
 	if(!(result in reqs))
@@ -221,6 +223,8 @@
 				/obj/item/bodypart/r_arm/robot = 1)
 	time = 40
 	category = CAT_ROBOT
+	bar_x_offset = -5
+	bar_y_offset = 5
 
 /datum/crafting_recipe/honkbot
 	name = "Honkbot"
@@ -819,6 +823,7 @@
 	reqs = list(/obj/item/grown/log = 5)
 	result = /obj/structure/bonfire
 	category = CAT_PRIMAL
+	bar_x_offset = 5
 
 /datum/crafting_recipe/skeleton_key
 	name = "Skeleton Key"

code/datums/elements/mechanical_repair.dm

@@ -22,6 +22,7 @@
 	if((!affecting || (IS_ORGANIC_LIMB(affecting))) || user.a_intent == INTENT_HARM)
 		return
 
+	//can only do one progress bar at a time
 	if(target in user.do_afters)
 		return COMPONENT_NO_AFTERATTACK
 
@@ -31,7 +32,7 @@
 			if(user == target)
 				user.visible_message("<span class='notice'>[user] starts to fix some of the dents on [target == user ? "[p_their()]" : "[target]'s"] [parse_zone(affecting.body_zone)].</span>",
 				"<span class='notice'>You start fixing some of the dents on [target == user ? "your" : "[target]'s"] [parse_zone(affecting.body_zone)].</span>")
-				if(!do_after(user, 1.5 SECONDS, target))
+				if(!do_after(user, 1.5 SECONDS, target, show_to_target = TRUE, add_item = I))
 					return COMPONENT_NO_AFTERATTACK
 			item_heal_robotic(target, user, 15, 0, affecting)
 		user.changeNext_move(CLICK_CD_MELEE * 0.5) //antispam
@@ -43,7 +44,7 @@
 		if(user == target)
 			user.visible_message("<span class='notice'>[user] starts to fix some of the burn wires in [target == user ? "[p_their()]" : "[target]'s"] [parse_zone(affecting.body_zone)].</span>",
 			"<span class='notice'>You start fixing some of the burnt wires in [target == user ? "your" : "[target]'s"] [parse_zone(affecting.body_zone)].</span>")
-			if(!do_after(user, 1.5 SECONDS, target))
+			if(!do_after(user, 1.5 SECONDS, target, show_to_target = TRUE, add_item = coil))
 				return COMPONENT_NO_AFTERATTACK
 		if(coil.amount && item_heal_robotic(target, user, 0, 15, affecting))
 			coil.use(1)

code/datums/elements/strippable.dm

@@ -165,7 +165,9 @@
 
 	if(HAS_TRAIT(item, TRAIT_NO_STRIP))
 		return FALSE
-
+	if(source in user.do_afters)
+		to_chat(user, "<span class='warning'>You're already stripping [source]!</span>")
+		return FALSE
 	source.visible_message(
 		"<span class='warning'>[user] tries to remove [source]'s [item.name].</span>",
 		"<span class='userdanger'>[user] tries to remove your [item.name].</span>",
@@ -245,7 +247,7 @@
 	if(!ismob(source))
 		return FALSE
 
-	if(!do_after(user, get_equip_delay(equipping), source))
+	if(!do_after(user, get_equip_delay(equipping), source, show_to_target = TRUE, add_item = equipping))
 		return FALSE
 
 	if(!equipping.mob_can_equip(
@@ -310,7 +312,7 @@
 
 /// A utility function for `/datum/strippable_item`s to start unequipping an item from a mob.
 /proc/start_unequip_mob(obj/item/item, mob/source, mob/user, strip_delay)
-	if(!do_after(user, strip_delay || item.strip_delay, source))
+	if(!do_after(user, strip_delay || item.strip_delay, source, show_to_target = TRUE, add_item = item))
 		return FALSE
 
 	return TRUE