merge from master

code/_onclick/ai.dm

@@ -90,8 +90,9 @@
 	The below is only really for safety, or you can alter the way
 	it functions and re-insert it above.
 */
-/mob/living/silicon/ai/UnarmedAttack(atom/A)
+/mob/living/silicon/ai/UnarmedAttack(atom/A, proximity, intent = a_intent, flags = NONE)
 	A.attack_ai(src)
+
 /mob/living/silicon/ai/RangedAttack(atom/A)
 	A.attack_ai(src)
 

code/_onclick/click.dm

@@ -237,9 +237,9 @@
 	proximity_flag is not currently passed to attack_hand, and is instead used
 	in human click code to allow glove touches only at melee range.
 */
-/mob/proc/UnarmedAttack(atom/A, proximity_flag)
-	DelayNextAction(ismob(A)? 8 : 0)
-	return
+/mob/proc/UnarmedAttack(atom/A, proximity, intent = a_intent, flags = NONE)
+	if(ismob(A))
+		changeNext_move(CLICK_CD_MELEE)
 
 /*
 	Ranged unarmed attack:

code/_onclick/cyborg.dm

@@ -171,8 +171,9 @@
 	clicks, you can do so here, but you will have to
 	change attack_robot() above to the proper function
 */
-/mob/living/silicon/robot/UnarmedAttack(atom/A)
+/mob/living/silicon/robot/UnarmedAttack(atom/A, proximity, intent = a_intent, flags = NONE)
 	A.attack_robot(src)
+
 /mob/living/silicon/robot/RangedAttack(atom/A)
 	A.attack_robot(src)
 

code/_onclick/hud/map_popups.dm

@@ -0,0 +1,165 @@
+/client
+	/**
+	 * Assoc list with all the active maps - when a screen obj is added to
+	 * a map, it's put in here as well.
+	 *
+	 * Format: list(<mapname> = list(/obj/screen))
+	 */
+	var/list/screen_maps = list()
+
+/**
+ * A screen object, which acts as a container for turfs and other things
+ * you want to show on the map, which you usually attach to "vis_contents".
+ */
+/obj/screen
+	/**
+	 * Map name assigned to this object.
+	 * Automatically set by /client/proc/add_obj_to_map.
+	 */
+	var/assigned_map
+	/**
+	 * Mark this object as garbage-collectible after you clean the map
+	 * it was registered on.
+	 *
+	 * This could probably be changed to be a proc, for conditional removal.
+	 * But for now, this works.
+	 */
+	var/del_on_map_removal = TRUE
+
+/**
+ * A generic background object.
+ * It is also implicitly used to allocate a rectangle on the map, which will
+ * be used for auto-scaling the map.
+ */
+/obj/screen/background
+	name = "background"
+	icon = 'icons/mob/map_backgrounds.dmi'
+	icon_state = "clear"
+	layer = GAME_PLANE
+	plane = GAME_PLANE
+
+/**
+ * Sets screen_loc of this screen object, in form of point coordinates,
+ * with optional pixel offset (px, py).
+ *
+ * If applicable, "assigned_map" has to be assigned before this proc call.
+ */
+/obj/screen/proc/set_position(x, y, px = 0, py = 0)
+	if(assigned_map)
+		screen_loc = "[assigned_map]:[x]:[px],[y]:[py]"
+	else
+		screen_loc = "[x]:[px],[y]:[py]"
+
+/**
+ * Sets screen_loc to fill a rectangular area of the map.
+ *
+ * If applicable, "assigned_map" has to be assigned before this proc call.
+ */
+/obj/screen/proc/fill_rect(x1, y1, x2, y2)
+	if(assigned_map)
+		screen_loc = "[assigned_map]:[x1],[y1] to [x2],[y2]"
+	else
+		screen_loc = "[x1],[y1] to [x2],[y2]"
+
+/**
+ * Registers screen obj with the client, which makes it visible on the
+ * assigned map, and becomes a part of the assigned map's lifecycle.
+ */
+/client/proc/register_map_obj(obj/screen/screen_obj)
+	if(!screen_obj.assigned_map)
+		CRASH("Can't register [screen_obj] without 'assigned_map' property.")
+	if(!screen_maps[screen_obj.assigned_map])
+		screen_maps[screen_obj.assigned_map] = list()
+	// NOTE: Possibly an expensive operation
+	var/list/screen_map = screen_maps[screen_obj.assigned_map]
+	if(!screen_map.Find(screen_obj))
+		screen_map += screen_obj
+	if(!screen.Find(screen_obj))
+		screen += screen_obj
+
+/**
+ * Clears the map of registered screen objects.
+ *
+ * Not really needed most of the time, as the client's screen list gets reset
+ * on relog. any of the buttons are going to get caught by garbage collection
+ * anyway. they're effectively qdel'd.
+ */
+/client/proc/clear_map(map_name)
+	if(!map_name || !(map_name in screen_maps))
+		return FALSE
+	for(var/obj/screen/screen_obj in screen_maps[map_name])
+		screen_maps[map_name] -= screen_obj
+		if(screen_obj.del_on_map_removal)
+			qdel(screen_obj)
+	screen_maps -= map_name
+
+/**
+ * Clears all the maps of registered screen objects.
+ */
+/client/proc/clear_all_maps()
+	for(var/map_name in screen_maps)
+		clear_map(map_name)
+
+/**
+ * Creates a popup window with a basic map element in it, without any
+ * further initialization.
+ *
+ * Ratio is how many pixels by how many pixels (keep it simple).
+ *
+ * Returns a map name.
+ */
+/client/proc/create_popup(name, ratiox = 100, ratioy = 100)
+	winclone(src, "popupwindow", name)
+	var/list/winparams = list()
+	winparams["size"] = "[ratiox]x[ratioy]"
+	winparams["on-close"] = "handle-popup-close [name]"
+	winset(src, "[name]", list2params(winparams))
+	winshow(src, "[name]", 1)
+
+	var/list/params = list()
+	params["parent"] = "[name]"
+	params["type"] = "map"
+	params["size"] = "[ratiox]x[ratioy]"
+	params["anchor1"] = "0,0"
+	params["anchor2"] = "[ratiox],[ratioy]"
+	winset(src, "[name]_map", list2params(params))
+
+	return "[name]_map"
+
+/**
+ * Create the popup, and get it ready for generic use by giving
+ * it a background.
+ *
+ * Width and height are multiplied by 64 by default.
+ */
+/client/proc/setup_popup(popup_name, width = 9, height = 9, \
+		tilesize = 2, bg_icon)
+	if(!popup_name)
+		return
+	clear_map("[popup_name]_map")
+	var/x_value = world.icon_size * tilesize * width
+	var/y_value = world.icon_size * tilesize * height
+	var/map_name = create_popup(popup_name, x_value, y_value)
+
+	var/obj/screen/background/background = new
+	background.assigned_map = map_name
+	background.fill_rect(1, 1, width, height)
+	if(bg_icon)
+		background.icon_state = bg_icon
+	register_map_obj(background)
+
+	return map_name
+
+/**
+ * Closes a popup.
+ */
+/client/proc/close_popup(popup)
+	winshow(src, popup, 0)
+	handle_popup_close(popup)
+
+/**
+ * When the popup closes in any way (player or proc call) it calls this.
+ */
+/client/verb/handle_popup_close(window_id as text)
+	set hidden = TRUE
+	clear_map("[window_id]_map")

