From 5d662e4392a7b100a2d1e6d8c5e17de543b98d30 Mon Sep 17 00:00:00 2001 From: Zuhayr Date: Mon, 5 May 2014 14:49:25 +0930 Subject: [PATCH] Robots will now take burn damage from appropriate projectiles, rather than recieving brute. --- code/modules/mob/living/silicon/silicon.dm | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/code/modules/mob/living/silicon/silicon.dm b/code/modules/mob/living/silicon/silicon.dm index e07a1975004..ba8e18c65d0 100644 --- a/code/modules/mob/living/silicon/silicon.dm +++ b/code/modules/mob/living/silicon/silicon.dm @@ -113,8 +113,17 @@ return 1 /mob/living/silicon/bullet_act(var/obj/item/projectile/Proj) - if(!Proj.nodamage) adjustBruteLoss(Proj.damage) + + + if(!Proj.nodamage) + switch(Proj.damage_type) + if(BRUTE) + adjustBruteLoss(Proj.damage) + if(BURN) + adjustFireLoss(Proj.damage) + Proj.on_hit(src,2) + return 2 /mob/living/silicon/apply_effect(var/effect = 0,var/effecttype = STUN, var/blocked = 0)