Updating from Neb dev.

code/_onclick/hud/hud_types/_hud.dm

@@ -25,7 +25,6 @@
 		hud_used = new hud_used(src)
 	if(istype(hud_used))
 		hud_used.refresh_hud_icons()
-	refresh_lighting_master()
 
 /datum/hud
 	/// A reference to our owning mob.

code/_onclick/hud/screen/screen_drop.dm

@@ -2,6 +2,8 @@
 	name       = "drop"
 	icon_state = "act_drop"
 	screen_loc = ui_drop_throw
+	use_supplied_ui_color = TRUE
+	use_supplied_ui_alpha = TRUE
 
 /obj/screen/drop/handle_click(mob/user, params)
 	if(user.client)

code/_onclick/hud/screen/screen_equip.dm

@@ -1,6 +1,8 @@
 /obj/screen/equip
 	name       = "equip"
 	icon_state = "act_equip"
+	use_supplied_ui_color = TRUE
+	use_supplied_ui_alpha = TRUE
 
 /obj/screen/equip/handle_click(mob/user, params)
 	if(ishuman(user))

code/_onclick/hud/screen/screen_gun.dm

@@ -2,6 +2,8 @@
 	icon = 'icons/mob/screen/styles/midnight/fire_intent.dmi'
 	dir = SOUTH
 	abstract_type = /obj/screen/gun
+	use_supplied_ui_color = TRUE
+	use_supplied_ui_alpha = TRUE
 	var/base_icon_state
 	var/toggle_flag
 

code/_onclick/hud/screen/screen_inventory.dm

@@ -59,11 +59,17 @@
 		MA.plane   = HUD_PLANE
 		MA.alpha   = 80
 		MA.color   = mouse_over_atom.mob_can_equip(owner, slot_id, TRUE) ? COLOR_GREEN : COLOR_RED
-		MA.pixel_x = mouse_over_atom.default_pixel_x
-		MA.pixel_y = mouse_over_atom.default_pixel_y
-		MA.pixel_w = mouse_over_atom.default_pixel_w
-		MA.pixel_z = mouse_over_atom.default_pixel_z
+		// We don't respect default_pixel_x or similar here because items should always be centered in their slots; defaults are for world-space.
+		MA.pixel_x = 0
+		MA.pixel_y = 0
+		MA.pixel_w = 0
+		MA.pixel_z = 0
 		MA.appearance_flags |= (KEEP_TOGETHER | RESET_COLOR)
+		// We need to color the entire thing, overlays and underlays included.
+		for(var/image/overlay in MA.overlays)
+			overlay.appearance_flags &= ~(KEEP_TOGETHER | RESET_COLOR)
+		for(var/image/underlay in MA.underlays)
+			underlay.appearance_flags &= ~(KEEP_TOGETHER | RESET_COLOR)
 		add_overlay(MA)
 	else
 		mouse_over_atom_ref = null

code/_onclick/hud/screen/screen_maneuver.dm

@@ -2,6 +2,8 @@
 	name = "Prepare Maneuver"
 	icon_state = "maneuver_off"
 	screen_loc = ui_pull_resist
+	use_supplied_ui_color = TRUE
+	use_supplied_ui_alpha = TRUE
 
 /obj/screen/maneuver/handle_click(mob/user, params)
 	if(isliving(user))

code/_onclick/hud/screen/screen_resist.dm

@@ -2,6 +2,8 @@
 	name       = "resist"
 	icon_state = "act_resist"
 	screen_loc = ui_pull_resist
+	use_supplied_ui_color = TRUE
+	use_supplied_ui_alpha = TRUE
 
 /obj/screen/resist/handle_click(mob/user, params)
 	if(isliving(user))

code/_onclick/hud/screen/screen_throw.dm

@@ -2,6 +2,8 @@
 	name = "throw"
 	icon_state = "act_throw_off"
 	screen_loc = ui_drop_throw
+	use_supplied_ui_color = TRUE
+	use_supplied_ui_alpha = TRUE
 
 /obj/screen/throw_toggle/handle_click(mob/user, params)
 	if(!user.stat && isturf(user.loc) && !user.restrained())

code/_onclick/hud/screen/screen_toggle.dm

@@ -2,6 +2,8 @@
 	name = "toggle"
 	icon_state = "other"
 	screen_loc = ui_inventory
+	use_supplied_ui_color = TRUE
+	use_supplied_ui_alpha = TRUE
 
 /obj/screen/toggle/handle_click(mob/user, params)
 	if(!user.hud_used)

