Merge remote-tracking branch 'upstream/master' into strips-out-media

code/_onclick/click.dm

@@ -263,12 +263,13 @@
 
 /atom/proc/AltClick(var/mob/user)
 	var/turf/T = get_turf(src)
-	if(T && user.TurfAdjacent(T))
-		if(user.listed_turf == T)
-			user.listed_turf = null
-		else
+	if(T)
+		if(user.TurfAdjacent(T))
 			user.listed_turf = T
 			user.client.statpanel = T.name
+			// If we had a method to force a `Stat` update, it would go here
+		else
+			user.listed_turf = null
 	return
 
 /mob/proc/TurfAdjacent(var/turf/T)

code/datums/action.dm

@@ -145,6 +145,9 @@
 /datum/action/item_action/startchainsaw
 	name = "Pull The Starting Cord"
 
+/datum/action/item_action/print_report
+	name = "Print Forensic Report"
+
 /datum/action/item_action/toggle_gunlight
 	name = "Toggle Gunlight"
 
@@ -244,6 +247,15 @@
 	name = "Adjust [target.name]"
 	button.name = name
 
+/datum/action/item_action/pontificate
+	name = "Pontificate Evilly"
+
+/datum/action/item_action/tip_fedora
+	name = "Tip Fedora"
+
+/datum/action/item_action/flip_cap
+	name = "Flip Cap"
+
 /datum/action/item_action/switch_hud
 	name = "Switch HUD"
 

code/modules/clothing/head/misc.dm

@@ -177,21 +177,25 @@
 	desc = "There's a new sheriff in town. Pass the whiskey."
 
 /obj/item/clothing/head/fedora
-	name = "\improper fedora"
+	name = "fedora"
 	icon_state = "fedora"
 	item_state = "fedora"
 	desc = "A great hat ruined by being within fifty yards of you."
+	actions_types = list(/datum/action/item_action/tip_fedora)
 
-//TIPS FEDORA
-/obj/item/clothing/head/fedora/verb/tip_fedora()
-	set name = "Tip Fedora"
-	set category = "Object"
-	set desc = "Show that CIS SCUM who's boss."
+/obj/item/clothing/head/fedora/attack_self(mob/user)
+	tip_fedora(user)
+
+/obj/item/clothing/head/fedora/item_action_slot_check(slot)
+	if(slot == slot_head)
+		return 1
+
+/obj/item/clothing/head/fedora/proc/tip_fedora(mob/user)
+	user.visible_message("[user] tips their fedora.", "You tip your fedora")
 
-	usr.visible_message("[usr] tips their fedora.","You tip your fedora")
 
 /obj/item/clothing/head/fez
-	name = "\improper fez"
+	name = "fez"
 	icon_state = "fez"
 	item_state = "fez"
 	desc = "Put it on your monkey, make lots of cash money."

code/modules/clothing/head/soft_caps.dm

@@ -5,25 +5,29 @@
 	item_state = "helmet"
 	item_color = "cargo"
 	var/flipped = 0
+	actions_types = list(/datum/action/item_action/flip_cap)
 
-	dropped()
-		src.icon_state = "[item_color]soft"
-		src.flipped=0
-		..()
+/obj/item/clothing/head/soft/dropped()
+	icon_state = "[item_color]soft"
+	flipped = 0
+	..()
 
-	verb/flip()
-		set category = "Object"
-		set name = "Flip cap"
-		set src in usr
-		if(usr.canmove && !usr.stat && !usr.restrained())
-			src.flipped = !src.flipped
-			if(src.flipped)
-				icon_state = "[item_color]soft_flipped"
-				to_chat(usr, "You flip the hat backwards.")
-			else
-				icon_state = "[item_color]soft"
-				to_chat(usr, "You flip the hat back in normal position.")
-			usr.update_inv_head()	//so our mob-overlays update
+/obj/item/clothing/head/soft/attack_self(mob/user)
+	flip(user)
+
+/obj/item/clothing/head/soft/proc/flip(mob/user)
+	flipped = !flipped
+	if(flipped)
+		icon_state = "[item_color]soft_flipped"
+		to_chat(usr, "You flip the hat backwards.")
+	else
+		icon_state = "[item_color]soft"
+		to_chat(user, "You flip the hat back in normal position.")
+	user.update_inv_head()	//so our mob-overlays update
+
+	for(var/X in actions)
+		var/datum/action/A = X
+		A.UpdateButtonIcon()
 
 /obj/item/clothing/head/soft/red
 	name = "red cap"

