From a76c915e2e87a087c5147892f397dd60acdea983 Mon Sep 17 00:00:00 2001 From: PsiOmegaDelta Date: Tue, 30 Jun 2015 15:09:33 +0200 Subject: [PATCH] Adds missing changelog icon to the client pre-fetch. --- code/game/machinery/portable_turret.dm | 7 ++----- code/modules/mob/mob.dm | 1 + 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/code/game/machinery/portable_turret.dm b/code/game/machinery/portable_turret.dm index 9647a2a99c8..e8f0101f786 100644 --- a/code/game/machinery/portable_turret.dm +++ b/code/game/machinery/portable_turret.dm @@ -347,9 +347,9 @@ var/list/turret_icons /obj/machinery/porta_turret/proc/take_damage(var/force) if(!raised && !raising) - if(force < 10) - return force = force / 8 + if(force < 5) + return health -= force if (force > 5 && prob(45)) @@ -361,9 +361,6 @@ var/list/turret_icons if(Proj.damage_type == HALLOSS) return - if(!raised && !raising) - return - if(enabled) if(!attacked && !emagged) attacked = 1 diff --git a/code/modules/mob/mob.dm b/code/modules/mob/mob.dm index f133330997a..49e02b6e795 100644 --- a/code/modules/mob/mob.dm +++ b/code/modules/mob/mob.dm @@ -376,6 +376,7 @@ 'html/hard-hat-exclamation.png', 'html/image-minus.png', 'html/image-plus.png', + 'html/map-pencil.png', 'html/music-minus.png', 'html/music-plus.png', 'html/tick-circle.png',