From e13625101f4ac40c08ecace5f34c9d3520f3ec65 Mon Sep 17 00:00:00 2001 From: "johnsonmt88@gmail.com" Date: Mon, 2 Apr 2012 23:47:03 +0000 Subject: [PATCH] Runtime fixes - Supply shuttle should now work and not runtime - Runtime fix for the Health HUD git-svn-id: http://tgstation13.googlecode.com/svn/trunk@3396 316c924e-a436-60f5-8080-3fe189b3f50e --- code/game/supplyshuttle.dm | 12 +++++++----- code/modules/clothing/glasses/hud.dm | 1 + 2 files changed, 8 insertions(+), 5 deletions(-) diff --git a/code/game/supplyshuttle.dm b/code/game/supplyshuttle.dm index fcfab2788ee..4ab1ca9904a 100644 --- a/code/game/supplyshuttle.dm +++ b/code/game/supplyshuttle.dm @@ -151,28 +151,30 @@ var/ordernum=0 //Check for mobs for(var/mob/living/M in world) var/area/A = get_area(M) - if(A.type == /area/supply/station) + if(!A.type) continue + if(A && A.type == /area/supply/station) return 0 //Check for beacons for(var/obj/item/device/radio/beacon/B in world) var/area/A = get_area(B) - if(A.type == /area/supply/station) + if(!A.type) continue + if(A && A.type == /area/supply/station) return 0 //Check for mechs. I think this was added because people were somehow on centcomm and bringing back centcomm mechs. for(var/obj/mecha/Mech in world) var/area/A = get_area(Mech) - if(A.type == /area/supply/station) + if(A && A.type == /area/supply/station) return 0 //Check for nuke disk This also prevents multiple nuke disks from being made -Nodrak for(var/obj/item/weapon/disk/nuclear/N) var/area/A = get_area(N) - if(A.type == /area/supply/station) + if(A && A.type == /area/supply/station) return 0 return 1 /* Teleport beacon -> wrapping paper -> backpack -> bodybag -> crate -> wrapping paper -> loaded on a mulebot That would be a teleport beacon inside of 6-layers deep in contents. Meaning you would have to add more loops or more checks. -This method wont take into account items developed in the future and doesn't take into account the items we have currently. +This method wont take into account storage items developed in the future and doesn't take into account the storage items we have currently. -Nodrak var/shuttleat = supply_shuttle_at_station ? SUPPLY_STATION_AREATYPE : SUPPLY_DOCK_AREATYPE diff --git a/code/modules/clothing/glasses/hud.dm b/code/modules/clothing/glasses/hud.dm index 3fe392f5d86..584bf89c6af 100644 --- a/code/modules/clothing/glasses/hud.dm +++ b/code/modules/clothing/glasses/hud.dm @@ -52,6 +52,7 @@ for(var/datum/disease/D in patient.viruses) if(!D.hidden[SCANNER]) foundVirus++ + if(!C) continue C.images += image(tempHud,patient,"hud[RoundHealth(patient.health)]") if(patient.stat == 2) C.images += image(tempHud,patient,"huddead")