Merge remote-tracking branch 'upstream/master' into limbs

code/modules/mob/living/brain/emote.dm

@@ -1,13 +1,3 @@
-/datum/emote/brain
-	mob_type_allowed_typecache = list(/mob/living/brain)
-	mob_type_blacklist_typecache = list()
-
-/datum/emote/brain/can_run_emote(mob/user, status_check = TRUE)
-	. = ..()
-	var/mob/living/brain/B = user
-	if(!istype(B) || (!(B.container && istype(B.container, /obj/item/mmi))))
-		return FALSE
-
 /datum/emote/brain/alarm
 	key = "alarm"
 	message = "sounds an alarm."

code/modules/mob/living/carbon/alien/emote.dm

@@ -1,6 +1,3 @@
-/datum/emote/living/alien
-	mob_type_allowed_typecache = list(/mob/living/carbon/alien)
-
 /datum/emote/living/alien/gnarl
 	key = "gnarl"
 	key_third_person = "gnarls"

code/modules/mob/living/carbon/emote.dm

@@ -1,6 +1,3 @@
-/datum/emote/living/carbon
-	mob_type_allowed_typecache = list(/mob/living/carbon)
-
 /datum/emote/living/carbon/airguitar
 	key = "airguitar"
 	message = "is strumming the air and headbanging like a safari chimp."
@@ -22,7 +19,6 @@
 	muzzle_ignore = TRUE
 	restraint_check = TRUE
 	emote_type = EMOTE_AUDIBLE
-	mob_type_allowed_typecache = list(/mob/living/carbon, /mob/living/silicon/pai)
 
 /datum/emote/living/carbon/clap/run_emote(mob/living/user, params)
 	. = ..()
@@ -41,7 +37,6 @@
 	key = "gnarl"
 	key_third_person = "gnarls"
 	message = "gnarls and shows its teeth..."
-	mob_type_allowed_typecache = list(/mob/living/carbon/monkey, /mob/living/carbon/alien)
 
 /datum/emote/living/carbon/moan
 	key = "moan"
@@ -55,27 +50,23 @@
 	key = "roll"
 	key_third_person = "rolls"
 	message = "rolls."
-	mob_type_allowed_typecache = list(/mob/living/carbon/monkey, /mob/living/carbon/alien)
 	restraint_check = TRUE
 
 /datum/emote/living/carbon/scratch
 	key = "scratch"
 	key_third_person = "scratches"
 	message = "scratches."
-	mob_type_allowed_typecache = list(/mob/living/carbon/monkey, /mob/living/carbon/alien)
 	restraint_check = TRUE
 
 /datum/emote/living/carbon/screech
 	key = "screech"
 	key_third_person = "screeches"
 	message = "screeches."
-	mob_type_allowed_typecache = list(/mob/living/carbon/monkey, /mob/living/carbon/alien)
 
 /datum/emote/living/carbon/sign
 	key = "sign"
 	key_third_person = "signs"
 	message_param = "signs the number %t."
-	mob_type_allowed_typecache = list(/mob/living/carbon/monkey, /mob/living/carbon/alien)
 	restraint_check = TRUE
 
 /datum/emote/living/carbon/sign/select_param(mob/user, params)
@@ -87,13 +78,11 @@
 	key = "signal"
 	key_third_person = "signals"
 	message_param = "raises %t fingers."
-	mob_type_allowed_typecache = list(/mob/living/carbon/human)
 	restraint_check = TRUE
 
 /datum/emote/living/carbon/tail
 	key = "tail"
 	message = "waves their tail."
-	mob_type_allowed_typecache = list(/mob/living/carbon/monkey, /mob/living/carbon/alien)
 
 /datum/emote/living/carbon/wink
 	key = "wink"

code/modules/mob/living/carbon/human/emote.dm

@@ -1,6 +1,3 @@
-/datum/emote/living/carbon/human
-	mob_type_allowed_typecache = list(/mob/living/carbon/human)
-
 /datum/emote/living/carbon/human/cry
 	key = "cry"
 	key_third_person = "cries"

code/modules/mob/living/carbon/human/examine.dm

@@ -113,14 +113,14 @@
 		. += effects_exam
 
 	//CIT CHANGES START HERE - adds genital details to examine text
-	if(LAZYLEN(internal_organs))
+	if(LAZYLEN(internal_organs) && CHECK_BITFIELD(user.client?.prefs.cit_toggles, GENITAL_EXAMINE))
 		for(var/obj/item/organ/genital/dicc in internal_organs)
 			if(istype(dicc) && dicc.is_exposed())
 				. += "[dicc.desc]"
