Merge branch 'master' of github.com:ParadiseSS13/Paradise into human_icons_tweak

code/modules/hydroponics/grown_predefined.dm

@@ -6,6 +6,9 @@
 /obj/item/weapon/reagent_containers/food/snacks/grown/ambrosiavulgaris
 	plantname = "ambrosia"
 
+/obj/item/weapon/reagent_containers/food/snacks/grown/potato
+	plantname = "potato"
+
 /obj/item/weapon/reagent_containers/food/snacks/grown/tomato
 	plantname = "tomato"
 

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

@@ -21,6 +21,10 @@
 		if (I.implanted)
 			I.trigger(act, src)
 
+	var/miming = 0
+	if(mind)
+		miming = mind.miming
+
 	//Emote Cooldown System (it's so simple!)
 	// proc/handle_emote_CD() located in [code\modules\mob\emote.dm]
 	var/on_CD = 0

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

@@ -404,7 +404,7 @@
 		if(!prob(martial_art.deflection_chance))
 			return ..()
 		if(!src.lying && !(HULK in mutations)) //But only if they're not lying down, and hulks can't do it
-			src.visible_message("<span class='warning'>[src] deflects the projectile!</span>", "<span class='userdanger'>You deflect the projectile!</span>")
+			visible_message("<span class='danger'>[src] deflects the projectile; they can't be hit with ranged weapons!</span>", "<span class='userdanger'>You deflect the projectile!</span>")
 			return 0
 	..()
 

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

@@ -72,7 +72,6 @@
 
 	var/datum/martial_art/martial_art = null
 
-	var/miming = null //Toggle for the mime's abilities.
 	var/special_voice = "" // For changing our voice. Used by a symptom.
 	var/said_last_words=0
 

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

@@ -90,6 +90,11 @@
 		return GetSpecialVoice()
 	return real_name
 
+/mob/living/carbon/human/IsVocal()
+	if(mind)
+		return !mind.miming
+	return 1
+
 /mob/living/carbon/human/proc/SetSpecialVoice(var/new_voice)
 	if(new_voice)
 		special_voice = new_voice

code/modules/mob/living/say.dm

@@ -71,6 +71,8 @@ proc/get_radio_key_from_channel(var/channel)
 	var/list/returns[3]
 	var/speech_problem_flag = 0
 
+
+
 	if((HULK in mutations) && health >= 25 && length(message))
 		message = "[uppertext(message)]!!!"
 		verb = pick("yells","roars","hollers")
@@ -91,6 +93,9 @@ proc/get_radio_key_from_channel(var/channel)
 	else if(COMIC in mutations)
 		message = "<span class='sans'>[message]</span>"
 
+	if(!IsVocal())
+		message = ""
+		speech_problem_flag = 1
 
 	returns[1] = message
 	returns[2] = verb

code/modules/mob/living/silicon/ai/say.dm

@@ -1,5 +1,3 @@
-/mob/living/silicon/ai/proc/IsVocal()
-
 var/announcing_vox = 0 // Stores the time of the last announcement
 var/const/VOX_CHANNEL = 200
 var/const/VOX_DELAY = 100
@@ -30,7 +28,7 @@ var/const/VOX_PATH = "sound/vox_fem/"
 /mob/living/silicon/ai/proc/ai_announcement()
 	if(check_unable(AI_CHECK_WIRELESS | AI_CHECK_RADIO))
 		return
-		
+
 	if(announcing_vox > world.time)
 		src << "<span class='warning'>Please wait [round((announcing_vox - world.time) / 10)] seconds.</span>"
 		return
@@ -38,7 +36,7 @@ var/const/VOX_PATH = "sound/vox_fem/"
 	var/message = input(src, "WARNING: Misuse of this verb can result in you being job banned. More help is available in 'Announcement Help'", "Announcement", last_announcement) as text|null
 
 	last_announcement = message
-	
+
 	if(check_unable(AI_CHECK_WIRELESS | AI_CHECK_RADIO))
 		return
 

