Merge pull request tgstation#5704 from phil235/TypoFix1

Fixes the ability to beat up a pAI.
flangela · Nov 8, 2014 · e49e4ef · e49e4ef
2 parents 78e7398 + 20e90d1
commit e49e4ef
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 2 deletions.
diff --git a/code/ATMOSPHERICS/atmospherics.dm b/code/ATMOSPHERICS/atmospherics.dm
@@ -86,7 +86,7 @@ Pipelines + Other Objects -> Pipe network
 		var/datum/gas_mixture/int_air = return_air()
 		var/datum/gas_mixture/env_air = loc.return_air()
 		if ((int_air.return_pressure()-env_air.return_pressure()) > 2*ONE_ATMOSPHERE)
-			user << "<span class='danger'>You cannot unwrench this [src], it is too exerted due to internal pressure.</span>"
+			user << "<span class='danger'>You cannot unwrench [src], it is too exerted due to internal pressure.</span>"
 			add_fingerprint(user)
 			return 1
 		playsound(src.loc, 'sound/items/Ratchet.ogg', 50, 1)

diff --git a/code/game/mecha/mecha.dm b/code/game/mecha/mecha.dm
@@ -496,6 +496,7 @@ obj/mecha/proc/can_use(mob/user)
 
 /obj/mecha/attack_animal(mob/living/simple_animal/user as mob)
 	src.log_message("Attack by simple animal. Attacker - [user].",1)
+	user.changeNext_move(CLICK_CD_MELEE)
 	if(user.melee_damage_upper == 0)
 		user.emote("[user.friendly] [src]")
 	else

diff --git a/code/modules/mob/living/silicon/pai/pai.dm b/code/modules/mob/living/silicon/pai/pai.dm
@@ -1,9 +1,10 @@
 /mob/living/silicon/pai
 	name = "pAI"
 	icon = 'icons/obj/status_display.dmi' //invisibility!
-	mouse_opacity
+	mouse_opacity = 0
 	density = 0
 	mob_size = 0
+	invisibility = 101
 
 	var/network = "SS13"
 	var/obj/machinery/camera/current = null

diff --git a/icons/mecha/mecha.dmi b/icons/mecha/mecha.dmi