code/_onclick/hud/screen/screen_zone_selector.dm

@@ -2,6 +2,8 @@
 	name = "damage zone"
 	icon_state = "zone_sel_tail"
 	screen_loc = ui_zonesel
+	use_supplied_ui_color = TRUE
+	use_supplied_ui_alpha = TRUE
 
 /obj/screen/zone_selector/handle_click(mob/user, params)
 	var/list/PL = params2list(params)

code/datums/daycycle/time_of_day.dm

@@ -24,7 +24,7 @@
 	name = "daytime"
 	announcement = "The sun rises over the horizon, beginning another day."
 	period = 0.4
-	power = 1
+	power = 0.8
 	color = COLOR_DAYLIGHT
 
 /datum/daycycle_period/sunset

code/datums/supplypacks/nonessent.dm

@@ -94,7 +94,7 @@
 					/obj/item/clothing/pants/slacks/purple,
 					/obj/item/clothing/shirt/button,
 					/obj/item/clothing/suit/jacket/vest/black,
-					/obj/item/clothing/jumpsuit/mailman,
+					/obj/item/clothing/costume/mailman,
 					/obj/item/clothing/dress/saloon,
 					/obj/item/clothing/suspenders,
 					/obj/item/clothing/suit/toggle/labcoat/mad,
@@ -103,7 +103,7 @@
 					/obj/item/clothing/costume/owl,
 					/obj/item/clothing/pants/slacks/black,
 					/obj/item/clothing/shirt/button,
-					/obj/item/clothing/neck/tie/bow/color/red,
+					/obj/item/clothing/neck/tie/bow/red,
 					/obj/item/clothing/suit/jacket/vest/blue,
 					/obj/item/clothing/costume/gladiator,
 					/obj/item/clothing/costume/soviet,
@@ -115,7 +115,7 @@
 					/obj/item/clothing/costume/kilt,
 					/obj/item/clothing/costume/savage_hunter,
 					/obj/item/clothing/costume/savage_hunter/female,
-					/obj/item/clothing/jumpsuit/wetsuit)
+					/obj/item/clothing/costume/wetsuit)
 	name = "Costume - Random"
 	containername = "actor costumes crate"
 	supply_method = /decl/supply_method/randomized

code/game/atoms.dm

@@ -411,6 +411,16 @@
 	if(event_listeners?[/decl/observ/updated_icon])
 		raise_event_non_global(/decl/observ/updated_icon)
 