code/modules/clothing/masks/miscellaneous.dm

@@ -82,6 +82,7 @@
 	desc = "moustache is totally real."
 	icon_state = "fake-moustache"
 	flags_inv = HIDEFACE
+	actions_types = list(/datum/action/item_action/pontificate)
 	species_fit = list("Vox", "Unathi", "Tajaran", "Vulpkanin")
 	sprite_sheets = list(
 		"Vox" = 'icons/mob/species/vox/mask.dmi',
@@ -90,12 +91,15 @@
 		"Vulpkanin" = 'icons/mob/species/vulpkanin/mask.dmi'
 		)
 
-/obj/item/clothing/mask/fakemoustache/verb/pontificate()
-	set name = "Pontificate Evilly"
-	set category = "Object"
-	set desc = "Devise evil plans of evilness."
+/obj/item/clothing/mask/fakemoustache/attack_self(mob/user)
+	pontificate(user)
 
-	usr.visible_message("<span class = 'danger'>\ [usr] twirls \his moustache and laughs [pick("fiendishly","maniacally","diabolically","evilly")]!</span>")
+/obj/item/clothing/mask/fakemoustache/item_action_slot_check(slot)
+	if(slot == slot_wear_mask)
+		return 1
+
+/obj/item/clothing/mask/fakemoustache/proc/pontificate(mob/user)
+	user.visible_message("<span class='danger'>\ [user] twirls \his moustache and laughs [pick("fiendishly","maniacally","diabolically","evilly")]!</span>")
 
 //scarves (fit in in mask slot)
 

code/modules/detective_work/scanner.dm

@@ -14,6 +14,7 @@
 	origin_tech = "magnets=4;biotech=2"
 	var/scanning = 0
 	var/list/log = list()
+	actions_types = list(/datum/action/item_action/print_report)
 
 /obj/item/device/detective_scanner/attack_self(var/mob/user)
 	var/search = input(user, "Enter name, fingerprint or blood DNA.", "Find record", "")
@@ -58,11 +59,10 @@
 
 	to_chat(user, "<span class='warning'>No match found in station records.</span>")
 
+/obj/item/device/detective_scanner/ui_action_click()
+	print_scanner_report()
 
-/obj/item/device/detective_scanner/verb/print_scanner_report()
-	set name = "Print Scanner Report"
-	set category = "Object"
-
+/obj/item/device/detective_scanner/proc/print_scanner_report()
 	if(log.len && !scanning)
 		scanning = 1
 		to_chat(usr, "<span class='notice'>Printing report, please wait...</span>")

code/modules/mob/dead/observer/observer.dm

@@ -16,7 +16,6 @@ var/list/image/ghost_darkness_images = list() //this is a list of images for thi
 	anchored = 1	//  don't get pushed around
 	invisibility = INVISIBILITY_OBSERVER
 	var/can_reenter_corpse
-	var/datum/hud/living/carbon/hud = null // hud
 	var/bootime = 0
 	var/started_as_observer //This variable is set to 1 when you enter the game as an observer.
 							//If you died in the game and are a ghsot - this will remain as null.

code/modules/mob/living/carbon/brain/brain.dm

@@ -4,7 +4,6 @@
 	var/obj/item/container = null
 	var/timeofhostdeath = 0
 	var/emp_damage = 0//Handles a type of MMI damage