code/_onclick/observer.dm

@@ -63,18 +63,9 @@
 // And here are some good things for free:
 // Now you can click through portals, wormholes, gateways, and teleporters while observing. -Sayu
 
-/obj/machinery/gateway/centerstation/attack_ghost(mob/user)
-	if(awaygate)
-		user.forceMove(awaygate.loc)
-	else
-		to_chat(user, "[src] has no destination.")
-	return ..()
-
-/obj/machinery/gateway/centeraway/attack_ghost(mob/user)
-	if(stationgate)
-		user.forceMove(stationgate.loc)
-	else
-		to_chat(user, "[src] has no destination.")
+/obj/effect/gateway_portal_bumper/attack_ghost(mob/user)
+	if(gateway)
+		gateway.Transfer(user)
 	return ..()
 
 /obj/machinery/teleport/hub/attack_ghost(mob/user)

code/_onclick/other_mobs.dm

@@ -4,7 +4,7 @@
 
 	Otherwise pretty standard.
 */
-/mob/living/carbon/human/UnarmedAttack(atom/A, proximity)
+/mob/living/carbon/human/UnarmedAttack(atom/A, proximity, intent = a_intent, flags = NONE)
 
 	if(!has_active_hand()) //can't attack without a hand.
 		to_chat(src, "<span class='notice'>You look at your arm and sigh.</span>")
@@ -20,21 +20,16 @@
 	var/override = 0
 
 	for(var/datum/mutation/human/HM in dna.mutations)
-		override += HM.on_attack_hand(A, proximity)
+		override += HM.on_attack_hand(A, proximity, intent, flags)
 
 	if(override)
 		return
 
 	SEND_SIGNAL(src, COMSIG_HUMAN_MELEE_UNARMED_ATTACK, A)
-	if(!CheckActionCooldown(A.clickdelay_attack_hand_preattack_cooldown))
-		if(A.clickdelay_attack_hand_is_action && A.clickdelay_attack_hand_set_preattack)
-			DelayNextAction()
-		A.attack_hand(src)
-		if(A.clickdelay_attack_hand_is_action && !A.clickdelay_attack_hand_set_preattack)
-			DelayNextAction()
+	A.attack_hand(src, intent, flags)
 
 //Return TRUE to cancel other attack hand effects that respect it.
-/atom/proc/attack_hand(mob/user)
+/atom/proc/attack_hand(mob/user, act_intent = user.a_intent, unarmed_attack_flags)
 	. = FALSE
 	if(!(interaction_flags_atom & INTERACT_ATOM_NO_FINGERPRINT_ATTACK_HAND))
 		add_fingerprint(user)
