Merge pull request #9506 from PsiOmegaDelta/dev

Dev

baystation12.dme

@@ -633,9 +633,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"

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 << "<SPAN CLASS='warning'>You have been inactive for more than 10 minutes and have been disconnected.</SPAN>"
+					C << "<SPAN CLASS='warning'>You have been inactive for more than [config.kick_inactive] minute\s and have been disconnected.</SPAN>"
 					del(C)	// Don't qdel, cannot override finalize_qdel behaviour for clients.
-
 			scheck()
-
-#undef INACTIVITY_KICK

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

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 << "<span class='notice'>[R.name] found in subject's stomach.</span>"
+				else
+					++unknown
+			if(unknown)
+				user << "<span class='warning'>Non-medical reagent[(unknown > 1)?"s":""] found in subject's stomach.</span>"
+		if(C.virus2.len)
 			for (var/ID in C.virus2)
 				if (ID in virusDB)
 					var/datum/data/record/V = virusDB[ID]

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

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

html/changelog.html

@@ -56,6 +56,17 @@
 		
 		-->
 		<div class="commit sansserif">
+			<h2 class="date">27 May 2015</h2>
+			<h3 class="author">PsiOmegaDelta updated:</h3>
+			<ul class="changes bgimages16">
+				<li class="tweak">The inactive check process now respects client holder status and can be configured how long clients may remain inactive before being kicked.</li>
+			</ul>
+			<h3 class="author">Zuhayr updated:</h3>
+			<ul class="changes bgimages16">
+				<li class="rscadd">Unfolded pAIs can now be scooped up and worn as hats.</li>
+				<li class="tweak">Scoop-up behavior is now standardized to selecting help intent and dragging their icon onto yours.</li>
+			</ul>
+
 			<h2 class="date">26 May 2015</h2>
 			<h3 class="author">Atlantis updated:</h3>
 			<ul class="changes bgimages16">

html/changelogs/.all_changelog.yml

@@ -1903,3 +1903,11 @@ DO NOT EDIT THIS FILE BY HAND!  AUTOMATICALLY GENERATED BY ss13_genchangelog.py.
   - rscadd: Cyborg analyzers now show damage to prosthetic limbs and organs on humans.
   - tweak: Prosthetic EMP damage was reduced.
   - tweak: Several organ files were split up/moved around.
+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.
+  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.

html/changelogs/Zuhayr-pAIScoop.yml

@@ -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."