cyberpresidentvanellope/Polaris
1
0
Fork 0
mirror of https://github.com/PolarisSS13/Polaris.git synced 2026-01-03 14:03:25 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix leftover mymob calls and other things

Browse Source
This commit is contained in:
Rykka
2020-05-13 23:44:01 -04:00
parent c22411b2a4
commit eec5d912f7
3 changed files with 2 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
code/_onclick/hud/human.dm
View File

@@ -253,30 +253,6 @@
mymob.healths.screen_loc = ui_health
hud_elements |= mymob.healths
if(hud_data.has_pressure)
mymob.pressure = new /obj/screen()
mymob.pressure.icon = ui_style
mymob.pressure.icon_state = "pressure0"
mymob.pressure.name = "pressure"
mymob.pressure.screen_loc = ui_pressure
hud_elements |= mymob.pressure
if(hud_data.has_bodytemp)
mymob.bodytemp = new /obj/screen()
mymob.bodytemp.icon = ui_style
mymob.bodytemp.icon_state = "temp1"
mymob.bodytemp.name = "body temperature"
mymob.bodytemp.screen_loc = ui_temp
hud_elements |= mymob.bodytemp
if(hud_data.has_nutrition)
mymob.nutrition_icon = new /obj/screen()
mymob.nutrition_icon.icon = ui_style
mymob.nutrition_icon.icon_state = "nutrition0"
mymob.nutrition_icon.name = "nutrition"
mymob.nutrition_icon.screen_loc = ui_nutrition
hud_elements |= mymob.nutrition_icon
mymob.ling_chem_display = new /obj/screen/ling/chems()
mymob.ling_chem_display.screen_loc = ui_ling_chemical_display
mymob.ling_chem_display.icon_state = "ling_chems"

8
code/modules/mob/living/carbon/human/life.dm
View File

@@ -1218,13 +1218,7 @@
var/hungry_alert = /obj/screen/alert/hungry
var/starving_alert = /obj/screen/alert/starving
if(get_species() == SPECIES_CUSTOM)
var/datum/species/custom/C = species
if(/datum/trait/bloodsucker in C.traits)
fat_alert = /obj/screen/alert/fat/vampire
hungry_alert = /obj/screen/alert/hungry/vampire
starving_alert = /obj/screen/alert/starving/vampire
else if(isSynthetic())
if(isSynthetic())
fat_alert = /obj/screen/alert/fat/synth
hungry_alert = /obj/screen/alert/hungry/synth
starving_alert = /obj/screen/alert/starving/synth

2
code/modules/organs/organ_external.dm
View File

@@ -1364,5 +1364,5 @@ Note that amputating the affected organ does in fact remove the infection from t
. = 0
for(var/obj/item/organ/external/L in organs)
for(var/obj/item/I in L.implants)
if(!istype(I,/obj/item/weapon/implant) && !istype(I,/obj/item/device/nif))
if(!istype(I,/obj/item/weapon/implant))
return 1