-
-	var/cursed_stuff = attempt_vr(src,"examine_bellies",args) //vore Code
-	if(cursed_stuff)
-		. += cursed_stuff
+	if(CHECK_BITFIELD(user.client?.prefs.cit_toggles, VORE_EXAMINE))
+		var/cursed_stuff = attempt_vr(src,"examine_bellies",args) //vore Code
+		if(cursed_stuff)
+			. += cursed_stuff
 //END OF CIT CHANGES
 
 	//Jitters

code/modules/mob/living/carbon/human/human_helpers.dm

@@ -75,12 +75,8 @@
 		. = pda.owner
 	else if(istype(tablet))
 		var/obj/item/computer_hardware/card_slot/card_slot = tablet.all_components[MC_CARD]
-		if(card_slot && (card_slot.stored_card2 || card_slot.stored_card))
-			if(card_slot.stored_card2) //The second card is the one used for authorization in the ID changing program, so we prioritize it here for consistency
-				. = card_slot.stored_card2.registered_name
-			else
-				if(card_slot.stored_card)
-					. = card_slot.stored_card.registered_name
+		if(card_slot?.stored_card)
+			. = card_slot.stored_card.registered_name
 	if(!.)
 		. = if_no_id	//to prevent null-names making the mob unclickable
 	return

code/modules/mob/living/carbon/human/species_types/dullahan.dm

@@ -83,17 +83,7 @@
 
 /obj/item/organ/tongue/dullahan
 	zone = "abstract"
-	modifies_speech = TRUE
-
-/obj/item/organ/tongue/dullahan/handle_speech(datum/source, list/speech_args)
-	if(ishuman(owner))
-		var/mob/living/carbon/human/H = owner
-		if(isdullahan(H))
-			var/datum/species/dullahan/D = H.dna.species
-			if(isobj(D.myhead.loc))
-				var/obj/O = D.myhead.loc
-				O.say(speech_args[SPEECH_MESSAGE])
-	speech_args[SPEECH_MESSAGE] = ""
+	accents = list(/datum/accent/dullahan)
 
 /obj/item/organ/ears/dullahan
 	zone = "abstract"

code/modules/mob/living/emote.dm

@@ -1,9 +1,3 @@
-
-/* EMOTE DATUMS */
-/datum/emote/living
-	mob_type_allowed_typecache = /mob/living
-	mob_type_blacklist_typecache = list(/mob/living/simple_animal/slime, /mob/living/brain)
-
 /datum/emote/living/blush
 	key = "blush"
 	key_third_person = "blushes"

code/modules/mob/living/silicon/robot/emote.dm

@@ -5,7 +5,7 @@
 /datum/emote/sound/silicon
 	mob_type_allowed_typecache = list(/mob/living/silicon, /mob/living/carbon/human)
 	emote_type = EMOTE_AUDIBLE
-	var/unrestricted = FALSE
+	var/unrestricted = TRUE
 
 /datum/emote/sound/silicon/run_emote(mob/user, params)
 	if(!unrestricted && !(issilicon(user) || isipcperson(user)))

code/modules/mob/living/simple_animal/hostile/gorilla/emotes.dm

@@ -1,6 +1,5 @@
 /datum/emote/sound/gorilla
 	mob_type_allowed_typecache = /mob/living/simple_animal/hostile/gorilla
-	mob_type_blacklist_typecache = list()
 
 /datum/emote/sound/gorilla/ooga
 	key = "ooga"
@@ -8,4 +7,3 @@
 	message = "oogas."
 	message_param = "oogas at %t."
 	sound = 'sound/creatures/gorilla.ogg'
-

code/modules/mob/living/simple_animal/slime/emote.dm

@@ -1,6 +1,5 @@
 /datum/emote/slime
 	mob_type_allowed_typecache = /mob/living/simple_animal/slime
-	mob_type_blacklist_typecache = list()
 
 /datum/emote/slime/bounce
 	key = "bounce"

code/modules/mob/living/simple_animal/slime/slime.dm

@@ -106,6 +106,7 @@
 	set_colour(new_colour)
 	. = ..()
 	AddComponent(/datum/component/footstep, FOOTSTEP_MOB_SLIME, 7.5)
+	set_nutrition(rand(650, 800))
 
 /mob/living/simple_animal/slime/Destroy()
 	for (var/A in actions)