code/modules/mob/living/simple_animal/hostile/retaliate/fish.dm

@@ -0,0 +1,31 @@
+
+/mob/living/simple_animal/hostile/retaliate/carp
+	name = "sea carp"
+	desc = "A large fish bearing similarities to a certain space-faring menace."
+	icon_state = "carp"
+	icon_living = "carp"
+	icon_dead = "carp_dead"
+	icon_gib = "carp_gib"
+	speak_chance = 0
+	turns_per_move = 5
+	meat_type = /obj/item/weapon/reagent_containers/food/snacks/carpmeat
+	meat_amount = 1
+	response_help = "pets the"
+	response_disarm = "gently pushes aside the"
+	response_harm = "hits the"
+	speed = 0
+	maxHealth = 25
+	health = 25
+
+	retreat_distance = 6
+	vision_range = 5
+
+	harm_intent_damage = 8
+	melee_damage_lower = 15
+	melee_damage_upper = 15
+	attacktext = "bites"
+	attack_sound = 'sound/weapons/bite.ogg'
+	speak_emote = list("gnashes")
+
+	faction = list("carp")
+	flying = 1

code/modules/mob/mob.dm

@@ -625,7 +625,7 @@ var/list/slot_equipment_priority = list( \
 	set category = "IC"
 
 	msg = copytext(msg, 1, MAX_MESSAGE_LEN)
-	msg = sanitize(msg)
+	msg = sanitize_simple(html_encode(msg), list("\n" = "<BR>"))
 
 	if(mind)
 		mind.store_memory(msg)
@@ -1448,4 +1448,7 @@ mob/proc/yank_out_object()
 
 //Can this mob leave its location without breaking things terrifically?
 /mob/proc/can_safely_leave_loc()
-	return 1 // Yes, you can
+	return 1 // Yes, you can
+
+/mob/proc/IsVocal()
+	return 1

code/modules/projectiles/gun.dm

@@ -105,20 +105,24 @@
 				return
 
 	if (!user.IsAdvancedToolUser() || istype(user, /mob/living/simple_animal/diona))
-		user << "\red You don't have the dexterity to do this!"
+		user << "<span class='danger'>You don't have the dexterity to do this!</span>"
 		return
 	if(istype(user, /mob/living))
 		var/mob/living/M = user
 		if (HULK in M.mutations)
-			M << "\red Your meaty finger is much too large for the trigger guard!"
+			M << "<span class='danger'>Your meaty finger is much too large for the trigger guard!</span>"
 			return
 	if(ishuman(user))
 		var/mob/living/carbon/human/H = user
-		if(H.species.name == "Golem")
-			user << "\red Your metal fingers don't fit in the trigger guard!"
+		if(H.get_species() == "Golem")
+			user << "<span class='danger'>Your metal fingers don't fit in the trigger guard!</span>"
 			return
-		if(user.dna && user.dna.species == "Shadowling")
+		if(H.get_species() == "Shadowling")
 			user << "<span class='danger'>The muzzle flash would cause damage to your form!</span>"
+			return
+		if(H.martial_art && H.martial_art.name == "The Sleeping Carp") //great dishonor to famiry
+			user << "<span class='danger'>Use of ranged weaponry would bring dishonor to the clan.</span>"
+			return
 
 	add_fingerprint(user)
 

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

@@ -3350,15 +3350,6 @@
 		..()
 		reagents.add_reagent("nutriment", 3)
 
-// potato + knife = raw sticks
-/obj/item/weapon/reagent_containers/food/snacks/grown/potato/attackby(obj/item/weapon/W as obj, mob/user as mob, params)
-	if(istype(W,/obj/item/weapon/kitchen/knife))
-		new /obj/item/weapon/reagent_containers/food/snacks/rawsticks(src)
-		user << "You cut the potato."
-		qdel(src)
-	else
-		..()
-
 /obj/item/weapon/reagent_containers/food/snacks/rawsticks
 	name = "raw potato sticks"
 	desc = "Raw fries, not very tasty."