Merge branch 'master' of https://github.com/Baystation12/Baystation12 into dev

code/modules/client/preferences.dm

@@ -1031,11 +1031,13 @@ datum/preferences
 			if("input")
 				switch(href_list["preference"])
 					if("name")
-						var/new_name = reject_bad_name( input(user, "Choose your character's name:", "Character Preference")  as text|null )
-						if(new_name)
-							real_name = new_name
-						else
-							user << "<font color='red'>Invalid name. Your name should be at least 2 and at most [MAX_NAME_LEN] characters long. It may only contain the characters A-Z, a-z, -, ' and .</font>"
+						var/raw_name = input(user, "Choose your character's name:", "Character Preference")  as text|null
+						if (!isnull(raw_name)) // Check to ensure that the user entered text (rather than cancel.)
+							var/new_name = reject_bad_name(raw_name)
+							if(new_name)
+								real_name = new_name
+							else
+								user << "<font color='red'>Invalid name. Your name should be at least 2 and at most [MAX_NAME_LEN] characters long. It may only contain the characters A-Z, a-z, -, ' and .</font>"
 
 					if("age")
 						var/new_age = input(user, "Choose your character's age:\n([AGE_MIN]-[AGE_MAX])", "Character Preference") as num|null

code/modules/organs/organ_internal.dm

@@ -159,9 +159,9 @@
 					src.damage += 0.2 * process_accuracy
 				//Damaged one shares the fun
 				else
-					var/victim = pick(owner.internal_organs)
-					var/datum/organ/internal/O = owner.internal_organs[victim]
-					O.damage += 0.2  * process_accuracy
+					var/datum/organ/internal/O = pick(owner.internal_organs)
+					if(O)
+						O.damage += 0.2  * process_accuracy
 
 			//Detox can heal small amounts of damage
 			if (src.damage && src.damage < src.min_bruised_damage && owner.reagents.has_reagent("anti_toxin"))

code/modules/reagents/reagent_containers/food/drinks.dm

@@ -34,7 +34,7 @@
 					H << "\red You have a monitor for a head, where do you think you're going to put that?"
 					return
 
-			M << "\blue You swallow a gulp of [src]."
+			M << "\blue You swallow a gulp from \the [src]."
 			if(reagents.total_volume)
 				reagents.trans_to_ingest(M, gulp_size)
 

code/modules/reagents/reagent_containers/food/drinks/drinkingglass.dm

@@ -71,7 +71,7 @@
 					center_of_mass = list("x"=16, "y"=10)
 				if("tomatojuice")
 					icon_state = "glass_red"
-					name = "Glass of Tomato juf"
+					name = "Glass of Tomato juice"
 					desc = "Are you sure this is tomato juice?"
 					center_of_mass = list("x"=16, "y"=10)
 				if("blood")

code/modules/vehicles/cargo_train.dm

@@ -10,7 +10,7 @@
 	standing_mob = 1
 	load_item_visible = 1
 	load_offset_x = 0
-	load_offset_y = 8
+	load_offset_y = 7
 
 	var/car_limit = 3		//how many cars an engine can pull before performance degrades
 	active_engines = 1
@@ -34,7 +34,7 @@
 	standing_mob = 1
 	load_item_visible = 1
 	load_offset_x = 0
-	load_offset_y = 5
+	load_offset_y = 4
 
 //-------------------------------------------
 // Standard procs
@@ -44,6 +44,8 @@
 	cell = new /obj/item/weapon/cell/high
 	verbs -= /atom/movable/verb/pull
 	key = new()
+	var/image/I = new(icon = 'icons/obj/vehicles.dmi', icon_state = "cargo_engine_overlay", layer = src.layer + 0.2) //over mobs
+	overlays += I
 
 /obj/vehicle/train/cargo/engine/Move()
 	if(on && cell.charge < power_use)
@@ -248,6 +250,9 @@
 	
 	if(istype(load, /mob/living/carbon/human))
 		load.pixel_y += 4
+	
+	if(load)
+		return 1
 
 /obj/vehicle/train/cargo/engine/load(var/atom/movable/C)
 	if(!ismob(C))

code/modules/vehicles/train.dm

@@ -80,7 +80,7 @@
 	return 1
 
 /obj/vehicle/train/MouseDrop_T(var/atom/movable/C, mob/user as mob)
-	if(user.buckled || user.stat || user.restrained() || !Adjacent(user) || !user.Adjacent(C))
+	if(user.buckled || user.stat || user.restrained() || !Adjacent(user) || !user.Adjacent(C) || !istype(C))
 		return
 	if(istype(C,/obj/vehicle/train))
 		latch(C, user)

code/modules/vehicles/vehicle.dm

@@ -58,6 +58,8 @@
 		return 0
 
 /obj/vehicle/attackby(obj/item/weapon/W as obj, mob/user as mob)
+	if(istype(W, /obj/item/weapon/hand_labeler))
+		return
 	if(istype(W, /obj/item/weapon/screwdriver))
 		if(!locked)
 			open = !open