From 359e05546300bf2e6ca156f3c72a428b34573cf7 Mon Sep 17 00:00:00 2001 From: Kelenius Date: Mon, 25 May 2015 19:11:14 +0300 Subject: [PATCH 1/7] Lets medical scanners scan stomach --- code/game/objects/items/devices/scanners.dm | 21 +++++++++++++++------ 1 file changed, 15 insertions(+), 6 deletions(-) diff --git a/code/game/objects/items/devices/scanners.dm b/code/game/objects/items/devices/scanners.dm index a29d39743ed..1d585c9c894 100644 --- a/code/game/objects/items/devices/scanners.dm +++ b/code/game/objects/items/devices/scanners.dm @@ -139,14 +139,15 @@ REAGENT SCANNER if(M.status_flags & FAKEDEATH) OX = fake_oxy > 50 ? "\red Severe oxygen deprivation detected\blue" : "Subject bloodstream oxygen level normal" user.show_message("[OX] | [TX] | [BU] | [BR]") - if (istype(M, /mob/living/carbon)) - if(M:reagents.total_volume > 0) + if(istype(M, /mob/living/carbon)) + var/mob/living/carbon/C = M + if(C.reagents.total_volume) var/unknown = 0 var/reagentdata[0] - for(var/A in M.reagents.reagent_list) + for(var/A in C.reagents.reagent_list) var/datum/reagent/R = A if(R.scannable) - reagentdata["[R.id]"] = "\t \blue [round(M.reagents.get_reagent_amount(R.id), 1)]u [R.name]" + reagentdata["[R.id]"] = "\t \blue [round(C.reagents.get_reagent_amount(R.id), 1)]u [R.name]" else unknown++ if(reagentdata.len) @@ -155,8 +156,16 @@ REAGENT SCANNER user.show_message(reagentdata[d]) if(unknown) user.show_message(text("\red Warning: Unknown substance[(unknown>1)?"s":""] detected in subject's blood.")) - if(M:virus2.len) - var/mob/living/carbon/C = M + if(C.ingested && C.ingested.total_volume) + var/unknown = 0 + for(var/datum/reagent/R in C.ingested.reagent_list) + if(R.scannable) + user << "[R.name] found in subject's stomach." + else + ++unknown + if(unknown) + user << "Non-medical reagent[(unknown > 1)?"s":""] found in subject's stomach." + if(C.virus2.len) for (var/ID in C.virus2) if (ID in virusDB) var/datum/data/record/V = virusDB[ID] From 98c585615ec99b4611f20911b08532dd983a3466 Mon Sep 17 00:00:00 2001 From: PsiOmega Date: Tue, 26 May 2015 09:04:26 +0200 Subject: [PATCH 2/7] Inactivity process tweaks. Partially by request: The inactive check process now respects client holder status and can be configured how long clients may remain inactive before being kicked. --- baystation12.dme | 4 ++-- code/controllers/Processes/inactivity.dm | 9 +++------ code/controllers/configuration.dm | 6 +++--- code/world.dm | 18 ------------------ config/example/config.txt | 4 ++-- 5 files changed, 10 insertions(+), 31 deletions(-) diff --git a/baystation12.dme b/baystation12.dme index 99fb3975790..4f5dd64c2b6 100644 --- a/baystation12.dme +++ b/baystation12.dme @@ -631,9 +631,9 @@ #include "code\game\objects\items\weapons\swords_axes_etc.dm" #include "code\game\objects\items\weapons\tape.dm" #include "code\game\objects\items\weapons\teleportation.dm" -#include "code\game\objects\items\weapons\tools.dm" +#include "code\game\objects\items\weapons\tools.dm" +#include "code\game\objects\items\weapons\traps.dm" #include "code\game\objects\items\weapons\trays.dm" -#include "code\game\objects\items\weapons\traps.dm" #include "code\game\objects\items\weapons\weaponry.dm" #include "code\game\objects\items\weapons\weldbackpack.dm" #include "code\game\objects\items\weapons\wires.dm" diff --git a/code/controllers/Processes/inactivity.dm b/code/controllers/Processes/inactivity.dm index d9f9206749b..cd01e24829a 100644 --- a/code/controllers/Processes/inactivity.dm +++ b/code/controllers/Processes/inactivity.dm @@ -1,16 +1,13 @@ /datum/controller/process/inactivity/setup() name = "inactivity" - schedule_interval = INACTIVITY_KICK + schedule_interval = 600 // Once every minute (approx.) /datum/controller/process/inactivity/doWork() if(config.kick_inactive) for(var/client/C in clients) - if(C.is_afk(INACTIVITY_KICK)) + if(!C.holder && C.is_afk(config.kick_inactive MINUTES)) if(!istype(C.mob, /mob/dead)) log_access("AFK: [key_name(C)]") - C << "You have been inactive for more than 10 minutes and have been disconnected." + C << "You have been inactive for more than [config.kick_inactive] minute\s and have been disconnected." del(C) // Don't qdel, cannot override finalize_qdel behaviour for clients. - scheck() - -#undef INACTIVITY_KICK diff --git a/code/controllers/configuration.dm b/code/controllers/configuration.dm index 98d56d3d237..adaab0540a3 100644 --- a/code/controllers/configuration.dm +++ b/code/controllers/configuration.dm @@ -63,7 +63,7 @@ var/list/gamemode_cache = list() var/guest_jobban = 1 var/usewhitelist = 0 var/mods_are_mentors = 0 - var/kick_inactive = 0 //force disconnect for inactive players + var/kick_inactive = 0 //force disconnect for inactive players after this many minutes, if non-0 var/load_jobs_from_txt = 0 var/ToRban = 0 var/automute_on = 0 //enables automuting/spam prevention @@ -114,7 +114,7 @@ var/list/gamemode_cache = list() var/organ_health_multiplier = 1 var/organ_regeneration_multiplier = 1 - + //Paincrit knocks someone down once they hit 60 shock_stage, so by default make it so that close to 100 additional damage needs to be dealt, //so that it's similar to HALLOSS. Lowered it a bit since hitting paincrit takes much longer to wear off than a halloss stun. var/organ_damage_spillover_multiplier = 0.5 @@ -460,7 +460,7 @@ var/list/gamemode_cache = list() config.allow_random_events = 1 if("kick_inactive") - config.kick_inactive = 1 + config.kick_inactive = text2num(value) if("load_jobs_from_txt") load_jobs_from_txt = 1 diff --git a/code/world.dm b/code/world.dm index acb7ad075d8..6f736b87445 100644 --- a/code/world.dm +++ b/code/world.dm @@ -78,8 +78,6 @@ var/global/datum/global_init/init = new () spawn(3000) //so we aren't adding to the round-start lag if(config.ToRban) ToRban_autoupdate() -/* if(config.kick_inactive) // handled in scheduler - KickInactiveClients()*/ #undef RECOMMENDED_VERSION @@ -218,22 +216,6 @@ var/world_topic_spam_protect_time = world.timeofday ..(reason) - -#define INACTIVITY_KICK 6000 //10 minutes in ticks (approx.) -/world/proc/KickInactiveClients() - spawn(-1) - set background = 1 - while(1) - sleep(INACTIVITY_KICK) - for(var/client/C in clients) - if(C.is_afk(INACTIVITY_KICK)) - if(!istype(C.mob, /mob/dead)) - log_access("AFK: [key_name(C)]") - C << "\red You have been inactive for more than 10 minutes and have been disconnected." - del(C) -//#undef INACTIVITY_KICK - - /hook/startup/proc/loadMode() world.load_mode() return 1 diff --git a/config/example/config.txt b/config/example/config.txt index a8dcac8e27f..01d0c40db94 100644 --- a/config/example/config.txt +++ b/config/example/config.txt @@ -70,8 +70,8 @@ LOG_PDA ## sql switching # SQL_ENABLED -## disconnect players who did nothing during 10 minutes -# KICK_INACTIVE +## disconnect players who did nothing during the set amount of minutes +# KICK_INACTIVE 10 ## Use Mentors instead of Moderators. Mentors are designed with the idea that ###they help in pushing new people to be better at roleplay. If you uncomment From c417955cb90834840d76c2960342be138755581d Mon Sep 17 00:00:00 2001 From: PsiOmega Date: Tue, 26 May 2015 09:04:36 +0200 Subject: [PATCH 3/7] Changelog entry. --- html/changelogs/PsiOmegaDelta-150526-Inactivity.yml | 4 ++++ 1 file changed, 4 insertions(+) create mode 100644 html/changelogs/PsiOmegaDelta-150526-Inactivity.yml diff --git a/html/changelogs/PsiOmegaDelta-150526-Inactivity.yml b/html/changelogs/PsiOmegaDelta-150526-Inactivity.yml new file mode 100644 index 00000000000..a10aa09d578 --- /dev/null +++ b/html/changelogs/PsiOmegaDelta-150526-Inactivity.yml @@ -0,0 +1,4 @@ +author: PsiOmegaDelta +delete-after: True +changes: + - tweak: "The inactive check process now respects client holder status and can be configured how long clients may remain inactive before being kicked." From 94277309c04c2331388b06ee2992428d66b97dc6 Mon Sep 17 00:00:00 2001 From: PsiOmega Date: Tue, 26 May 2015 16:48:16 +0200 Subject: [PATCH 4/7] HUD glasses overlay tweak. Reduces the alpha level and color intensity of the NVG and meson HUD overlays. --- icons/obj/hud_full.dmi | Bin 5906 -> 5908 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/icons/obj/hud_full.dmi b/icons/obj/hud_full.dmi index 04a2b548c63bb4718ce7fa5130faafa2b6b54b1d..875791f7bc157ca10855f021d7cb1e2ddd6270e7 100644 GIT binary patch delta 126 zcmbQFH$`v49y@1G7srr_Id5-nkk5A3m1cv%9ZszZS~7(8A5T-G@yGywpZVls#T delta 113 zcmbQDH%V{89&1NW7srr_Id5+s?zgEwumu From 5c1d847b0ab984db04c5165a72b5886c1bc4848e Mon Sep 17 00:00:00 2001 From: PsiOmega Date: Tue, 26 May 2015 16:49:27 +0200 Subject: [PATCH 5/7] Changelog entry. --- html/changelogs/PsiOmegaDelta-150526-MyEyes.yml | 5 +++++ 1 file changed, 5 insertions(+) create mode 100644 html/changelogs/PsiOmegaDelta-150526-MyEyes.yml diff --git a/html/changelogs/PsiOmegaDelta-150526-MyEyes.yml b/html/changelogs/PsiOmegaDelta-150526-MyEyes.yml new file mode 100644 index 00000000000..0d2f685a37c --- /dev/null +++ b/html/changelogs/PsiOmegaDelta-150526-MyEyes.yml @@ -0,0 +1,5 @@ +author: PsiOmegaDelta +delete-after: True + +changes: + - tweak: "NVGs and meson overlays should now be less straining on the eyes." From 2e7b737f7aaee6edabe22dcbccd3f08c86e6127e Mon Sep 17 00:00:00 2001 From: PsiOmega Date: Wed, 27 May 2015 17:13:10 +0200 Subject: [PATCH 6/7] Updates changelog. --- html/changelog.html | 6 ++++++ html/changelogs/.all_changelog.yml | 4 ++++ html/changelogs/PsiOmegaDelta-150526-Inactivity.yml | 4 ---- 3 files changed, 10 insertions(+), 4 deletions(-) delete mode 100644 html/changelogs/PsiOmegaDelta-150526-Inactivity.yml diff --git a/html/changelog.html b/html/changelog.html index 0aadb8c8798..9c5318a7ec5 100644 --- a/html/changelog.html +++ b/html/changelog.html @@ -56,6 +56,12 @@ -->
+

