Merge branch 'russ-money:main' into main

code/__DEFINES/say.dm

@@ -55,6 +55,9 @@
 #define SPAN_COMMAND "command_headset"
 #define SPAN_CLOWN "clown"
 
+#define SPAN_SINGING "singing"
+#define MODE_SING "%"
+
 #define SPAN_GEN "say"
 #define SPAN_DWARF "dwarf"
 #define SPAN_ELF "elf"

code/datums/brain_damage/phobia.dm

@@ -40,7 +40,7 @@
 	..()
 	if(HAS_TRAIT(owner, TRAIT_FEARLESS))
 		return
-	if(is_blind(owner))
+	if(owner.is_blind())
 		return
 	if(world.time > next_check && world.time > next_scare)
 		next_check = world.time + 50

code/datums/mutable_appearance.dm

@@ -4,10 +4,13 @@
 
 // Mutable appearances are children of images, just so you know.
 
+// causing BYOND v515.1643 to not compile, does not seem to do anything but define what is already defined below in proc anyway.
+/*
 /mutable_appearance/New()
 	..()
 	plane = FLOAT_PLANE // No clue why this is 0 by default yet images are on FLOAT_PLANE
 						// And yes this does have to be in the constructor, BYOND ignores it if you set it as a normal var
+*/
 
 // Helper similar to image()
 /proc/mutable_appearance(icon, icon_state = "", layer = FLOAT_LAYER, plane = FLOAT_PLANE)

code/game/atoms_movable.dm

@@ -16,6 +16,7 @@
 	var/verb_ask = "asks"
 	var/verb_exclaim = "exclaims"
 	var/verb_whisper = "whispers"
+	var/verb_sing = "sings"
 	var/verb_yell = "yells"
 	var/speech_span
 	var/inertia_dir = 0

code/modules/language/language.dm

@@ -11,6 +11,7 @@
 	var/ask_verb = "asks"             // Used when sentence ends in a ?
 	var/exclaim_verb = "exclaims"     // Used when sentence ends in a !
 	var/whisper_verb = "whispers"     // Optional. When not specified speech_verb + quietly/softly is used instead.
+	var/sing_verb = "sings"			  // Used for singing.
 	var/list/signlang_verb = list("signs", "gestures") // list of emotes that might be displayed if this language has NONVERBAL or SIGNLANG flags
 	var/key                           // Character used to speak in language
 	// If key is null, then the language isn't real or learnable.

code/modules/mob/living/say.dm

