fix(assorted): fixes table's debris element and fixes lag caused by e…

…xamine cursor
ChaoticOnyx · Jun 13, 2024 · fce79a1 · fce79a1
1 parent d933063
commit fce79a1
Show file tree

Hide file tree

Showing 4 changed files with 19 additions and 12 deletions.
diff --git a/code/modules/mob/mob.dm b/code/modules/mob/mob.dm
@@ -1215,8 +1215,5 @@
 
 	client.mouse_pointer_icon = initial(client.mouse_pointer_icon)
 
-	if(examine_cursor_icon && client.keys_held["Shift"])
-		client.mouse_pointer_icon = examine_cursor_icon
-
 /mob/keybind_face_direction(direction)
 	facedir(direction)
diff --git a/code/modules/mob/mob_defines.dm b/code/modules/mob/mob_defines.dm
@@ -244,9 +244,6 @@
 	///For storing what do_after's someone has, key = string, value = amount of interactions of that type happening.
 	var/list/do_afters
 
-	/// Cursor icon used when holding shift over things.
-	var/examine_cursor_icon = 'icons/hud/mouse_pointers/examine_pointer.dmi'
-
 /datum/rad_resist/mob
 	alpha_particle_resist = 6 MEGA ELECTRONVOLT
 	beta_particle_resist = 0.1 MEGA ELECTRONVOLT

diff --git a/code/modules/tables/tables.dm b/code/modules/tables/tables.dm
@@ -51,7 +51,7 @@
 	add_debris_element()
 
 /obj/structure/table/add_debris_element()
-	if(material.name == MATERIAL_WOOD || material.name == MATERIAL_DARKWOOD)
+	if(material?.name == MATERIAL_WOOD || material?.name == MATERIAL_DARKWOOD)
 		AddElement(/datum/element/debris, DEBRIS_WOOD, -10, 5)
 	else
 		AddElement(/datum/element/debris, DEBRIS_SPARKS, -10, 5)

diff --git a/interface/skin.dmf b/interface/skin.dmf
@@ -1,9 +1,22 @@
 macro "default"
-	elem ".winset :map.right-click=false"
-		name = "SHIFT+Shift"
-	elem "Shift"
-		name = ""
-
+	elem
+		name = "CTRL"
+		command = ".winset :map.right-click=true"
+	elem
+		name = "CTRL+UP"
+		command = ".winset :map.right-click=false"
+	elem
+		name = "SHIFT"
+		command = ".winset :map.right-click=true"
+	elem
+		name = "SHIFT+UP"
+		command = ".winset :map.right-click=false\n.release_shift"
+	elem
+		name = "ALT"
+		command = ".winset :map.right-click=true"
+	elem
+		name = "ALT+UP"
+		command = ".winset :map.right-click=false"
 
 menu "menu"
 	elem