Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit765

code/modules/mob/living/silicon/pai/pai_defense.dm

@@ -32,22 +32,28 @@
 /mob/living/silicon/pai/attack_hand(mob/living/carbon/human/user)
 	switch(user.a_intent)
 		if(INTENT_HELP)
-			visible_message("<span class='notice'>[user] gently pats [src] on the head, eliciting an off-putting buzzing from its holographic field.</span>")
+			visible_message("<span class='notice'>[user] gently pats [src] on the head, eliciting an off-putting buzzing from its holographic field.</span>",
+				"<span class='notice'>[user] gently pats you on the head, eliciting an off-putting buzzing from your holographic field.</span>", target = user,
+				target_message = "<span class='notice'>You gently pat [src] on the head, eliciting an off-putting buzzing from its holographic field.</span>")
 		if(INTENT_DISARM)
-			visible_message("<span class='notice'>[user] boops [src] on the head!</span>")
+			visible_message("<span class='notice'>[user] boops [src] on the head!</span>",
+				"<span class='notice'>[user] boops you on the head!</span>", target = user,
+				target_message = "<span class='notice'>You boop [src] on the head!</span>")
 		if(INTENT_HARM)
 			user.do_attack_animation(src)
 			if (user.name == master)
 				visible_message("<span class='notice'>Responding to its master's touch, [src] disengages its holochassis emitter, rapidly losing coherence.</span>")
-				spawn(10)
-					fold_in()
-					if(user.put_in_hands(card))
-						user.visible_message("<span class='notice'>[user] promptly scoops up [user.p_their()] pAI's card.</span>")
+				fold_in()
+				if(user.put_in_hands(card))
+					user.visible_message("<span class='notice'>[user] promptly scoops up [user.p_their()] pAI's card.</span>",
+						"<span class='notice'>You promptly scoops up your pAI's card.</span>")
 			else
 				if(HAS_TRAIT(user, TRAIT_PACIFISM))
 					to_chat(user, "<span class='notice'>You don't want to hurt [src]!</span>")
 					return
-				visible_message("<span class='danger'>[user] stomps on [src]!.</span>")
+				visible_message("<span class='danger'>[user] stomps on [src]!.</span>",
+					"<span class='userdanger'>[user] stomps on you!.</span>", target = user,
+					target_message = "<span class='danger'>You stomp on [src]!.</span>")
 				take_holo_damage(2)
 		else
 			grabbedby(user)

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

@@ -32,15 +32,17 @@
 			var/obj/item/I = get_active_held_item()
 			if(I)
 				uneq_active()
-				visible_message("<span class='danger'>[M] disarmed [src]!</span>", \
-					"<span class='userdanger'>[M] has disabled [src]'s active module!</span>", null, COMBAT_MESSAGE_RANGE)
+				visible_message("<span class='danger'>[M] has disarmed [src]!</span>", \
+					"<span class='userdanger'>[M] has disabled your active module!</span>", null, COMBAT_MESSAGE_RANGE, null, M,
+					"<span class='danger'>You have disarmed [src]!</span>")
 				log_combat(M, src, "disarmed", "[I ? " removing \the [I]" : ""]")
 			else
 				Paralyze(40)
 				step(src,get_dir(M,src))
 				log_combat(M, src, "pushed")
 				visible_message("<span class='danger'>[M] has forced back [src]!</span>", \
-					"<span class='userdanger'>[M] has forced back [src]!</span>", null, COMBAT_MESSAGE_RANGE)
+					"<span class='userdanger'>[M] has forced you back!</span>", null, COMBAT_MESSAGE_RANGE, null, M,
+					"<span class='danger'>You have forced back [src]!</span>")
 			playsound(loc, 'sound/weapons/pierce.ogg', 50, 1, -1)
 
 /mob/living/silicon/robot/attack_slime(mob/living/simple_animal/slime/M)

code/modules/mob/living/silicon/silicon_defense.dm

@@ -17,7 +17,8 @@
 			log_combat(M, src, "attacked")
 			playsound(loc, 'sound/weapons/slash.ogg', 25, 1, -1)
 			visible_message("<span class='danger'>[M] has slashed at [src]!</span>", \
-							"<span class='userdanger'>[M] has slashed at [src]!</span>")
+							"<span class='userdanger'>[M] has slashed at you!</span>", target = M, \
+							target_message = "<span class='danger'>You have slashed at [src]!</span>")
 			if(prob(8))
 				flash_act(affect_silicon = 1)
 			log_combat(M, src, "attacked")