+/**
+ * Update this atom's icon.
+ * If prior to SSicon_update's first flush, queues.
+ * Otherwise, updates instantly.
+ */
+/atom/proc/lazy_update_icon()
+	if(SSicon_update.init_state != SS_INITSTATE_NONE)
+		return update_icon()
+	queue_icon_update()
+
 /**
 	Update this atom's icon.
 

code/game/atoms_init.dm

@@ -89,10 +89,7 @@
 		updateVisibility(src)
 	if(atom_codex_ref && atom_codex_ref != TRUE) // may be null, TRUE or a datum instance
 		QDEL_NULL(atom_codex_ref)
-	var/atom/oldloc = loc
 	. = ..()
-	if(isatom(oldloc) && oldloc.storage && !QDELETED(loc.storage))
-		oldloc.storage.on_item_post_deletion(src) // must be done after deletion
 	// This might need to be moved onto a Del() override at some point.
 	QDEL_NULL(storage)
 
@@ -135,6 +132,7 @@
 
 	. = ..()
 
+	var/atom/oldloc = loc
 	forceMove(null)
 
 	if(LAZYLEN(movement_handlers) && !ispath(movement_handlers[1]))
@@ -151,6 +149,10 @@
 		if(!QDELETED(mask))
 			qdel(mask)
 
+	// This has to be done for movables because atoms can't be in storage.
+	if(isatom(oldloc) && !QDELETED(oldloc?.storage))
+		oldloc.storage.on_item_post_deletion(src) // must be done after deletion
+
 /atom/GetCloneArgs()
 	return list(loc)
 

code/game/atoms_movable.dm

@@ -61,20 +61,23 @@
 	SSspacedrift.processing[src] = src
 	return 1
 
-//return 0 to space drift, 1 to stop, -1 for mobs to handle space slips
+//return SPACE_MOVE_FORBIDDEN to space drift, SPACE_MOVE_PERMITTED to stop, SPACE_MOVE_SUPPORTED for mobs to handle space slips
 /atom/movable/proc/is_space_movement_permitted(allow_movement = FALSE)
 	if(!simulated)
 		return SPACE_MOVE_PERMITTED
 	if(has_gravity())
 		return SPACE_MOVE_PERMITTED
-	if(length(grabbed_by))
-		return SPACE_MOVE_PERMITTED
 	if(throwing)
 		return SPACE_MOVE_PERMITTED
 	if(anchored)
 		return SPACE_MOVE_PERMITTED
 	if(!isturf(loc))
 		return SPACE_MOVE_PERMITTED
+	if(length(grabbed_by))
+		for(var/obj/item/grab/grab as anything in grabbed_by)
+			if(grab.assailant == src)
+				continue
+			return SPACE_MOVE_PERMITTED
 	if(locate(/obj/structure/lattice) in range(1, get_turf(src))) //Not realistic but makes pushing things in space easier
 		return SPACE_MOVE_SUPPORTED
 	return SPACE_MOVE_FORBIDDEN

code/game/machinery/_machines_base/machine_construction/airlock.dm

@@ -3,6 +3,28 @@
 	down_state = /decl/machine_construction/default/panel_open/door
 	var/hacking_state = /decl/machine_construction/default/panel_closed/door/hacking
 
+/decl/machine_construction/default/panel_closed/door/fail_test_state_transfer(obj/machinery/machine, mob/user)
+	var/static/obj/item/screwdriver/screwdriver = new
+	// Prevent access locks on doors from interfering with our interactions.
+	for(var/obj/item/stock_parts/access_lock/lock in machine.get_all_components_of_type(/obj/item/stock_parts/access_lock))
+		lock.locked = FALSE
+	// Test hacking state
+	if(!machine.attackby(screwdriver, user))
+		return "Machine [log_info_line(machine)] did not respond to attackby with screwdriver."
+	if(machine.construct_state.type != hacking_state)
+		return "Machine [log_info_line(machine)] had a construct_state of type [machine.construct_state.type] after screwdriver interaction (expected [hacking_state])."
+	// Do it again to reverse that state change.
+	if(!machine.attackby(screwdriver, user))
+		return "Machine [log_info_line(machine)] did not respond to attackby with screwdriver on a second try."
+	if(machine.construct_state != src)
+		return "Machine [log_info_line(machine)] had a construct_state of type [machine.construct_state.type] after screwdriver interaction (expected [type])."
+	// Now test the down state
+	var/obj/item/wrench/wrench = new
+	if(!machine.attackby(wrench, user))
+		return "Machine [log_info_line(machine)] did not respond to attackby with wrench."
+	if(machine.construct_state.type != down_state)
+		return "Machine [log_info_line(machine)] had a construct_state of type [machine.construct_state.type] after screwdriver interaction (expected [down_state])."
+
 /decl/machine_construction/default/panel_closed/door/attackby(obj/item/used_item, mob/user, obj/machinery/machine)
 	if(IS_SCREWDRIVER(used_item))
 		TRANSFER_STATE(hacking_state)

code/game/machinery/_machines_base/machine_construction/default.dm

@@ -13,6 +13,19 @@
 	visible_components = FALSE
 	locked = TRUE
 
+/decl/machine_construction/default/panel_closed/fail_unit_test(obj/machinery/machine)
+	if((. = ..()))
+		return
+	var/static/mob/living/human/user = new
+	return fail_test_state_transfer(machine, user)
+
+/decl/machine_construction/default/panel_closed/proc/fail_test_state_transfer(obj/machinery/machine, mob/user)
+	var/static/obj/item/screwdriver/screwdriver = new
+	if(!machine.attackby(screwdriver, user))
+		return "Machine [log_info_line(machine)] did not respond to attackby with screwdriver."
+	if(machine.construct_state.type != down_state)
+		return "Machine [log_info_line(machine)] had a construct_state of type [machine.construct_state.type] after screwdriver interaction (expected [down_state])."
+
 /decl/machine_construction/default/panel_closed/state_is_valid(obj/machinery/machine)
 	return !machine.panel_open
 

code/game/machinery/_machines_base/stock_parts/_stock_parts.dm

@@ -86,7 +86,12 @@
 		if(ELECTROCUTE)
 			cause = "sparks"
 	visible_message(SPAN_WARNING("Something [cause] inside \the [machine]."), range = 2)
-	SetName("broken [name]")
+	update_name()
+
+/obj/item/stock_parts/update_name()
+	. = ..()
+	if(!is_functional())
+		SetName("broken [name]") // prepend 'broken' to the results
 
 /obj/item/stock_parts/proc/is_functional()
 	return (!can_take_damage()) || (current_health > 0)

code/game/machinery/atmoalter/canister.dm

@@ -1,20 +1,20 @@
 /obj/machinery/portable_atmospherics/canister
-	name = "canister"
-	icon = 'icons/obj/atmos.dmi'
-	icon_state = "yellow"
-	density = TRUE
-	max_health = 100
-	obj_flags = OBJ_FLAG_CONDUCTIBLE
-	w_class = ITEM_SIZE_GARGANTUAN
-	construct_state = /decl/machine_construction/pipe/welder
-	uncreated_component_parts = null
-	start_pressure             = 45 ATM
-	volume                     = 1000
-	interact_offline           = TRUE
-	matter = list(
+	name             = "canister"
+	icon             = 'icons/obj/atmos.dmi'
+	icon_state       = "yellow"
+	density          = TRUE
+	max_health       = 100
+	obj_flags        = OBJ_FLAG_CONDUCTIBLE
+	w_class          = ITEM_SIZE_GARGANTUAN
+	construct_state  = /decl/machine_construction/pipe/welder
+	stat_immune      = NOSCREEN | NOINPUT | NOPOWER
+	start_pressure   = 45 ATM
+	volume           = 1000
+	interact_offline = TRUE
+	matter           = list(
 		/decl/material/solid/metal/steel = 10 * SHEET_MATERIAL_AMOUNT
 	)
-
+	uncreated_component_parts  = null
 	var/valve_open             = FALSE
 	var/release_pressure       = ONE_ATMOSPHERE
 	var/release_flow_rate      = ATMOS_DEFAULT_VOLUME_PUMP //in L/s

code/game/machinery/biogenerator.dm

@@ -81,6 +81,9 @@
 
 /obj/machinery/biogenerator/attackby(var/obj/item/used_item, var/mob/user)
 
+	if(panel_open || IS_SCREWDRIVER(used_item))
+		return ..()
+
 	if(processing)
 		if((. = component_attackby(used_item, user)))
 			return

code/game/machinery/doors/airlock.dm

@@ -889,7 +889,7 @@ About the new airlock wires panel:
 		panel_open = TRUE
 		if(istype(construct_state, /decl/machine_construction/default/panel_closed))
 			var/decl/machine_construction/default/panel_closed/closed = construct_state
-			construct_state = closed.down_state
+			construct_state = GET_DECL(closed.down_state)
 			construct_state.validate_state(src)
 		if (secured_wires)
 			lock()
@@ -987,28 +987,30 @@ About the new airlock wires panel:
 
 	if (lock_cut_state == BOLTS_CUT) return FALSE //what bolts?
 
-	src.locked = TRUE
+	locked = TRUE
+	locking = FALSE
 	playsound(src, bolts_dropping, 30, 0, -6)
 	audible_message("You hear a click from the bottom of the door.", hearing_distance = 1)
 	update_icon()
 	toggle_input_toggle() // this sends an update to anything listening for our status, like docking/airlock controllers
 	return TRUE
 
 /obj/machinery/door/airlock/proc/unlock(var/forced=0)
-	if(!src.locked)
+	if(!locked)
 		return FALSE
 
 	if (!forced)
-		if(!src.arePowerSystemsOn() || isWireCut(AIRLOCK_WIRE_DOOR_BOLTS))
+		if(!arePowerSystemsOn() || isWireCut(AIRLOCK_WIRE_DOOR_BOLTS))
 			return FALSE
 		if(operating)
 			locking = FALSE
 			unlocking = TRUE
 			return FALSE
-		if(operating || !src.arePowerSystemsOn() || isWireCut(AIRLOCK_WIRE_DOOR_BOLTS))
+		if(!arePowerSystemsOn() || isWireCut(AIRLOCK_WIRE_DOOR_BOLTS))
 			return FALSE
 
-	src.locked = FALSE
+	locked = FALSE
+	unlocking = FALSE
 	playsound(src, bolts_rising, 30, 0, -6)
 	audible_message("You hear a click from the bottom of the door.", hearing_distance = 1)
 	update_icon()

code/game/machinery/doors/firedoor.dm

@@ -348,7 +348,7 @@
 		panel_open = FALSE
 		if(istype(construct_state, /decl/machine_construction/default/panel_open))
 			var/decl/machine_construction/default/panel_open/open = construct_state
-			construct_state = open.up_state
+			construct_state = GET_DECL(open.up_state)
 			construct_state.validate_state(src)
 		visible_message("The maintenance hatch of \the [src] closes.")
 		update_icon()