@@ -86,7 +86,7 @@ GLOBAL_LIST_INIT(department_radio_keys, list(
 	var/static/list/unconscious_allowed_modes = list(MODE_CHANGELING = TRUE, MODE_ALIEN = TRUE)
 	var/talk_key = get_key(message)
 
-	var/static/list/one_character_prefix = list(MODE_HEADSET = TRUE, MODE_ROBOT = TRUE, MODE_WHISPER = TRUE)
+	var/static/list/one_character_prefix = list(MODE_HEADSET = TRUE, MODE_ROBOT = TRUE, MODE_WHISPER = TRUE, MODE_SING = TRUE)
 
 	var/ic_blocked = FALSE
 	if(client && !forced && CHAT_FILTER_CHECK(message))
@@ -218,6 +218,11 @@ GLOBAL_LIST_INIT(department_radio_keys, list(
 		else
 			spans |= L.spans
 
+	if(message_mode == MODE_SING)
+		var/randomnote = pick("\u2669", "\u266A", "\u266B")
+		message = "[randomnote] [message] [randomnote]"
+		spans |= SPAN_SINGING
+
 	var/radio_return = radio(message, message_mode, spans, language)
 	if(radio_return & ITALICS)
 		spans |= SPAN_ITALICS
@@ -451,6 +456,8 @@ GLOBAL_LIST_INIT(department_radio_keys, list(
 		. = "stammers"
 	else if(derpspeech)
 		. = "gibbers"
+	else if(message_mode == MODE_SING)
+		. = verb_sing
 	else
 		. = ..()
 

code/modules/mob/mob.dm

@@ -220,7 +220,7 @@ GLOBAL_VAR_INIT(mobids, 1)
 		if(!msg)
 			continue
 
-		if(visible_message_flags & EMOTE_MESSAGE)
+		if(visible_message_flags & EMOTE_MESSAGE && !M.is_blind())
 			M.create_chat_message(src, raw_message = raw_msg, runechat_flags = visible_message_flags)
 
 		M.show_message(msg, MSG_VISUAL, blind_message, MSG_AUDIBLE)
@@ -250,7 +250,7 @@ GLOBAL_VAR_INIT(mobids, 1)
 	if(audible_message_flags & EMOTE_MESSAGE)
 		message = "<b>[src]</b> [message]"
 	for(var/mob/M in hearers)
-		if(audible_message_flags & EMOTE_MESSAGE)
+		if(audible_message_flags & EMOTE_MESSAGE && M.can_hear())
 			M.create_chat_message(src, raw_message = raw_msg, runechat_flags = audible_message_flags)
 		M.show_message(message, MSG_AUDIBLE, deaf_message, MSG_VISUAL)
 
@@ -443,7 +443,7 @@ GLOBAL_VAR_INIT(mobids, 1)
 		// shift-click catcher may issue examinate() calls for out-of-sight turfs
 		return
 
-	if(is_blind(src))
+	if(is_blind())
 		to_chat(src, span_warning("Something is there but I can't see it!"))
 		return
 

code/modules/mob/mob_helpers.dm

@@ -689,13 +689,9 @@
 			aimheight = 1
 
 ///Checks if passed through item is blind
-/proc/is_blind(A)
-	if(ismob(A))
-		var/mob/B = A
-		if(HAS_TRAIT(B, TRAIT_BLIND))
-			return TRUE
-		return B.eye_blind
-	return FALSE
+/mob/proc/is_blind(A)
+	SHOULD_BE_PURE(TRUE)
+	return eye_blind ? TRUE : HAS_TRAIT(src, TRAIT_BLIND)
 
 ///Is the mob hallucinating?
 /mob/proc/hallucinating()

code/modules/mob/say.dm

@@ -138,6 +138,8 @@
 	var/key = copytext(message, 1, 2)
 	if(key == "#")
 		return MODE_WHISPER
+	else if(key == "%")
+		return MODE_SING
 	else if(key == ";")
 		return MODE_HEADSET
 	else if(length(message) > 2 && (key in GLOB.department_radio_prefixes))

code/modules/paperwork/paper.dm

@@ -417,7 +417,7 @@
 	if(mailer)
 		return ..()
 
-	if(is_blind(user))
+	if(user.is_blind())
 		return ..()
 
 	if(istype(P, /obj/item/pen) || istype(P, /obj/item/natural/thorn)|| istype(P, /obj/item/natural/feather))

code/modules/roguetown/roguecrafting/leather.dm

@@ -3,6 +3,7 @@
 	tools = list(/obj/item/needle)
 	structurecraft = /obj/structure/fluff/dryingrack
 	skillcraft = /datum/skill/craft/tanning
+	craftdiff = 0
 
 /datum/crafting_recipe/roguetown/leather/pouch
 	name = "leather pouch"
@@ -18,20 +19,23 @@
 	reqs = list(/obj/item/natural/hide = 2,
 				/obj/item/natural/fibers = 1)
 	sellprice = 15
+	craftdiff = 1
 
 /datum/crafting_recipe/roguetown/leather/backpack
 	name = "leather backpack"
 	result = /obj/item/storage/backpack/rogue/backpack
 	reqs = list(/obj/item/natural/hide = 2,
 				/obj/item/natural/fibers = 1)
 	sellprice = 45
+	craftdiff = 2
 
 /datum/crafting_recipe/roguetown/leather/waterskin
 	name = "waterskin"
 	result = /obj/item/reagent_containers/glass/bottle/waterskin
 	reqs = list(/obj/item/natural/hide = 1,
 				/obj/item/natural/fibers = 2)
 	sellprice = 45
+	craftdiff = 1
 
 /datum/crafting_recipe/roguetown/leather/quiver
 	name = "quiver"
@@ -52,6 +56,7 @@
 	result = /obj/item/clothing/gloves/roguetown/angle
 	reqs = list(/obj/item/natural/fur = 1)
 	sellprice = 20
+	craftdiff = 1
 
 /datum/crafting_recipe/roguetown/leather/bracers
 	name = "leather bracers"
@@ -85,6 +90,7 @@
 	result = /obj/item/clothing/head/roguetown/helmet/leather
 	reqs = list(/obj/item/natural/hide = 1)
 	sellprice = 27
+	craftdiff = 1
 
 /datum/crafting_recipe/roguetown/leather/hood
 	name = "leather hood"
@@ -102,13 +108,15 @@
 	result = /obj/item/clothing/suit/roguetown/armor/leather
 	reqs = list(/obj/item/natural/hide = 2)
 	sellprice = 26
+	craftdiff = 1
 
 /datum/crafting_recipe/roguetown/leather/hidearmor
 	name = "hide armor"
 	result = /obj/item/clothing/suit/roguetown/armor/leather/hide
 	reqs = list(/obj/item/natural/hide = 2,
 				/obj/item/natural/fur = 1)
 	sellprice = 26
+	craftdiff = 2
 
 /datum/crafting_recipe/roguetown/leather/cloak
 	name = "leather cloak"
@@ -143,6 +151,7 @@
 	result = /obj/item/rogueweapon/whip
 	reqs = list(/obj/item/natural/hide = 2,/obj/item/natural/stone = 1)
 	sellprice = 39
+	craftdiff = 1
 
 /datum/crafting_recipe/roguetown/leather/drum
 	name = "Drum"

interface/stylesheet.dm

@@ -140,6 +140,7 @@ h1.alert, h2.alert	{color: #c9c1ba;font-family: Pterra, TrueType;}
 .extremelybig			{font-size: 220%;}
 .greentext				{color: #00FF00;}
 .redtext				{color: #FF0000;}
+.singing				{font-family: "Trebuchet MS", cursive, sans-serif; font-style: italic;}
 .clown					{color: #FF69Bf;	font-size: 3;	font-family: "Comic Sans MS", cursive, sans-serif;	font-weight: bold;}
 .his_grace				{color: #15D512;	font-family: "Courier New", cursive, sans-serif;	font-style: italic;}
 .hypnophrase			{color: #3bb5d3;	font-weight: bold;	animation: hypnocolor 1500ms infinite;}