cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-10 10:12:45 +00:00
Code Issues Packages Projects Releases Wiki Activity

Compatibility tweaks for new Polaris sync

Browse Source
This commit is contained in:
Arokha Sieyes
2016-07-03 17:21:03 -04:00
parent 484fb96202
commit ec07dbbb7d
4 changed files with 35 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
code/game/machinery/adv_med.dm
View File

@@ -387,7 +387,7 @@
occupantData["blind"] = (H.sdisabilities & BLIND) occupantData["blind"] = (H.sdisabilities & BLIND)
occupantData["nearsighted"] = (H.disabilities & NEARSIGHTED) occupantData["nearsighted"] = (H.disabilities & NEARSIGHTED)
occupantData = attempt_vr(src,"get_occupant_data_vr",list(occupantData,H)) //VOREStation Insert occupantData = attempt_vr(connected,"get_occupant_data_vr",list(occupantData,H)) //VOREStation Insert
data["occupant"] = occupantData data["occupant"] = occupantData
ui = nanomanager.try_update_ui(user, src, ui_key, ui, data, force_open) ui = nanomanager.try_update_ui(user, src, ui_key, ui, data, force_open)

16
code/game/machinery/adv_med_vr.dm
View File

@@ -13,19 +13,9 @@
else else
objectprey++ objectprey++
incoming["livingprey"] = livingprey incoming["livingPrey"] = livingprey
incoming["humanprey"] = humanprey incoming["humanPrey"] = humanprey
incoming["objectprey"] = objectprey incoming["objectPrey"] = objectprey
incoming["weight"] = H.weight incoming["weight"] = H.weight
return incoming return incoming
/obj/machinery/body_scanconsole/proc/format_occupant_data_vr(list/incoming)
var/message = ""
message += text("Body Weight (to scale): [incoming["weight"]]lbs / [incoming["weight"] / 2.20463]kg<br><HR>")
if(incoming["livingprey"] || incoming["humanprey"] || incoming["objectprey"])
message += text("<font color='red'>Foreign bodies detected:<br>[incoming["humanprey"] ? "- [incoming["humanprey"]] humanoid(s)<br>" : ""][incoming["livingprey"] ? "- [incoming["humanprey"]] non-humanoid(s)<br>" : ""][incoming["objectprey"] ? "- [incoming["humanprey"]] object(s)<br>" : ""]</font><hr>")
return message

12
code/modules/reagents/Chemistry-Recipes_vr.dm
View File

@@ -87,11 +87,11 @@
var/list/borks = typesof(/obj/item/weapon/reagent_containers/food/snacks) - /obj/item/weapon/reagent_containers/food/snacks // BORK BORK BORK var/list/borks = typesof(/obj/item/weapon/reagent_containers/food/snacks) - /obj/item/weapon/reagent_containers/food/snacks // BORK BORK BORK
playsound(get_turf(holder.my_atom), 'sound/effects/phasein.ogg', 100, 1) playsound(get_turf(holder.my_atom), 'sound/effects/phasein.ogg', 100, 1)
/* Removed at some point, unsure what to replace with
for(var/mob/living/carbon/human/M in viewers(get_turf(holder.my_atom), null)) for(var/mob/living/carbon/human/M in viewers(get_turf(holder.my_atom), null))
if(M:eyecheck() <= 0) if(M:eyecheck() <= 0)
flick("e_flash", M.flash) flick("e_flash", M.flash)
*/
for(var/i = 1, i <= 4 + rand(1,2), i++) for(var/i = 1, i <= 4 + rand(1,2), i++)
var/chosen = pick(borks) var/chosen = pick(borks)
var/obj/B = new chosen var/obj/B = new chosen
@@ -134,11 +134,11 @@
var/list/material = typesof(/obj/item/stack/material) - blocked var/list/material = typesof(/obj/item/stack/material) - blocked
playsound(get_turf(holder.my_atom), 'sound/effects/phasein.ogg', 100, 1) playsound(get_turf(holder.my_atom), 'sound/effects/phasein.ogg', 100, 1)
/* Removed at some point, unsure what to replace with
for(var/mob/living/carbon/human/M in viewers(get_turf(holder.my_atom), null)) for(var/mob/living/carbon/human/M in viewers(get_turf(holder.my_atom), null))
if(M:eyecheck() <= 0) if(M:eyecheck() <= 0)
flick("e_flash", M.flash) flick("e_flash", M.flash)
*/
var/spawn_amount = rand(1,50) var/spawn_amount = rand(1,50)
var/chosen = pick(material) var/chosen = pick(material)
var/obj/item/stack/material/C = new chosen var/obj/item/stack/material/C = new chosen
@@ -269,11 +269,11 @@
var/list/voremobs = typesof(mob_path) - mob_path - blocked // list of possible hostile mobs var/list/voremobs = typesof(mob_path) - mob_path - blocked // list of possible hostile mobs
playsound(get_turf(holder.my_atom), 'sound/effects/phasein.ogg', 100, 1) playsound(get_turf(holder.my_atom), 'sound/effects/phasein.ogg', 100, 1)
/* Removed at some point, unsure what to replace with
for(var/mob/living/carbon/human/M in viewers(get_turf(holder.my_atom), null)) for(var/mob/living/carbon/human/M in viewers(get_turf(holder.my_atom), null))
if(M:eyecheck() <= 0) if(M:eyecheck() <= 0)
flick("e_flash", M.flash) flick("e_flash", M.flash)
*/
var/spawn_count = rand(1,3) var/spawn_count = rand(1,3)
for(var/i = 1, i <= spawn_count, i++) for(var/i = 1, i <= spawn_count, i++)
var/chosen = pick(voremobs) var/chosen = pick(voremobs)

25
nano/templates/adv_med.tmpl
View File

@@ -67,6 +67,31 @@ Used In File(s): \code\game\machinery\adv_med.dm
<td class='itemLabelNarrow'>Body Temperature:</td> <td class='itemLabelNarrow'>Body Temperature:</td>
<td class="itemContentMedium">{{:helper.round(data.occupant.bodyTempC*10)/10}}&deg;C, {{:helper.round(data.occupant.bodyTempF*10)/10}}&deg;F</td> <td class="itemContentMedium">{{:helper.round(data.occupant.bodyTempC*10)/10}}&deg;C, {{:helper.round(data.occupant.bodyTempF*10)/10}}&deg;F</td>
</tr> </tr>
<!-- VORESTATION SECTION -->
<tr>
<td class='itemLabelNarrow'>Body Weight:</td>
<td class='itemContentMedium'>{{:helper.round(data.occupant.weight)}} lbs, {{:helper.round(
data.occupant.weight/2.20463)}} kgs</td>
{{if data.occupant.humanPrey}}
<tr>
<td class='itemLabel brute'>Foreign Humanoids:</td>
<td class='itemContent brute'>{{:data.occupant.humanPrey}}</td>
</tr>
{{/if}}
{{if data.occupant.livingPrey}}
<tr>
<td class='itemLabel brute'>Foreign Creatures:</td>
<td class='itemContent brute'>{{:data.occupant.livingPrey}}</td>
</tr>
{{/if}}
{{if data.occupant.objectPrey}}
<tr>
<td class='itemLabel brute'>Foreign Objects:</td>
<td class='itemContent brute'>{{:data.occupant.objectPrey}}</td>
</tr>
{{/if}}
<!-- VORESTATION END -->
</table> </table>
</div> </div>
{{if data.occupant.hasVirus}} {{if data.occupant.hasVirus}}