Merge branch 'master' into synctesting

modular_citadel/code/modules/arousal/toys/dildos.dm

@@ -5,8 +5,9 @@ obj/item/dildo
 	name 				= "dildo"
 	desc 				= "Floppy!"
 	icon 				= 'modular_citadel/icons/obj/genitals/dildo.dmi'
-	damtype 			= BRUTE
-	force 				= 0
+	damtype 			= AROUSAL
+	force 				= 5
+	hitsound			= 'sound/weapons/tap.ogg'
 	throwforce			= 0
 	icon_state 			= "dildo_knotted_2"
 	alpha 				= 192//transparent
@@ -129,4 +130,4 @@ obj/item/dildo/custom
 	can_customize		= TRUE
 	random_color 		= TRUE
 	random_shape 		= TRUE
-	random_size 		= TRUE
+	random_size 		= TRUE

modular_citadel/code/modules/client/preferences.dm

@@ -253,8 +253,8 @@
 	if("input")
 		switch(href_list["preference"])
 			if("flavor_text")
-				var/msg = stripped_multiline_input(usr,"Set the flavor text in your 'examine' verb. This can also be used for OOC notes and preferences!","Flavor Text",html_decode(features["flavor_text"]), MAX_MESSAGE_LEN*2, TRUE) as message
-				if(msg != null)
+				var/msg = stripped_multiline_input(usr,"Set the flavor text in your 'examine' verb. This can also be used for OOC notes and preferences!","Flavor Text",html_decode(features["flavor_text"]), MAX_MESSAGE_LEN*2, TRUE) as null|message
+				if(!isnull(msg))
 					msg = copytext(msg, 1, MAX_MESSAGE_LEN*2)
 					features["flavor_text"] = msg