@@ -109,8 +104,8 @@
 /*
 	Animals & All Unspecified
 */
-/mob/living/UnarmedAttack(atom/A)
-	A.attack_animal(src)
+/mob/living/UnarmedAttack(atom/A, proximity, intent = a_intent, flags = NONE)
+	A.attack_animal(src, intent, flags)
 
 /atom/proc/attack_animal(mob/user)
 	SEND_SIGNAL(src, COMSIG_ATOM_ATTACK_ANIMAL, user)
@@ -121,8 +116,8 @@
 /*
 	Monkeys
 */
-/mob/living/carbon/monkey/UnarmedAttack(atom/A)
-	A.attack_paw(src)
+/mob/living/carbon/monkey/UnarmedAttack(atom/A, proximity, intent = a_intent, flags = NONE)
+	A.attack_paw(src, intent, flags)
 
 /atom/proc/attack_paw(mob/user)
 	if(SEND_SIGNAL(src, COMSIG_ATOM_ATTACK_PAW, user) & COMPONENT_NO_ATTACK_HAND)
@@ -167,8 +162,8 @@
 	Aliens
 	Defaults to same as monkey in most places
 */
-/mob/living/carbon/alien/UnarmedAttack(atom/A)
-	A.attack_alien(src)
+/mob/living/carbon/alien/UnarmedAttack(atom/A, proximity, intent = a_intent, flags = NONE)
+	A.attack_alien(src, intent, flags)
 
 /atom/proc/attack_alien(mob/living/carbon/alien/user)
 	attack_paw(user)
@@ -178,29 +173,29 @@
 	return
 
 // Babby aliens
-/mob/living/carbon/alien/larva/UnarmedAttack(atom/A)
-	A.attack_larva(src)
+/mob/living/carbon/alien/larva/UnarmedAttack(atom/A, proximity, intent = a_intent, flags = NONE)
+	A.attack_larva(src, intent, flags)
+
 /atom/proc/attack_larva(mob/user)
 	return
 
-
 /*
 	Slimes
 	Nothing happening here
 */
-/mob/living/simple_animal/slime/UnarmedAttack(atom/A)
-	A.attack_slime(src)
+/mob/living/simple_animal/slime/UnarmedAttack(atom/A, proximity, intent = a_intent, flags = NONE)
+	A.attack_slime(src, intent, flags)
+
 /atom/proc/attack_slime(mob/user)
 	return
 /mob/living/simple_animal/slime/RestrainedClickOn(atom/A)
 	return
 
-
 /*
 	Drones
 */
-/mob/living/simple_animal/drone/UnarmedAttack(atom/A)
-	A.attack_drone(src)
+/mob/living/simple_animal/drone/UnarmedAttack(atom/A, proximity, intent = a_intent, flags = NONE)
+	A.attack_drone(src, intent, flags)
 
 /atom/proc/attack_drone(mob/living/simple_animal/drone/user)
 	attack_hand(user) //defaults to attack_hand. Override it when you don't want drones to do same stuff as humans.
@@ -208,55 +203,44 @@
 /mob/living/simple_animal/slime/RestrainedClickOn(atom/A)
 	return
 
-
 /*
 	True Devil
 */
-
-/mob/living/carbon/true_devil/UnarmedAttack(atom/A, proximity)
+/mob/living/carbon/true_devil/UnarmedAttack(atom/A, proximity, intent = a_intent, flags = NONE)
 	A.attack_hand(src)
 
 /*
 	Brain
 */
-
-/mob/living/brain/UnarmedAttack(atom/A)//Stops runtimes due to attack_animal being the default
+/mob/living/brain/UnarmedAttack(atom/A, proximity, intent = a_intent, flags = NONE)
 	return
 
-
 /*
 	pAI
 */
-
-/mob/living/silicon/pai/UnarmedAttack(atom/A)//Stops runtimes due to attack_animal being the default
+/mob/living/silicon/pai/UnarmedAttack(atom/A, proximity, intent = a_intent, flags = NONE)
 	return
 
-
 /*
 	Simple animals
 */
-
-/mob/living/simple_animal/UnarmedAttack(atom/A, proximity)
+/mob/living/simple_animal/UnarmedAttack(atom/A, proximity, intent = a_intent, flags = NONE)
 	if(!dextrous)
 		return ..()
 	if(!ismob(A))
-		A.attack_hand(src)
+		A.attack_hand(src, intent, flags)
 		update_inv_hands()
 
-
 /*
 	Hostile animals
 */
-
-/mob/living/simple_animal/hostile/UnarmedAttack(atom/A)
+/mob/living/simple_animal/hostile/UnarmedAttack(atom/A, proximity, intent = a_intent, flags = NONE)
 	target = A
 	if(dextrous && !ismob(A))
 		..()
 	else
 		AttackingTarget()
 
-
-
 /*
 	New Players:
 	Have no reason to click on anything at all.