July 5th TG sync (#1883)

July 5th TG sync

code/_onclick/hud/action_button.dm

@@ -23,6 +23,7 @@
 //Hide/Show Action Buttons ... Button
 /obj/screen/movable/action_button/hide_toggle
 	name = "Hide Buttons"
+	desc = "Shift-click any button to reset its position. Alt-click to reset all buttons to their default positions."
 	icon = 'icons/mob/actions.dmi'
 	icon_state = "bg_default"
 	var/hidden = 0
@@ -33,8 +34,18 @@
 /obj/screen/movable/action_button/hide_toggle/Click(location,control,params)
 	var/list/modifiers = params2list(params)
 	if(modifiers["shift"])
-		moved = 0
-		return 1
+		moved = FALSE
+		usr.update_action_buttons(TRUE)
+		return TRUE
+	if(modifiers["alt"])
+		for(var/V in usr.actions)
+			var/datum/action/A = V
+			var/obj/screen/movable/action_button/B = A.button
+			B.moved = FALSE
+		moved = FALSE
+		usr.update_action_buttons(TRUE)
+		to_chat(usr, "<span class='notice'>Action button positions have been reset.</span>")
+		return TRUE
 	usr.hud_used.action_buttons_hidden = !usr.hud_used.action_buttons_hidden
 
 	hidden = usr.hud_used.action_buttons_hidden
@@ -45,6 +56,16 @@
 	UpdateIcon()
 	usr.update_action_buttons()
 
+/obj/screen/movable/action_button/hide_toggle/AltClick(mob/user)
+	for(var/V in user.actions)
+		var/datum/action/A = V
+		var/obj/screen/movable/action_button/B = A.button
+		B.moved = FALSE
+	if(moved)
+		moved = FALSE
+	user.update_action_buttons(TRUE)
+	to_chat(user, "<span class='notice'>Action button positions have been reset.</span>")
+
 
 /obj/screen/movable/action_button/hide_toggle/proc/InitialiseIcon(datum/hud/owner_hud)
 	var settings = owner_hud.get_action_buttons_icons()

code/_onclick/hud/alert.dm

@@ -205,11 +205,6 @@ If you're feeling frisky, click yourself in help intent to pull the object out."
 		var/mob/living/carbon/human/M = usr
 		return M.help_shake_act(M)
 
-/obj/screen/alert/asleep
-	name = "Asleep"
-	desc = "You've fallen asleep. Wait a bit and you should wake up. Unless you don't, considering how helpless you are."
-	icon_state = "asleep"
-
 /obj/screen/alert/weightless
 	name = "Weightless"
 	desc = "Gravity has ceased affecting you, and you're floating around aimlessly. You'll need something large and heavy, like a \
@@ -362,7 +357,6 @@ or shoot a gun to move around via Newton's 3rd Law of Motion."
 	desc = "You shouldn't be seeing this description unless you're very fast. If you're very fast, good job!"
 	icon_state = "no-servants-caches"
 
-
 /obj/screen/alert/clockwork/scripture_reqs/Initialize()
 	. = ..()
 	START_PROCESSING(SSprocessing, src)
@@ -410,10 +404,6 @@ or shoot a gun to move around via Newton's 3rd Law of Motion."
 				req_servants = APPLICATION_SERVANT_REQ
 				req_caches = APPLICATION_CACHE_REQ
 				req_cv = APPLICATION_CV_REQ
-			if(SCRIPTURE_REVENANT)
-				req_servants = REVENANT_SERVANT_REQ
-				req_caches = REVENANT_CACHE_REQ
-				req_cv = REVENANT_CV_REQ
 			if(SCRIPTURE_JUDGEMENT)
 				req_servants = JUDGEMENT_SERVANT_REQ
 				req_caches = JUDGEMENT_CACHE_REQ
@@ -473,10 +463,7 @@ or shoot a gun to move around via Newton's 3rd Law of Motion."
 			textlist = list("<b>[servants]</b> Servant, who [validservants ? "counts":"does not count"] towards scripture.<br>")
 		textlist += "<b>[GLOB.clockwork_caches ? "[GLOB.clockwork_caches]</b> Tinkerer's Caches.":"No Tinkerer's Caches, construct one!</b>"]<br>\
 		<b>[GLOB.clockwork_construction_value]</b> Construction Value.<br>"
-		if(GLOB.clockwork_daemons)
-			textlist += "<b>[GLOB.clockwork_daemons]</b> Tinkerer's Daemons: <b>[servants * 0.2 < GLOB.clockwork_daemons ? "DISABLED":"ACTIVE"]</b><br>"
-		else
-			textlist += "No Tinkerer's Daemons.<br>"
+		textlist += "<b>[Floor(servants * 0.2)]</b> Tinkerer's Daemons can be active at once. <b>[LAZYLEN(GLOB.active_daemons)]</b> are active.<br>"
 		for(var/obj/structure/destructible/clockwork/massive/celestial_gateway/G in GLOB.all_clockwork_objects)
 			var/area/gate_area = get_area(G)
 			textlist += "Ark Location: <b>[uppertext(gate_area.map_name)]</b><br>"
@@ -494,18 +481,6 @@ or shoot a gun to move around via Newton's 3rd Law of Motion."
 				textlist += "<b>[unconverted_ais_exist] unconverted AIs exist!</b><br>"
 			else
 				textlist += "<b>An unconverted AI exists!</b><br>"
-		if(SSticker.scripture_states[SCRIPTURE_REVENANT])
-			var/inathneq_available = GLOB.clockwork_generals_invoked["inath-neq"] <= world.time
-			var/sevtug_available = GLOB.clockwork_generals_invoked["sevtug"] <= world.time
-			var/nezbere_available = GLOB.clockwork_generals_invoked["nezbere"] <= world.time
-			var/nezcrentr_available = GLOB.clockwork_generals_invoked["nzcrentr"] <= world.time
-			if(inathneq_available || sevtug_available || nezbere_available || nezcrentr_available)
-				textlist += "Generals available:<b>[inathneq_available ? "<br><font color=#1E8CE1>INATH-NEQ</font>":""][sevtug_available ? "<br><font color=#AF0AAF>SEVTUG</font>":""]\
-				[nezbere_available ? "<br><font color=#5A6068>NEZBERE</font>":""][nezcrentr_available ? "<br><font color=#DAAA18>NZCRENTR</font>":""]</b><br>"
-			else
-				textlist += "Generals available: <b>NONE</b><br>"
-		else
-			textlist += "Generals available: <b>NONE</b><br>"
 		for(var/i in SSticker.scripture_states)
 			if(i != SCRIPTURE_DRIVER) //ignore the always-unlocked stuff
 				textlist += "[i] Scripture: <b>[SSticker.scripture_states[i] ? "UNLOCKED":"LOCKED"]</b><br>"
@@ -700,3 +675,4 @@ so as to remain in compliance with the most up-to-date laws."
 	severity = 0
 	master = null
 	screen_loc = ""
+

code/_onclick/hud/alien.dm

@@ -6,7 +6,7 @@
 	icon_state = "leap_off"
 
 /obj/screen/alien/leap/Click()
-	if(istype(usr, /mob/living/carbon/alien/humanoid/hunter))
+	if(isalienhunter(usr))
 		var/mob/living/carbon/alien/humanoid/hunter/AH = usr
 		AH.toggle_leap()
 
@@ -57,7 +57,7 @@
 	static_inventory += using
 	action_intent = using
 
-	if(istype(mymob, /mob/living/carbon/alien/humanoid/hunter))
+	if(isalienhunter(mymob))
 		var/mob/living/carbon/alien/humanoid/hunter/H = mymob
 		H.leap_icon = new /obj/screen/alien/leap()
 		H.leap_icon.screen_loc = ui_alien_storage_r
@@ -96,7 +96,7 @@
 	alien_plasma_display = new /obj/screen/alien/plasma_display()
 	infodisplay += alien_plasma_display
 
-	if(!istype(mymob, /mob/living/carbon/alien/humanoid/royal/queen))
+	if(!isalienqueen(mymob))
 		alien_queen_finder = new /obj/screen/alien/alien_queen_finder
 		infodisplay += alien_queen_finder
 

code/_onclick/hud/constructs.dm

@@ -1,18 +1,18 @@
 
-/datum/hud/construct
+/datum/hud/constructs
 	ui_style_icon = 'icons/mob/screen_construct.dmi'
-	
-/datum/hud/construct/New(mob/owner)
+
+/datum/hud/constructs/New(mob/owner)
 	..()
 	pull_icon = new /obj/screen/pull()
-	pull_icon.icon = ui_style_icon
+	pull_icon.icon = 'icons/mob/screen_construct.dmi'
 	pull_icon.update_icon(mymob)
-	pull_icon.screen_loc = ui_pull_resist
+	pull_icon.screen_loc = ui_construct_pull
 	static_inventory += pull_icon
-	
+
 	healths = new /obj/screen/healths/construct()
 	infodisplay += healths
-	
+
 /mob/living/simple_animal/hostile/construct/create_mob_hud()
 	if(client && !hud_used)
-		hud_used = new /datum/hud/construct(src)
+		hud_used = new /datum/hud/constructs(src)

code/_onclick/hud/screen_objects.dm

@@ -348,7 +348,7 @@
 /obj/screen/storage/Click(location, control, params)
 	if(world.time <= usr.next_move)
 		return 1
-	if(usr.stat || usr.paralysis || usr.stunned || usr.weakened)
+	if(usr.stat || usr.IsUnconscious() || usr.IsKnockdown() || usr.IsStun())
 		return 1
 	if (istype(usr.loc,/obj/mecha)) // stops inventory actions in a mech
 		return 1