[MIRROR] some small things (#10877)

Co-authored-by: Kashargul <144968721+Kashargul@users.noreply.github.com>
Co-authored-by: C.L. <killer65311@gmail.com>

code/__defines/materials.dm

@@ -20,6 +20,7 @@
 #define MAT_SIFLOG			"alien log"
 #define MAT_HARDWOOD		"hardwood"
 #define MAT_HARDLOG			"hardwood log"
+#define MAT_WOODEN_STICK	"wooden stick"
 #define MAT_STEELHULL		"steel hull"
 #define MAT_PLASTEEL		"plasteel"
 #define MAT_PLASTEELHULL	"plasteel hull"
@@ -69,6 +70,7 @@
 #define MAT_FANCYBLACK		"fancyblack"
 #define MAT_FOAM			"foam"
 #define MAT_FLOKIUM			"flockium"
+#define MAT_SMOLEBRICKS		"smolebricks"
 
 // cloth materials
 #define MAT_WOOL			"wool"

code/datums/mind.dm

@@ -72,7 +72,7 @@
 	purchase_log = list()
 	..()
 
-/datum/mind/proc/transfer_to(mob/living/new_character)
+/datum/mind/proc/transfer_to(mob/living/new_character, force = FALSE)
 	if(!istype(new_character))
 		to_world_log("## DEBUG: transfer_to(): Some idiot has tried to transfer_to() a non mob/living mob. Please inform Carn")
 	if(current)					//remove ourself from our old body's mind variable
@@ -90,7 +90,7 @@
 	if(changeling)
 		new_character.make_changeling()
 
-	if(active)
+	if(active || force)
 		new_character.key = key		//now transfer the key to link the client to our new body
 
 	if(new_character.client)

code/game/objects/items/devices/translator.dm

@@ -73,7 +73,7 @@
 	if(!L.say_understands(null, langset))
 		new_message = langset.scramble(new_message)
 
-	to_chat(L, span_filter_say(span_italics(span_bold("[src]") + "translates, ") + " \"<span class='[langset.colour]'>[new_message]</span>\""))
+	to_chat(L, span_filter_say(span_italics(span_bold("[src]") + " translates, ") + " \"<span class='[langset.colour]'>[new_message]</span>\""))
 
 /obj/item/universal_translator/proc/user_understands(mob/M, mob/living/L, list/message_pieces)
 	for(var/datum/multilingual_say_piece/S in message_pieces)

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

@@ -67,9 +67,9 @@
 
 
 /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

@@ -373,6 +373,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!"))
@@ -442,6 +445,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,7 +26,6 @@
 
 	created_for = ckey
 
-	if(!QDELETED(src))
 	addtimer(CALLBACK(src, PROC_REF(do_after_login)), 4 SECONDS, TIMER_DELETE_ME)
 
 /mob/new_player/proc/do_after_login()

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.

modular_chomp/code/modules/exploration/tyr_tribal_gear.dm

@@ -45,10 +45,10 @@
 
 
 /obj/item/stack/material/weathered_agate
-	name = "weathered agate"
+	name = MAT_WAGATE
 	icon_state = "sheet-void_opal"
 	singular_name = "weathered agate"
-	default_type = "weathered agate"
+	default_type = MAT_WAGATE
 
 /obj/item/reagent_containers/food/snacks/weatherlily
 	name = "strange leaves"