some small things (#17693)

* some small things

* .

* clean this up

* potentially fix nulls in player list

* .

* Fixes

* Update machine_stacking.dm

---------

Co-authored-by: C.L. <killer65311@gmail.com>

code/modules/materials/sheets/organic/wood.dm

@@ -66,9 +66,9 @@
 		return ..()
 
 /obj/item/stack/material/stick
-	name = "wooden stick"
+	name = MAT_WOODEN_STICK
 	icon_state = "sheet-stick"
-	default_type = "wooden stick"
+	default_type = MAT_WOODEN_STICK
 	strict_color_stacking = TRUE
 	apply_colour = 1
 	drop_sound = 'sound/items/drop/wooden.ogg'

code/modules/mob/mob.dm

@@ -374,6 +374,9 @@
 /mob/verb/abandon_mob()
 	set name = "Return to Menu"
 	set category = "OOC.Game"
+	if(istype(src, /mob/new_player))
+		to_chat(src, span_boldnotice("You are already in the lobby!"))
+		return
 
 	if(stat != DEAD || !ticker)
 		to_chat(src, span_boldnotice("You must be dead to use this!"))
@@ -443,6 +446,7 @@
 	if(!client)
 		log_game("[key] AM failed due to disconnect.")
 		qdel(M)
+		M.key = null
 		return
 
 	M.has_respawned = TRUE //When we returned to main menu, send respawn message

code/modules/mob/new_player/lobby_browser.dm

@@ -129,9 +129,10 @@
 				observer.name = observer.real_name
 				if(!client.holder && !CONFIG_GET(flag/antag_hud_allowed))           // For new ghosts we remove the verb from even showing up if it's not allowed.
 					remove_verb(observer, /mob/observer/dead/verb/toggle_antagHUD)        // Poor guys, don't know what they are missing!
-				observer.key = key
+
+				mind.transfer_to(observer, TRUE)
+
 				observer.set_respawn_timer(time_till_respawn()) // Will keep their existing time if any, or return 0 and pass 0 into set_respawn_timer which will use the defaults
-				observer.client.init_verbs()
 				qdel(src)
 
 			return TRUE

code/modules/mob/new_player/login.dm

@@ -26,8 +26,7 @@
 
 	created_for = ckey
 
-	if(!QDELETED(src))
-		addtimer(CALLBACK(src, PROC_REF(do_after_login)), 4 SECONDS, TIMER_DELETE_ME)
+	addtimer(CALLBACK(src, PROC_REF(do_after_login)), 4 SECONDS, TIMER_DELETE_ME)
 
 /mob/new_player/proc/do_after_login()
 	PRIVATE_PROC(TRUE)

code/modules/surgery/organs_internal.dm

@@ -311,6 +311,7 @@
 		user.visible_message(span_filter_notice("[user] starts pulling \the [tool] from [target]'s [affected]."), \
 		span_filter_notice("You start pulling \the [tool] from [target]'s [affected]."))
 		user.balloon_alert_visible("starts pulling \the [tool] from [target]'s [affected]", "pulling \the [tool] from \the [affected]")
+		return
 
 	target.op_stage.current_organ = organ_to_remove
 

code/modules/vore/smoleworld/smoleworld_vr.dm

@@ -66,7 +66,7 @@
 	recipes += new/datum/stack_recipe("smole museum", /obj/structure/smolebuilding/museum, 2, time = 10)
 
 /datum/material/smolebricks
-	name = "smolebricks"
+	name = MAT_SMOLEBRICKS
 	stack_type = /obj/item/stack/material/smolebricks
 	icon_base = "solid"
 	icon_reinf = "reinf_over"
@@ -77,13 +77,13 @@
 //the actual materials
 
 /obj/item/stack/material/smolebricks
-	name = "smolebricks"
+	name = MAT_SMOLEBRICKS
 	desc = "A collection of tiny colored bricks ready to be built into whatever you want."
 	icon = 'icons/vore/smoleworld_vr.dmi'
 	icon_state = "smolematerial"
 	drop_sound = 'sound/items/drop/smolematerial.ogg'
 	pickup_sound = 'sound/items/pickup/pillbottle.ogg'
-	default_type = "smolebricks"
+	default_type = MAT_SMOLEBRICKS
 	w_class = ITEMSIZE_SMALL
 
 //smolebrick case to make for easy bricks.