From 20e90d1168fc7ef4abdb3f8d6d569a8e263b07f5 Mon Sep 17 00:00:00 2001 From: phil235 Date: Wed, 5 Nov 2014 14:45:47 +0100 Subject: [PATCH] Fixes typos in message and icon. Fixes the ability to beat up a pAI. Adds a cooldown to attack_animal on mechs. --- code/ATMOSPHERICS/atmospherics.dm | 2 +- code/game/mecha/mecha.dm | 1 + code/modules/mob/living/silicon/pai/pai.dm | 3 ++- icons/mecha/mecha.dmi | Bin 142034 -> 142032 bytes 4 files changed, 4 insertions(+), 2 deletions(-) diff --git a/code/ATMOSPHERICS/atmospherics.dm b/code/ATMOSPHERICS/atmospherics.dm index 41f2276b61f..6b75c0481b0 100644 --- 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 << "You cannot unwrench this [src], it is too exerted due to internal pressure." + user << "You cannot unwrench [src], it is too exerted due to internal pressure." 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 index e8ac2fe055b..4a9e05ee11e 100644 --- a/code/game/mecha/mecha.dm +++ b/code/game/mecha/mecha.dm @@ -494,6 +494,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 index 9e0c0f08e7f..4c773abce50 100644 --- 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 index c9e3455fa55f8c72b95dd675bdf3796b7d02d138..c4eb2e86dca8a6542ec0bb79df635e3119c5b7d4 100644 GIT binary patch delta 440 zcmV;p0Z0DQ)dK& zvF(CQN2lXL-yxMiGDgBAp)Gy-E^VFn@yTqkCdmJosO z5#Q^&7Aj}i-Rd{2{)6^Yt208anH49Nomf9opAv_0mt#ppE?GH^A#%w|BtxY|0$ix3 zMLg7;9^nYY>fXwb_$25tBdHA2H0P5{mF!{gA=sr`HKFl8#q$Omv&!=Bar1$acK-I%w%z{LR^n; zY9vM?G)qLvEn*)VS{zK%faHl8wH*12YG_A!9ImX%m4yga9tk#NAOnj?^*Jq5`ZEo9 zRpQEZmy?76B|LA<#rBrr?e08v6UVq;8{A$e)F-X5dQ4L6|15p#^h_5?AtgRLDWn{I i!5ntSEo={a_YeGsu9PU&_hp0T0f*)R0k`G>0_-S1cgxiP delta 471 zcmV;|0Vw{^)dnXc`y#3e8joX5z?@nV~Ix`Yu2Pm-_go|%CN0@sO|q$Nb) zd&Kv;u7%23cC-2otAD5c)ary#Yi7lfWk=SJ)ThK@+~imikxN!iV~AX`63I|$kpO3^ zX%P=Kr$;yfvAVS~Bt8jx%t$K3G|l-WQziQsQEf%?13_ zAoX?Ue`wAYO2*iKS*wEEj=>o!D~|+EWFP~JNcAZ#Q~EOv zcv0fYb(3RB3Qe==^{Qke49$h{h);YHwnw{87{gk(_QNBSpaBRyug%5wmf`j8JarO3 z#<*V^++HWtC#|r0Oj7LsEPd$oOczNZB|bYTq#S+09JYrIZ1y|%4=%{A#^#3mu7l(O NhvWePx8wl=>?r&=;L!j8