From 9ecfe0d311350f1152dc076b1e8a9890af92120e Mon Sep 17 00:00:00 2001 From: VampyrBytes Date: Wed, 13 Aug 2014 11:07:07 +0100 Subject: [PATCH] Several fixes Fixes MP's being affected by radiation Fixes Nuke Ops MP's explosive implant not going off Fixes PDA Crew Manifest not showing support staff --- code/modules/mob/living/carbon/species.dm | 1 + code/modules/mob/living/damage_procs.dm | 9 +++++++++ nano/templates/pda.tmpl | 10 ++++++++++ 3 files changed, 20 insertions(+) diff --git a/code/modules/mob/living/carbon/species.dm b/code/modules/mob/living/carbon/species.dm index 8ed4f4de722..02ade71adaa 100644 --- a/code/modules/mob/living/carbon/species.dm +++ b/code/modules/mob/living/carbon/species.dm @@ -591,6 +591,7 @@ flesh_color = "#AAAAAA" /datum/species/machine/handle_death(var/mob/living/carbon/human/H) + H.emote("deathgasp") for(var/organ_name in H.organs_by_name) if (organ_name == "head") // do the head last as that's when the user will be transfered to the posibrain continue diff --git a/code/modules/mob/living/damage_procs.dm b/code/modules/mob/living/damage_procs.dm index cbeb9a349ef..1887b052ad0 100644 --- a/code/modules/mob/living/damage_procs.dm +++ b/code/modules/mob/living/damage_procs.dm @@ -64,6 +64,15 @@ return 1 +/mob/living/carbon/human/apply_effect(var/effect = 0,var/effecttype = STUN, var/blocked = 0) + if((species.flags & IS_SYNTHETIC) && (effecttype == IRRADIATE)) + return + return ..() + + +/mob/living/carbon/apply_effect(var/effect = 0,var/effecttype = STUN, var/blocked = 0) + return ..() + /mob/living/proc/apply_effects(var/stun = 0, var/weaken = 0, var/paralyze = 0, var/irradiate = 0, var/stutter = 0, var/eyeblur = 0, var/drowsy = 0, var/agony = 0, var/blocked = 0) if(blocked >= 2) return 0 if(stun) apply_effect(stun, STUN, blocked) diff --git a/nano/templates/pda.tmpl b/nano/templates/pda.tmpl index 8b59e4ac124..b88dda25c61 100644 --- a/nano/templates/pda.tmpl +++ b/nano/templates/pda.tmpl @@ -345,6 +345,16 @@ Used In File(s): \code\game\objects\items\devices\PDA\PDA.dm {{:value.name}}{{:value.rank}}{{:value.active}} {{/if}} {{/for}} + {{/if}} + {{if data.manifest.supp}} + Support + {{for data.manifest["supp"]}} + {{if value.rank == "Head of Personnel"}} + {{:value.name}}{{:value.rank}}{{:value.active}} + {{else}} + {{:value.name}}{{:value.rank}}{{:value.active}} + {{/if}} + {{/for}} {{/if}} {{if data.manifest.civ}} Civilian