From b446ccb2ab359f02e7e83e45455580559151889e Mon Sep 17 00:00:00 2001 From: ccomp5950 Date: Mon, 22 Dec 2014 19:35:18 -0500 Subject: [PATCH 1/4] Remove Borg nightvision when special views aren't selected. Resolves #7452 --- code/modules/mob/living/silicon/robot/life.dm | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/code/modules/mob/living/silicon/robot/life.dm b/code/modules/mob/living/silicon/robot/life.dm index 0eedb1d9b47..8295687de9c 100644 --- a/code/modules/mob/living/silicon/robot/life.dm +++ b/code/modules/mob/living/silicon/robot/life.dm @@ -166,8 +166,9 @@ src.sight &= ~SEE_MOBS src.sight &= ~SEE_TURFS src.sight &= ~SEE_OBJS - src.see_in_dark = 8 - src.see_invisible = SEE_INVISIBLE_MINIMUM + src.see_in_dark = 8 // see_in_dark means you can FAINTLY see in the dark, humans have a range of 3 or so, tajaran have it at 8 + src.see_invisible = SEE_INVISIBLE_LIVING // This is normal vision (25), setting it lower for normal vision means you don't "see" things like darkness since darkness + // has a "invisible" value of 15 regular_hud_updates() From 3ba1b18b8fa893fbe591bc0b3bcb4980b3de7a0f Mon Sep 17 00:00:00 2001 From: ccomp5950 Date: Mon, 22 Dec 2014 19:53:44 -0500 Subject: [PATCH 2/4] Most PDA's now are set to silent on news updates. resolves #7454 Heads and Librarian(reporter) are not set to silent. The librarian can shush herself. old bitty. --- code/game/objects/items/devices/PDA/PDA.dm | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/code/game/objects/items/devices/PDA/PDA.dm b/code/game/objects/items/devices/PDA/PDA.dm index b69f85af388..f4b3b3308f3 100755 --- a/code/game/objects/items/devices/PDA/PDA.dm +++ b/code/game/objects/items/devices/PDA/PDA.dm @@ -28,7 +28,7 @@ var/global/list/obj/item/device/pda/PDAs = list() var/fon = 0 //Is the flashlight function on? var/f_lum = 2 //Luminosity for the flashlight function var/message_silent = 0 //To beep or not to beep, that is the question - var/news_silent = 0 //To beep or not to beep, that is the question + var/news_silent = 1 //To beep or not to beep, that is the question. The answer is No. var/toff = 0 //If 1, messenger disabled var/tnote[0] //Current Texts var/last_text //No text spamming @@ -118,6 +118,7 @@ var/global/list/obj/item/device/pda/PDAs = list() /obj/item/device/pda/heads default_cartridge = /obj/item/weapon/cartridge/head icon_state = "pda-h" + news_silent = 1 /obj/item/device/pda/heads/hop default_cartridge = /obj/item/weapon/cartridge/hop @@ -190,7 +191,7 @@ var/global/list/obj/item/device/pda/PDAs = list() desc = "A portable microcomputer by Thinktronic Systems, LTD. This is model is a WGW-11 series e-reader." note = "Congratulations, your station has chosen the Thinktronic 5290 WGW-11 Series E-reader and Personal Data Assistant!" message_silent = 1 //Quiet in the library! - news_silent = 1 + news_silent = 0 // Librarian is above the law! (That and alt job title is reporter) /obj/item/device/pda/clear icon_state = "pda-transp" @@ -1023,7 +1024,7 @@ var/global/list/obj/item/device/pda/PDAs = list() /obj/item/device/pda/proc/new_info(var/beep_silent, var/message_tone, var/reception_message) if (!beep_silent) playsound(loc, 'sound/machines/twobeep.ogg', 50, 1) - for (var/mob/O in hearers(3, loc)) + for (var/mob/O in hearers(2, loc)) O.show_message(text("\icon[src] *[message_tone]*")) //Search for holder of the PDA. var/mob/living/L = null @@ -1041,8 +1042,9 @@ var/global/list/obj/item/device/pda/PDAs = list() /obj/item/device/pda/proc/new_news(var/message) new_info(news_silent, newstone, news_silent ? "" : "\icon[src] [message]") - new_news = 1 - update_icon() + if(!news_silent) + new_news = 1 + update_icon() /obj/item/device/pda/ai/new_news(var/message) // Do nothing From 66ac2d6e058a34174f9236adad9b50be5d89207a Mon Sep 17 00:00:00 2001 From: ccomp5950 Date: Mon, 22 Dec 2014 20:45:37 -0500 Subject: [PATCH 3/4] Added "give them their breath back" to admin_revive. Prevents perpetual oxyloss after a revive. --- code/modules/mob/living/carbon/human/human.dm | 3 +++ 1 file changed, 3 insertions(+) diff --git a/code/modules/mob/living/carbon/human/human.dm b/code/modules/mob/living/carbon/human/human.dm index a3143e6b88f..bf92a76cb27 100644 --- a/code/modules/mob/living/carbon/human/human.dm +++ b/code/modules/mob/living/carbon/human/human.dm @@ -965,6 +965,9 @@ var/datum/disease2/disease/V = virus2[ID] V.cure(src) + losebreath = 0 + failed_last_breath = 0 //So mobs that died of oxyloss don't revive and have perpetual out of breath. + ..() /mob/living/carbon/human/proc/is_lung_ruptured() From 0a63932d48c0911f72e28b713bee47a304b3477d Mon Sep 17 00:00:00 2001 From: ccomp5950 Date: Mon, 22 Dec 2014 21:38:52 -0500 Subject: [PATCH 4/4] Simple Animals now no longer move while facing south all the time. Fucking weirdo's resolves #7396 for simple animals. --- code/modules/mob/living/simple_animal/simple_animal.dm | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/code/modules/mob/living/simple_animal/simple_animal.dm b/code/modules/mob/living/simple_animal/simple_animal.dm index 831f3aa83a4..4240dc9463c 100644 --- a/code/modules/mob/living/simple_animal/simple_animal.dm +++ b/code/modules/mob/living/simple_animal/simple_animal.dm @@ -95,7 +95,10 @@ turns_since_move++ if(turns_since_move >= turns_per_move) if(!(stop_automated_movement_when_pulled && pulledby)) //Soma animals don't move when pulled - Move(get_step(src,pick(cardinal))) + /var/moving_to = 0 // otherwise it always picks 4, fuck if I know. Did I mention fuck BYOND + moving_to = pick(cardinal) + dir = moving_to //How about we turn them the direction they are moving, yay. + Move(get_step(src,moving_to)) turns_since_move = 0 //Speaking @@ -371,4 +374,4 @@ message = capitalize(trim_left(message)) - ..(message, null, verb) \ No newline at end of file + ..(message, null, verb)