diff --git a/code/ZAS/Fire.dm b/code/ZAS/Fire.dm index c444f10610..8b692c5b13 100644 --- a/code/ZAS/Fire.dm +++ b/code/ZAS/Fire.dm @@ -205,6 +205,9 @@ datum/gas_mixture/proc/zburn(obj/effect/decal/cleanable/liquid_fuel/liquid, forc else total_fuel += liquid.amount + if(total_fuel == 0) + return 0 + //Calculate the firelevel. var/firelevel = calculate_firelevel(liquid) diff --git a/code/game/machinery/computer/card.dm b/code/game/machinery/computer/card.dm index 74c6d3f8e7..4498f1bb40 100644 --- a/code/game/machinery/computer/card.dm +++ b/code/game/machinery/computer/card.dm @@ -108,10 +108,57 @@ header += "
| Command | " + jobs_all += "||
| Special | "//Captain in special because he is head of heads ~Intercross21 + jobs_all += "Captain | " + jobs_all += "Custom | " + + counter = 0 + jobs_all += "
| Engineering | "//Orange + for(var/job in engineering_positions) + counter++ + if(counter >= 6) + jobs_all += "||
| " + counter = 0 + jobs_all += " | [replacetext(job, " ", " ")] | " + + counter = 0 + jobs_all += "|
| Medical | "//Green + for(var/job in medical_positions) + counter++ + if(counter >= 6) + jobs_all += "||
| " + counter = 0 + jobs_all += " | [replacetext(job, " ", " ")] | " + + counter = 0 + jobs_all += "|
| Science | "//Purple + for(var/job in science_positions) + counter++ + if(counter >= 6) + jobs_all += "||
| " + counter = 0 + jobs_all += " | [replacetext(job, " ", " ")] | " + + counter = 0 + jobs_all += "|
| Civilian | "//Grey + for(var/job in civilian_positions) + counter++ + if(counter >= 6) + jobs_all += "||
| " + counter = 0 + jobs_all += " | [replacetext(job, " ", " ")] | " + + if(istype(src,/obj/machinery/computer/card/centcom)) + counter = 0 + jobs_all += "|
| CentComm | "//Brown + for(var/job in get_all_centcom_jobs()) + if(counter >= 6) + jobs_all += "||
| " + counter = 0 + jobs_all += " | [replacetext(job, " ", " ")] | " var/body if (authenticated && modify) @@ -138,7 +185,7 @@ } function hideAll(){ var allJobsSlot = document.getElementById('alljobsslot'); - allJobsSlot.innerHTML = "show"; + allJobsSlot.innerHTML = "[(modify.assignment) ? modify.assignment : "Unassgied"]"; } "} carddesc += "