From 4cb94fbf5007ce15c751fc872ed12a91e63752bf Mon Sep 17 00:00:00 2001 From: Chinsky Date: Tue, 24 Dec 2013 09:33:00 +0300 Subject: [PATCH 1/4] Small pefomance boost for drying blood. Now using colors instead of icon procs. --- code/game/objects/effects/decals/Cleanable/humans.dm | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/code/game/objects/effects/decals/Cleanable/humans.dm b/code/game/objects/effects/decals/Cleanable/humans.dm index 4f472f864f..63b6385fef 100644 --- a/code/game/objects/effects/decals/Cleanable/humans.dm +++ b/code/game/objects/effects/decals/Cleanable/humans.dm @@ -59,9 +59,7 @@ /obj/effect/decal/cleanable/blood/proc/dry() name = "dried [src]" desc = "It's dark red and crusty. Someone is not doing their job." - var/icon/I = icon(icon,icon_state) - I.SetIntensity(0.7) - icon = I + color = "#999999" amount = 0 /obj/effect/decal/cleanable/blood/splatter From e3e569593dc3231940c0287b94e50566cbb6268d Mon Sep 17 00:00:00 2001 From: Chinsky Date: Tue, 24 Dec 2013 18:47:06 +0300 Subject: [PATCH 2/4] Fixed dried blood showin up as 'dried the blood' --- code/game/objects/effects/decals/Cleanable/humans.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/game/objects/effects/decals/Cleanable/humans.dm b/code/game/objects/effects/decals/Cleanable/humans.dm index 63b6385fef..0187d0a9af 100644 --- a/code/game/objects/effects/decals/Cleanable/humans.dm +++ b/code/game/objects/effects/decals/Cleanable/humans.dm @@ -57,7 +57,7 @@ amount-- /obj/effect/decal/cleanable/blood/proc/dry() - name = "dried [src]" + name = "dried [src.name]" desc = "It's dark red and crusty. Someone is not doing their job." color = "#999999" amount = 0 From 5071ea57ad684ce31d1dc62eb37d19bc2e44353e Mon Sep 17 00:00:00 2001 From: Chinsky Date: Wed, 25 Dec 2013 14:20:56 +0400 Subject: [PATCH 3/4] Fix for #3583 Hostile mobs now check adjacency before applying damage. --- code/modules/mob/living/simple_animal/hostile/bear.dm | 2 ++ code/modules/mob/living/simple_animal/hostile/hostile.dm | 2 ++ 2 files changed, 4 insertions(+) diff --git a/code/modules/mob/living/simple_animal/hostile/bear.dm b/code/modules/mob/living/simple_animal/hostile/bear.dm index 6fd7db5d10..f82ae07c57 100644 --- a/code/modules/mob/living/simple_animal/hostile/bear.dm +++ b/code/modules/mob/living/simple_animal/hostile/bear.dm @@ -125,6 +125,8 @@ ..(5) /mob/living/simple_animal/hostile/bear/AttackingTarget() + if(!Adjacent(target_mob)) + return emote( pick( list("slashes at [target_mob]", "bites [target_mob]") ) ) var/damage = rand(20,30) diff --git a/code/modules/mob/living/simple_animal/hostile/hostile.dm b/code/modules/mob/living/simple_animal/hostile/hostile.dm index 403c31b17f..2dcbe0d949 100644 --- a/code/modules/mob/living/simple_animal/hostile/hostile.dm +++ b/code/modules/mob/living/simple_animal/hostile/hostile.dm @@ -87,6 +87,8 @@ return 1 /mob/living/simple_animal/hostile/proc/AttackingTarget() + if(!Adjacent(target_mob)) + return if(isliving(target_mob)) var/mob/living/L = target_mob L.attack_animal(src) From 0c94d2892d65178b46ec855437cdc254efa46798 Mon Sep 17 00:00:00 2001 From: Chinsky Date: Wed, 25 Dec 2013 14:44:50 +0400 Subject: [PATCH 4/4] Fixes #4071 Emote needed "me" action first, using custom_emote instead. --- code/modules/mob/living/simple_animal/hostile/bear.dm | 8 ++++---- code/modules/mob/living/simple_animal/hostile/carp.dm | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/code/modules/mob/living/simple_animal/hostile/bear.dm b/code/modules/mob/living/simple_animal/hostile/bear.dm index f82ae07c57..b375755f54 100644 --- a/code/modules/mob/living/simple_animal/hostile/bear.dm +++ b/code/modules/mob/living/simple_animal/hostile/bear.dm @@ -79,7 +79,7 @@ if(stance_step in list(1,4,7)) //every 3 ticks var/action = pick( list( "growls at [target_mob]", "stares angrily at [target_mob]", "prepares to attack [target_mob]", "closely watches [target_mob]" ) ) if(action) - emote(action) + custom_emote(1,action) if(!found_mob) stance_step-- @@ -90,7 +90,7 @@ if(HOSTILE_STANCE_ATTACKING) if(stance_step >= 20) //attacks for 20 ticks, then it gets tired and needs to rest - emote( "is worn out and needs to rest" ) + custom_emote(1, "is worn out and needs to rest" ) stance = HOSTILE_STANCE_TIRED stance_step = 0 walk(src, 0) //This stops the bear's walking @@ -118,7 +118,7 @@ /mob/living/simple_animal/hostile/bear/FindTarget() . = ..() if(.) - emote("stares alertly at [.]") + custom_emote(1,"stares alertly at [.]") stance = HOSTILE_STANCE_ALERT /mob/living/simple_animal/hostile/bear/LoseTarget() @@ -127,7 +127,7 @@ /mob/living/simple_animal/hostile/bear/AttackingTarget() if(!Adjacent(target_mob)) return - emote( pick( list("slashes at [target_mob]", "bites [target_mob]") ) ) + custom_emote(1, pick( list("slashes at [target_mob]", "bites [target_mob]") ) ) var/damage = rand(20,30) diff --git a/code/modules/mob/living/simple_animal/hostile/carp.dm b/code/modules/mob/living/simple_animal/hostile/carp.dm index 353ca6156f..f1a5c15c4b 100644 --- a/code/modules/mob/living/simple_animal/hostile/carp.dm +++ b/code/modules/mob/living/simple_animal/hostile/carp.dm @@ -44,7 +44,7 @@ /mob/living/simple_animal/hostile/carp/FindTarget() . = ..() if(.) - emote("nashes at [.]") + custom_emote(1,"nashes at [.]") /mob/living/simple_animal/hostile/carp/AttackingTarget() . =..()