27 May 2015

+

PsiOmegaDelta updated:

+
    +
  • The inactive check process now respects client holder status and can be configured how long clients may remain inactive before being kicked.
    • +
+

22 May 2015

Ccomp5950 updated:

    diff --git a/html/changelogs/.all_changelog.yml b/html/changelogs/.all_changelog.yml index 25b2ca7dc7e..646b5063711 100644 --- a/html/changelogs/.all_changelog.yml +++ b/html/changelogs/.all_changelog.yml @@ -1848,3 +1848,7 @@ DO NOT EDIT THIS FILE BY HAND! AUTOMATICALLY GENERATED BY ss13_genchangelog.py. a final sheet. - rscadd: Various things can be built with various sheet types. Experiment! Just keep in mind that uranium is now radioactive and phoron is now flammable. +2015-05-27: + PsiOmegaDelta: + - tweak: The inactive check process now respects client holder status and can be + configured how long clients may remain inactive before being kicked. diff --git a/html/changelogs/PsiOmegaDelta-150526-Inactivity.yml b/html/changelogs/PsiOmegaDelta-150526-Inactivity.yml deleted file mode 100644 index a10aa09d578..00000000000 --- a/html/changelogs/PsiOmegaDelta-150526-Inactivity.yml +++ /dev/null @@ -1,4 +0,0 @@ -author: PsiOmegaDelta -delete-after: True -changes: - - tweak: "The inactive check process now respects client holder status and can be configured how long clients may remain inactive before being kicked." From 10a2fab154e0bad88e45cd9f933ea2ceb97e6138 Mon Sep 17 00:00:00 2001 From: PsiOmega Date: Wed, 27 May 2015 17:53:39 +0200 Subject: [PATCH 7/7] Generate changelog. --- html/changelog.html | 15 +++++++++++---- html/changelogs/.all_changelog.yml | 4 ++++ html/changelogs/Zuhayr-pAIScoop.yml | 5 ----- 3 files changed, 15 insertions(+), 9 deletions(-) delete mode 100644 html/changelogs/Zuhayr-pAIScoop.yml diff --git a/html/changelog.html b/html/changelog.html index d5d61dd043e..cfde784c57c 100644 --- a/html/changelog.html +++ b/html/changelog.html @@ -56,6 +56,17 @@ -->
    +

    27 May 2015

    +

    PsiOmegaDelta updated:

    +
      +
    • The inactive check process now respects client holder status and can be configured how long clients may remain inactive before being kicked.
      • +
    +

    Zuhayr updated:

    +
      +
    • Unfolded pAIs can now be scooped up and worn as hats.
      • +
    • Scoop-up behavior is now standardized to selecting help intent and dragging their icon onto yours.
      • +
    +

    26 May 2015

    Atlantis updated:

      @@ -102,10 +113,6 @@
    • Cyborg analyzers now show damage to prosthetic limbs and organs on humans.
    • Prosthetic EMP damage was reduced.
    • Several organ files were split up/moved around.
      • -

      27 May 2015

      -

      PsiOmegaDelta updated:

      -
        -
      • The inactive check process now respects client holder status and can be configured how long clients may remain inactive before being kicked.

      22 May 2015

      diff --git a/html/changelogs/.all_changelog.yml b/html/changelogs/.all_changelog.yml index c80ec23ec02..ffa438a005c 100644 --- a/html/changelogs/.all_changelog.yml +++ b/html/changelogs/.all_changelog.yml @@ -1907,3 +1907,7 @@ DO NOT EDIT THIS FILE BY HAND! AUTOMATICALLY GENERATED BY ss13_genchangelog.py. PsiOmegaDelta: - tweak: The inactive check process now respects client holder status and can be configured how long clients may remain inactive before being kicked. + Zuhayr: + - rscadd: Unfolded pAIs can now be scooped up and worn as hats. + - tweak: Scoop-up behavior is now standardized to selecting help intent and dragging + their icon onto yours. diff --git a/html/changelogs/Zuhayr-pAIScoop.yml b/html/changelogs/Zuhayr-pAIScoop.yml deleted file mode 100644 index ae728a09520..00000000000 --- a/html/changelogs/Zuhayr-pAIScoop.yml +++ /dev/null @@ -1,5 +0,0 @@ -author: Zuhayr -delete-after: True -changes: - - rscadd: "Unfolded pAIs can now be scooped up and worn as hats." - - tweak: "Scoop-up behavior is now standardized to selecting help intent and dragging their icon onto yours." \ No newline at end of file