cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-08-29 23:17:02 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #2615 from tigercat2000/md5sumgoeshere-fucknanoedition

Browse Source 
HTML5 fixes, batch 1
This commit is contained in:
Fox McCloud
2015-11-21 01:44:44 -05:00
parent 843165e0e6 cd1803a454
commit 61d2ff3c4d
5 changed files with 115 additions and 110 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/game/machinery/computer/cloning.dm
+4 -4
View File
@@ -119,7 +119,7 @@
return
var/data[0]
data["menu"] = src.menu
data["scanner"] = src.scanner
data["scanner"] = sanitize("[src.scanner]")
var/canpodautoprocess = 0
if(pods.len)
@@ -130,7 +130,7 @@
if(pod.efficiency > 5)
canpodautoprocess = 1
tempods.Add(list(list("pod" = "\ref[pod]", "name" = capitalize(pod.name), "biomass" = pod.biomass)))
tempods.Add(list(list("pod" = "\ref[pod]", "name" = sanitize(capitalize(pod.name)), "biomass" = pod.biomass)))
data["pods"] = tempods
data["loading"] = loading
@@ -150,7 +150,7 @@
var/list/temprecords[0]
for(var/datum/dna2/record/R in records)
var tempRealName = R.dna.real_name
temprecords.Add(list(list("record" = "\ref[R]", "realname" = tempRealName)))
temprecords.Add(list(list("record" = "\ref[R]", "realname" = sanitize(tempRealName))))
data["records"] = temprecords
if(src.menu == 3)
@@ -162,7 +162,7 @@
if ((H) && (istype(H)))
data["health"] = H.sensehealth()
data["realname"] = src.active_record.dna.real_name
data["realname"] = sanitize(src.active_record.dna.real_name)
data["unidentity"] = src.active_record.dna.uni_identity
data["strucenzymes"] = src.active_record.dna.struc_enzymes
if(selected_pod && (selected_pod in pods) && selected_pod.biomass >= CLONE_BIOMASS)
code/game/objects/items/devices/paicard.dm
+1 -1
View File
@@ -233,7 +233,7 @@
return
if(pai)
if(!in_range(src, U) || pai.canmove || pai.resting)
if(!in_range(src, U))
U << browse(null, "window=paicard")
usr.unset_machine()
return
code/modules/mob/living/silicon/pai/software.dm
+2 -2
View File
@@ -92,8 +92,8 @@ var/global/list/default_pai_software = list()
ui.set_auto_update(1)
/mob/living/silicon/pai/Topic(href, href_list)
. = ..()
if(.) return
if(..())
return 1
if(href_list["software"])
var/soft = href_list["software"]
nano/templates/cloning_console.tmpl
+7 -3
View File
@@ -65,17 +65,21 @@ Used In File(s): \code\game\machinery\computer\cloning.dm
{{if data.numberofpods}}
<h2>Pods</h2>
{{for data.pods}}
<div class="item">
<b>{{:value.name}}</b>
<b>{{:value.name}}</b></br>
<div class="item">
<div class="itemLabelNarrow">Biomass</div>
<div class="itemContentWide{{if value.biomass > 0}} good{{else}} bad{{/if}}">
{{:value.biomass}}
</div>
</div>
<div class="item">
<div class="itemLabelNarrow">Select</div>
<div class="itemContentWide">
{{:helper.link('Select', 'check', {'selectpod' : value.pod}, value.pod == data.selected_pod ? 'selected' : '')}}
</div>
</div>
{{/for}}
{{/if}}
{{/if}}
@@ -108,7 +112,7 @@ Used In File(s): \code\game\machinery\computer\cloning.dm
</div>
<div class="item">
<b>UI:</b> {{:data.unidentity}}<br />
<b>SE:</b> {{:data.strucenzymes}}
<b>SE:</b> <div style="word-wrap: break-word;">{{:data.strucenzymes}}</div>
</div>
{{if data.disk}}
<div class="item">
nano/templates/cryo.tmpl
+101 -100
View File
@@ -1,106 +1,107 @@
<!--
Title: Cryo Cell Status UI
Used In File(s): \code\game\machinery\cryo.dm
-->
<h3>Cryo Cell Status</h3>
<!--
Title: Cryo Cell Status UI
Used In File(s): \code\game\machinery\cryo.dm
-->
<h3>Cryo Cell Status</h3>
<div class="statusDisplay">
{{if !data.hasOccupant}}
<div class="line">Cell Unoccupied</div>
{{else}}
<div class="line">
{{:data.occupant.name}}&nbsp;=>&nbsp;
{{if data.occupant.stat == 0}}
<span class="good">Conscious</span>
{{else data.occupant.stat == 1}}
<span class="average">Unconscious</span>
{{else}}
<span class="bad">DEAD</span>
{{/if}}
</div>
{{if data.occupant.stat < 2}}
<div class="line">
<div class="statusLabel">Health:</div>
{{if data.occupant.health >= 0}}
{{:helper.displayBar(data.occupant.health, 0, data.occupant.maxHealth, 'good')}}
{{else}}
{{:helper.displayBar(data.occupant.health, 0, data.occupant.minHealth, 'average alignRight')}}
{{/if}}
<div class="statusValue">{{:helper.round(data.occupant.health)}}</div>
</div>
<div class="line">
<div class="statusLabel">=&gt; Brute Damage:</div>
{{:helper.displayBar(data.occupant.bruteLoss, 0, data.occupant.maxHealth, 'bad')}}
<div class="statusValue">{{:helper.round(data.occupant.bruteLoss)}}</div>
</div>
<div class="line">
<div class="statusLabel">=&gt; Resp. Damage:</div>
{{:helper.displayBar(data.occupant.oxyLoss, 0, data.occupant.maxHealth, 'bad')}}
<div class="statusValue">{{:helper.round(data.occupant.oxyLoss)}}</div>
</div>
<div class="line">
<div class="statusLabel">=&gt; Toxin Damage:</div>
{{:helper.displayBar(data.occupant.toxLoss, 0, data.occupant.maxHealth, 'bad')}}
<div class="statusValue">{{:helper.round(data.occupant.toxLoss)}}</div>
</div>
<div class="line">
<div class="statusLabel">=&gt; Burn Severity:</div>
{{:helper.displayBar(data.occupant.fireLoss, 0, data.occupant.maxHealth, 'bad')}}
<div class="statusValue">{{:helper.round(data.occupant.fireLoss)}}</div>
</div>
{{/if}}
{{/if}}
<hr>
<div class="line">
<div class="statusLabel">Cell Temperature:</div><div class="statusValue">
<span class="{{:data.cellTemperatureStatus}}">{{:data.cellTemperature}} K</span>
</div>
</div>
</div>
<h3>Cryo Cell Operation</h3>
<div class="item">
<div class="itemLabel">
Cryo Cell Status:
</div>
<div class="itemContent" style="width: 40%;">
{{:helper.link('On', 'power', {'switchOn' : 1}, data.isOperating ? 'selected' : null)}}{{:helper.link('Off', 'close', {'switchOff' : 1}, data.isOperating ? null : 'selected')}}
</div>
<div class="itemContent" style="width: 26%;">
{{:helper.link('Eject Occupant', 'arrowreturnthick-1-s', {'ejectOccupant' : 1}, data.hasOccupant ? null : 'disabled')}}
</div>
</div>
<div class="item">&nbsp;</div>
<div class="item">
<div class="itemLabel">
Beaker:
</div>
<div class="itemContent" style="width: 40%;">
{{if data.isBeakerLoaded}}
{{:data.beakerLabel ? data.beakerLabel : '<span class="average">No label</span>'}}<br>
{{if data.beakerVolume}}
<span class="highlight">{{:data.beakerVolume}} units remaining</span><br>
{{else}}
<span class="bad">Beaker is empty</span>
{{/if}}
<div class="statusDisplay">
{{if !data.hasOccupant}}
<div class="line">Cell Unoccupied</div>
{{else}}
<span class="average"><i>No beaker loaded</i></span>
<div class="line">
{{:data.occupant.name}}&nbsp;=>&nbsp;
{{if data.occupant.stat == 0}}
<span class="good">Conscious</span>
{{else data.occupant.stat == 1}}
<span class="average">Unconscious</span>
{{else}}
<span class="bad">DEAD</span>
{{/if}}
</div>
{{if data.occupant.stat < 2}}
<div class="line">
<div class="statusLabel">Health:</div>
{{if data.occupant.health >= 0}}
{{:helper.displayBar(data.occupant.health, 0, data.occupant.maxHealth, 'good')}}
{{else}}
{{:helper.displayBar(data.occupant.health, 0, data.occupant.minHealth, 'average alignRight')}}
{{/if}}
<div class="statusValue">{{:helper.round(data.occupant.health)}}</div>
</div>
<div class="line">
<div class="statusLabel">=&gt; Brute Damage:</div>
{{:helper.displayBar(data.occupant.bruteLoss, 0, data.occupant.maxHealth, 'bad')}}
<div class="statusValue">{{:helper.round(data.occupant.bruteLoss)}}</div>
</div>
<div class="line">
<div class="statusLabel">=&gt; Resp. Damage:</div>
{{:helper.displayBar(data.occupant.oxyLoss, 0, data.occupant.maxHealth, 'bad')}}
<div class="statusValue">{{:helper.round(data.occupant.oxyLoss)}}</div>
</div>
<div class="line">
<div class="statusLabel">=&gt; Toxin Damage:</div>
{{:helper.displayBar(data.occupant.toxLoss, 0, data.occupant.maxHealth, 'bad')}}
<div class="statusValue">{{:helper.round(data.occupant.toxLoss)}}</div>
</div>
<div class="line">
<div class="statusLabel">=&gt; Burn Severity:</div>
{{:helper.displayBar(data.occupant.fireLoss, 0, data.occupant.maxHealth, 'bad')}}
<div class="statusValue">{{:helper.round(data.occupant.fireLoss)}}</div>
</div>
{{/if}}
{{/if}}
<br>
<hr>
<div class="line">
<div class="statusLabel">Cell Temperature:</div><div class="statusValue">
<span class="{{:data.cellTemperatureStatus}}">{{:data.cellTemperature}} K</span>
</div>
</div>
</div>
<div class="itemContent" style="width: 26%;">
{{:helper.link('Eject Beaker', 'eject', {'ejectBeaker' : 1}, data.isBeakerLoaded ? null : 'disabled')}}
<h3>Cryo Cell Operation</h3>
<div class="item">
<div class="itemLabel">
Cryo Cell Status:
</div>
<div class="itemContent" style="width: 40%;">
{{:helper.link('On', 'power', {'switchOn' : 1}, data.isOperating ? 'selected' : null)}}{{:helper.link('Off', 'close', {'switchOff' : 1}, data.isOperating ? null : 'selected')}}
</div>
<div class="itemContent" style="width: 26%;">
{{:helper.link('Eject Occupant', 'arrowreturnthick-1-s', {'ejectOccupant' : 1}, data.hasOccupant ? null : 'disabled')}}
</div>
</div>
</div>
<div class="item">
<div class="itemLabel" style="width: 70%">
Auto-eject:
<div class="item">&nbsp;</div>
<div class="item">
<div class="itemLabel">
Beaker:
</div>
<div class="itemContent" style="width: 40%;">
{{if data.isBeakerLoaded}}
{{:data.beakerLabel ? data.beakerLabel : '<span class="average">No label</span>'}}<br>
{{if data.beakerVolume}}
<span class="highlight">{{:data.beakerVolume}} units remaining</span><br>
{{else}}
<span class="bad">Beaker is empty</span>
{{/if}}
{{else}}
<span class="average"><i>No beaker loaded</i></span>
{{/if}}
</div>
<div class="itemContent" style="width: 26%;">
{{:helper.link('Eject Beaker', 'eject', {'ejectBeaker' : 1}, data.isBeakerLoaded ? null : 'disabled')}}
</div>
</div>
<div class="itemContent" style="width: 30%;">
{{:helper.link('On', 'power', {'autoejectOn' : 1}, data.autoeject ? 'selected' : null)}}{{:helper.link('Off', 'close', {'autoejectOff' : 1}, data.autoeject ? null : 'selected')}}
</div>
</div>
<div class="item">
<div class="itemLabel" style="width: 70%">
Auto-eject:
</div>
<div class="itemContent" style="width: 30%;">
{{:helper.link('On', 'power', {'autoejectOn' : 1}, data.autoeject ? 'selected' : null)}}{{:helper.link('Off', 'close', {'autoejectOff' : 1}, data.autoeject ? null : 'selected')}}
</div>
</div>