-	var/alert = null
 	use_me = 0 //Can't use the me verb, it's a freaking immobile brain
 	icon = 'icons/obj/surgery.dmi'
 	icon_state = "brain1"

code/modules/mob/living/carbon/human/human_defines.dm

@@ -58,7 +58,6 @@ var/global/default_martial_art = new/datum/martial_art
 	var/datum/martial_art/martial_art = null
 
 	var/special_voice = "" // For changing our voice. Used by a symptom.
-	var/said_last_words=0
 
 	var/last_dam = -1	//Used for determining if we need to process all organs or just some or even none.
 	var/list/bad_external_organs = list()// organs we check until they are good.
@@ -73,12 +72,9 @@ var/global/default_martial_art = new/datum/martial_art
 	var/meatleft = 3 //For chef item
 	var/decaylevel = 0 // For rotting bodies
 	var/max_blood = BLOOD_VOLUME_NORMAL // For stuff in the vessel
-	var/slime_color = "blue" //For slime people this defines their color, it's blue by default to pay tribute to the old icons
 
 	var/check_mutations=0 // Check mutations on next life tick
 
-	var/lastFart = 0 // Toxic fart cooldown.
-
 	var/fire_dmi = 'icons/mob/OnFire.dmi'
 	var/fire_sprite = "Standing"
 

code/modules/mob/mob.dm

@@ -948,17 +948,7 @@ var/list/slot_equipment_priority = list( \
 /mob/Stat()
 	..()
 
-	if(listed_turf && client)
-		if(!TurfAdjacent(listed_turf))
-			listed_turf = null
-		else
-			statpanel(listed_turf.name, null, listed_turf)
-			for(var/atom/A in listed_turf)
-				if(A.invisibility > see_invisible)
-					continue
-				if(is_type_in_list(A, shouldnt_see))
-					continue
-				statpanel(listed_turf.name, null, A)
+	show_stat_turf_contents()
 
 	statpanel("Status") // We only want alt-clicked turfs to come before Status
 
@@ -995,6 +985,23 @@ var/list/slot_equipment_priority = list( \
 	if(ETA)
 		stat(null, "[ETA] [shuttle_master.emergency.getTimerStr()]")
 
+/mob/proc/show_stat_turf_contents()
+	if(listed_turf && client)
+		if(!TurfAdjacent(listed_turf))
+			listed_turf = null
+		else
+			statpanel(listed_turf.name, null, listed_turf)
+			var/list/statpanel_things = list()
+			for(var/foo in listed_turf)
+				var/atom/A = foo
+				if(A.invisibility > see_invisible)
+					continue
+				if(is_type_in_list(A, shouldnt_see))
+					continue
+				statpanel_things += A
+			statpanel(listed_turf.name, null, statpanel_things)
+
+
 /mob/proc/add_stings_to_statpanel(var/list/stings)
 	for(var/obj/effect/proc_holder/changeling/S in stings)
 		if(S.chemical_cost >=0 && S.can_be_used_by(src))

code/modules/mob/mob_defines.dm

@@ -94,7 +94,6 @@
 	var/intent = null//Living
 	var/shakecamera = 0
 	var/a_intent = I_HELP//Living
-	var/m_int = null//Living
 	var/m_intent = "run"//Living
 	var/lastKnownIP = null
 	var/atom/movable/buckled = null//Living

html/changelogs/AutoChangeLog-pr-5446.yml

@@ -0,0 +1,5 @@
+author: Crazylemon
+delete-after: True
+changes: 
+  - tweak: "Alt+Click should be quicker now"
+  - tweak: "The Alt+Click panel vanishes only when you alt click a turf distant from yourself"

html/changelogs/AutoChangeLog-pr-5454.yml

@@ -0,0 +1,4 @@
+author: Fox McCloud
+delete-after: True
+changes: 
+  - tweak: "Detective Scanner, Fedora Tipping, Pontificating, and Cap Flipping are now action buttons"