cyberpresidentvanellope/Aurora.3
1
0
Fork 0
mirror of https://github.com/Aurorastation/Aurora.3.git synced 2025-12-22 16:12:19 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into development

Browse Source
This commit is contained in:
skull132
2017-01-23 15:52:13 -05:00
parent 02d6d1932b a4763014b9
commit b20032ea25
15 changed files with 48 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
code/modules/mob/living/simple_animal/constructs/constructs.dm
View File

@@ -146,6 +146,7 @@
return (..(P))
/mob/living/simple_animal/construct/armoured/UnarmedAttack(var/atom/A, var/proximity)
user.setClickCooldown(DEFAULT_ATTACK_COOLDOWN)
if(istype(A, /obj/machinery))
// Destroy machines instead of opening their UI
var/obj/machinery/M = A