@@ -25,8 +26,9 @@
 			updatehealth()
 		else
 			playsound(loc, 'sound/weapons/slashmiss.ogg', 25, 1, -1)
-			visible_message("<span class='danger'>[M] took a swipe at [src]!</span>", \
-							"<span class='userdanger'>[M] took a swipe at [src]!</span>")
+			visible_message("<span class='danger'>[M] take a swipe at [src]!</span>", \
+							"<span class='userdanger'>[M] take a swipe at you!</span>", target = M, \
+							target_message = "<span class='danger'>You take a swipe at [src]!</span>")
 
 /mob/living/silicon/attack_animal(mob/living/simple_animal/M)
 	. = ..()
@@ -36,7 +38,8 @@
 			for(var/mob/living/N in buckled_mobs)
 				N.DefaultCombatKnockdown(20)
 				unbuckle_mob(N)
-				N.visible_message("<span class='boldwarning'>[N] is knocked off of [src] by [M]!</span>")
+				N.visible_message("<span class='boldwarning'>[N] is knocked off of [src] by [M]!</span>",
+					"<span class='boldwarning'>You are knocked off of [src] by [M]!</span>")
 		switch(M.melee_damage_type)
 			if(BRUTE)
 				adjustBruteLoss(damage)
@@ -62,7 +65,8 @@
 		adjustBruteLoss(rand(10, 15))
 		playsound(loc, "punch", 25, 1, -1)
 		visible_message("<span class='danger'>[user] has punched [src]!</span>", \
-				"<span class='userdanger'>[user] has punched [src]!</span>")
+				"<span class='userdanger'>[user] has punched you!</span>", target = user, \
+				target_message = "<span class='danger'>You have punched [src]!</span>")
 		return TRUE
 	return FALSE
 
@@ -73,14 +77,16 @@
 	switch(M.a_intent)
 		if (INTENT_HELP)
 			M.visible_message("[M] pets [src].", \
-							"<span class='notice'>You pet [src].</span>")
+							"<span class='notice'>You pet [src].</span>", target = src,
+							target_message = "[M] pets you.")
 		if(INTENT_GRAB)
 			grabbedby(M)
 		else
 			M.do_attack_animation(src, ATTACK_EFFECT_PUNCH)
 			playsound(src.loc, 'sound/effects/bang.ogg', 10, 1)
 			visible_message("<span class='danger'>[M] punches [src], but doesn't leave a dent.</span>", \
-				"<span class='warning'>[M] punches [src], but doesn't leave a dent.</span>", null, COMBAT_MESSAGE_RANGE)
+				"<span class='warning'>[M] punches you, but doesn't leave a dent.</span>", null, COMBAT_MESSAGE_RANGE, null, M,
+				"<span class='danger'>You punch [src], but don't leave a dent.</span>")
 
 /mob/living/silicon/attack_drone(mob/living/simple_animal/drone/M)
 	if(M.a_intent == INTENT_HARM)
@@ -109,7 +115,8 @@
 		if(prob(severity*50))
 			unbuckle_mob(M)
 			M.DefaultCombatKnockdown(40)
-			M.visible_message("<span class='boldwarning'>[M] is thrown off of [src]!</span>")
+			M.visible_message("<span class='boldwarning'>[M] is thrown off of [src]!</span>",
+				"<span class='boldwarning'>You are thrown off of [src]!</span>")
 	flash_act(affect_silicon = 1)
 
 /mob/living/silicon/bullet_act(obj/item/projectile/P, def_zone)
@@ -127,13 +134,15 @@
 		adjustBruteLoss(P.damage)
 		if(prob(P.damage*1.5))
 			for(var/mob/living/M in buckled_mobs)
-				M.visible_message("<span class='boldwarning'>[M] is knocked off of [src]!</span>")
+				M.visible_message("<span class='boldwarning'>[M] is knocked off of [src]!</span>",
+					"<span class='boldwarning'>You are knocked off of [src]!</span>")
 				unbuckle_mob(M)
 				M.DefaultCombatKnockdown(40)
 	if(P.stun || P.knockdown)
 		for(var/mob/living/M in buckled_mobs)
 			unbuckle_mob(M)
-			M.visible_message("<span class='boldwarning'>[M] is knocked off of [src] by the [P]!</span>")
+			M.visible_message("<span class='boldwarning'>[M] is knocked off of [src] by the [P]!</span>",
+				"<span class='boldwarning'>You are knocked off of [src] by the [P]!</span>")
 	P.on_hit(src)
 	return BULLET_ACT_HIT