From 958a1c64b37402d35d81369ca52dc917bc3e3060 Mon Sep 17 00:00:00 2001 From: GinjaNinja32 Date: Thu, 9 Apr 2015 16:05:53 +0100 Subject: [PATCH 1/2] Fixes PDA detonation runtime Fixes #8609 --- code/game/objects/items/devices/PDA/PDA.dm | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) mode change 100755 => 100644 code/game/objects/items/devices/PDA/PDA.dm diff --git a/code/game/objects/items/devices/PDA/PDA.dm b/code/game/objects/items/devices/PDA/PDA.dm old mode 100755 new mode 100644 index f4f3b843b0..b2ae15832e --- a/code/game/objects/items/devices/PDA/PDA.dm +++ b/code/game/objects/items/devices/PDA/PDA.dm @@ -825,7 +825,8 @@ var/global/list/obj/item/device/pda/PDAs = list() difficulty += P.cartridge.access_engine difficulty += P.cartridge.access_clown difficulty += P.cartridge.access_janitor - difficulty += 3 * P.hidden_uplink + if(P.hidden_uplink) + difficulty += 3 if(prob(difficulty)) U.show_message("\red An error flashes on your [src].", 1) From b35fe67be8d2ae6ce67e800a6f72f4374b69115a Mon Sep 17 00:00:00 2001 From: GinjaNinja32 Date: Thu, 9 Apr 2015 16:08:33 +0100 Subject: [PATCH 2/2] Fixes robot Life() runtime Fixes #8610 --- code/modules/mob/living/silicon/robot/life.dm | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/code/modules/mob/living/silicon/robot/life.dm b/code/modules/mob/living/silicon/robot/life.dm index 80e0f12cf1..8aaba03cb1 100644 --- a/code/modules/mob/living/silicon/robot/life.dm +++ b/code/modules/mob/living/silicon/robot/life.dm @@ -130,10 +130,11 @@ if (src.stat != 0) uneq_all() - if(!is_component_functioning("radio")) - radio.on = 0 - else - radio.on = 1 + if(radio) + if(!is_component_functioning("radio")) + radio.on = 0 + else + radio.on = 1 if(is_component_functioning("camera")) src.blinded = 0