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

Merge pull request #6618 from Zuhayr/dev

Browse Source 
Bunch of minor fixes for xenomorphs and borer husks.
This commit is contained in:
Snapshot
2014-10-06 16:36:30 -07:00
parent d51bcd12cc 2b3e3667d4
commit ee72baac69
17 changed files with 148 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -296,7 +296,8 @@
"tg_diseases_list" = H.viruses.Copy(),
"lung_ruptured" = H.is_lung_ruptured(),
"external_organs" = H.organs.Copy(),
"internal_organs" = H.internal_organs.Copy()
"internal_organs" = H.internal_organs.Copy(),
"species_organs" = H.species.has_organ //Just pass a reference for this, it shouldn't ever be modified outside of the datum.
)
return occupant_data
@@ -413,6 +414,7 @@
dat += "</tr>"
for(var/datum/organ/internal/i in occ["internal_organs"])
var/mech = ""
if(i.robotic == 1)
mech = "Assisted:"
@@ -439,6 +441,11 @@
dat += "</tr>"
dat += "</table>"
var/list/species_organs = occ["species_organs"]
for(var/organ_name in species_organs)
if(!locate(species_organs[organ_name]) in occ["internal_organs"])
dat += text("<font color='red'>No [organ_name] detected.</font><BR>")
if(occ["sdisabilities"] & BLIND)
dat += text("<font color='red'>Cataracts detected.</font><BR>")
if(occ["sdisabilities"] & NEARSIGHTED)