diff --git a/code/game/machinery/doors/airlock_electronics.dm b/code/game/machinery/doors/airlock_electronics.dm index 48b3b23bfed..0b5271f4976 100644 --- a/code/game/machinery/doors/airlock_electronics.dm +++ b/code/game/machinery/doors/airlock_electronics.dm @@ -21,19 +21,19 @@ if(H.brainloss >= 60) return - var/t1 = text("Настройка доступа
\n") + var/t1 = text("Access control
\n") if (last_configurator) - t1 += "Настройщик: [last_configurator]
" + t1 += "Operator: [last_configurator]
" if (locked) - t1 += "Вставьте ID
" + t1 += "Swipe ID
" else - t1 += "Заблокировать
" + t1 += "Block
" - t1 += conf_access == null ? "Все
" : "Все
" + t1 += conf_access == null ? "All
" : "All
" t1 += "
" @@ -46,7 +46,7 @@ else t1 += "[aname]
" - t1 += text("

Закрыть

\n", src) + t1 += text("

Close

\n", src) user << browse(t1, "window=airlock_electronics") onclose(user, "airlock") diff --git a/code/game/master_controller.dm b/code/game/master_controller.dm index 169a15cb85a..0a298a68cc3 100644 --- a/code/game/master_controller.dm +++ b/code/game/master_controller.dm @@ -72,7 +72,7 @@ datum/controller/game_controller for(var/mob/M in world) if (M.metabslow) - if (air_master.current_cycle%5==1) // For everyone who has their metabolism slowed, make updates not so frequently + if (air_master.current_cycle%10==1) // For everyone who has their metabolism slowed, make updates not so frequently M.Life() else M.Life() diff --git a/code/modules/mob/living/carbon/human/examine.dm b/code/modules/mob/living/carbon/human/examine.dm index 67e0f220560..7c0bb6e1779 100644 --- a/code/modules/mob/living/carbon/human/examine.dm +++ b/code/modules/mob/living/carbon/human/examine.dm @@ -103,7 +103,7 @@ if (src.nutrition < 100) usr << "\red [src.name] looks like flesh and bones." - else if (src.nutrition >= 600) + else if (src.nutrition >= 500) if (usr.nutrition < 100) usr << "\red [src.name] looks very round and delicious. Like a little piggy. A tasty piggy." else diff --git a/code/modules/mob/living/carbon/human/hud.dm b/code/modules/mob/living/carbon/human/hud.dm index a86f2ff95e0..9ac4706979b 100644 --- a/code/modules/mob/living/carbon/human/hud.dm +++ b/code/modules/mob/living/carbon/human/hud.dm @@ -427,9 +427,9 @@ mymob.healths.screen_loc = ui_health mymob.nutrition_icon = new /obj/screen( null ) - mymob.nutrition_icon.icon = 'fullness.dmi' - mymob.nutrition_icon.icon_state = "fullness0" - mymob.nutrition_icon.name = "fullness" + mymob.nutrition_icon.icon = ui_style + mymob.nutrition_icon.icon_state = "nutrition0" + mymob.nutrition_icon.name = "nutrition" mymob.nutrition_icon.screen_loc = ui_nutrition mymob.pullin = new /obj/screen( null ) @@ -566,7 +566,7 @@ mymob.client.screen = null //, mymob.i_select, mymob.m_select - mymob.client.screen += list( mymob.throw_icon, mymob.zone_sel, mymob.oxygen, mymob.toxin, mymob.bodytemp, mymob.internals, mymob.fire, mymob.hands, mymob.healths, mymob.pullin, mymob.blind, mymob.flash, mymob.rest, mymob.sleep) //, mymob.mach ) + mymob.client.screen += list( mymob.throw_icon, mymob.zone_sel, mymob.oxygen, mymob.toxin, mymob.bodytemp, mymob.internals, mymob.fire, mymob.hands, mymob.healths, mymob.nutrition_icon, mymob.pullin, mymob.blind, mymob.flash, mymob.rest, mymob.sleep) //, mymob.mach ) mymob.client.screen += src.adding + src.other //if(istype(mymob,/mob/living/carbon/monkey)) mymob.client.screen += src.mon_blo diff --git a/code/modules/mob/living/carbon/human/life.dm b/code/modules/mob/living/carbon/human/life.dm index 1e2bfd3bf69..55a6b547c35 100644 --- a/code/modules/mob/living/carbon/human/life.dm +++ b/code/modules/mob/living/carbon/human/life.dm @@ -742,15 +742,15 @@ if (src.nutrition_icon) switch(nutrition) if(450 to INFINITY) - src.nutrition_icon.icon_state = "fullness0" + src.nutrition_icon.icon_state = "nutrition0" if(350 to 450) - src.nutrition_icon.icon_state = "fullness1" + src.nutrition_icon.icon_state = "nutrition1" if(250 to 350) - src.nutrition_icon.icon_state = "fullness2" + src.nutrition_icon.icon_state = "nutrition2" if(150 to 250) - src.nutrition_icon.icon_state = "fullness3" + src.nutrition_icon.icon_state = "nutrition3" else - src.nutrition_icon.icon_state = "fullness4" + src.nutrition_icon.icon_state = "nutrition4" if(src.pullin) src.pullin.icon_state = "pull[src.pulling ? 1 : 0]" diff --git a/code/setup.dm b/code/setup.dm index 8c493920978..e1cd0257b55 100644 --- a/code/setup.dm +++ b/code/setup.dm @@ -19,7 +19,7 @@ //Amount of air needed before pass out/suffocation commences // Factor of how fast mob nutriment decreases -#define HUNGER_FACTOR 0.15 +#define HUNGER_FACTOR 0.1 #define MINIMUM_AIR_RATIO_TO_SUSPEND 0.05 diff --git a/icons/mob/screen1.dmi b/icons/mob/screen1.dmi index d9fd54d1e09..077a9fd8fe6 100644 Binary files a/icons/mob/screen1.dmi and b/icons/mob/screen1.dmi differ diff --git a/icons/mob/screen1_old.dmi b/icons/mob/screen1_old.dmi index a40d3f68a60..93d03e44ab3 100644 Binary files a/icons/mob/screen1_old.dmi and b/icons/mob/screen1_old.dmi differ