Merge branch 'master' of https://github.com/Baystation12/Baystation12 into dev-freeze

.gitignore

@@ -4,9 +4,3 @@
 *.rsc
 *.dmb
 *.lk
-
-#ignore any files in config/, except those in subdirectories.
-/config/*
-!/config/*/*
-
-/baystation12.int

baystation12.dme

@@ -75,6 +75,7 @@
 #include "code\ATMOSPHERICS\components\unary\vent_pump.dm"
 #include "code\ATMOSPHERICS\components\unary\vent_scrubber.dm"
 #include "code\controllers\_DynamicAreaLighting_TG.dm"
+#include "code\controllers\autotransfer.dm"
 #include "code\controllers\configuration.dm"
 #include "code\controllers\failsafe.dm"
 #include "code\controllers\lighting_controller.dm"

code/controllers/autotransfer.dm

@@ -0,0 +1,13 @@
+var/datum/controller/transfer_controller = new /transfer_controller()
+var/timerbuffer = 0 //buffer for time check
+/transfer_controller/New()
+	timerbuffer = config.vote_autotransfer_initial
+	processing_objects += src
+
+/transfer_controller/Del()
+	processing_objects -= src
+
+/transfer_controller/proc/process()
+	if (world.time >= timerbuffer - 600)
+		vote.autotransfer()
+		timerbuffer = timerbuffer + config.vote_autotransfer_interval

code/controllers/voting.dm

@@ -50,7 +50,6 @@ datum/controller/vote
 		initiate_vote("crew_transfer","the server")
 		log_debug("The server has called an Autotransfer")
 
-
 	proc/reset()
 		initiator = null
 		time_remaining = 0

code/game/gamemodes/gameticker.dm

@@ -36,8 +36,6 @@ var/global/datum/controller/gameticker/ticker
 
 	var/triai = 0//Global holder for Triumvirate
 
-	var/initialtpass = 0 //holder for inital autotransfer vote timer
-
 /datum/controller/gameticker/proc/pregame()
 	login_music = pick(\
 	/*'sound/music/halloween/skeletons.ogg',\
@@ -63,17 +61,6 @@ var/global/datum/controller/gameticker/ticker
 				current_state = GAME_STATE_SETTING_UP
 	while (!setup())
 
-/datum/controller/gameticker/proc/votetimer()
-	var/timerbuffer = 0
-	if (initialtpass == 0)
-		timerbuffer = config.vote_autotransfer_initial
-	else
-		timerbuffer = config.vote_autotransfer_interval
-	spawn(timerbuffer)
-		vote.autotransfer()
-		initialtpass = 1
-		votetimer()
-
 
 /datum/controller/gameticker/proc/setup()
 	//Create and announce mode
@@ -166,7 +153,6 @@ var/global/datum/controller/gameticker/ticker
 		spawn(3000)
 		statistic_cycle() // Polls population totals regularly and stores them in an SQL DB -- TLE
 
-	votetimer()
 	return 1
 
 /datum/controller/gameticker

code/game/mecha/mecha.dm

@@ -115,6 +115,7 @@
 		cell = C
 		return
 	cell = new(src)
+	cell.name = "high-capacity power cell"
 	cell.charge = 15000
 	cell.maxcharge = 15000
 

code/modules/economy/ATM.dm

@@ -97,8 +97,6 @@ log transactions
 		user << "\red Artificial unit recognized. Artificial units do not currently receive monetary compensation, as per NanoTrasen regulation #1005."
 		return
 	if(get_dist(src,user) <= 1)
-		//check to see if the user has low security enabled
-		scan_user(user)
 
 		//js replicated from obj/machinery/computer/card
 		var/dat = "<h1>NanoTrasen Automatic Teller Machine</h1>"
@@ -223,7 +221,11 @@ log transactions
 					var/new_sec_level = max( min(text2num(href_list["new_security_level"]), 2), 0)
 					authenticated_account.security_level = new_sec_level
 			if("attempt_auth")
-				if(!ticks_left_locked_down)
+
+				// check if they have low security enabled
+				scan_user(usr)
+
+				if(!ticks_left_locked_down && held_card)
 					var/tried_account_num = text2num(href_list["account_num"])
 					if(!tried_account_num)
 						tried_account_num = held_card.associated_account_number
@@ -363,3 +365,5 @@ log transactions
 					T.date = current_date_string
 					T.time = worldtime2text()
 					authenticated_account.transaction_log.Add(T)
+
+					view_screen = NO_SCREEN

code/modules/events/event_dynamic.dm

@@ -44,39 +44,39 @@ var/list/event_last_fired = list()
 	//see:
 	// Code/WorkInProgress/Cael_Aislinn/Economy/Economy_Events.dm
 	// Code/WorkInProgress/Cael_Aislinn/Economy/Economy_Events_Mundane.dm
-	possibleEvents[/datum/event/economic_event] = 200
-	possibleEvents[/datum/event/trivial_news] = 300
-	possibleEvents[/datum/event/mundane_news] = 200
+	possibleEvents[/datum/event/economic_event] = 300
+	possibleEvents[/datum/event/trivial_news] = 400
+	possibleEvents[/datum/event/mundane_news] = 300
 
 	possibleEvents[/datum/event/pda_spam] = max(min(25, player_list.len) * 4, 200)
 	possibleEvents[/datum/event/money_lotto] = max(min(5, player_list.len), 50)
 	if(account_hack_attempted)
 		possibleEvents[/datum/event/money_hacker] = max(min(25, player_list.len) * 4, 200)
 
-	possibleEvents[/datum/event/carp_migration] = 50 + 50 * active_with_role["Engineer"]
-	possibleEvents[/datum/event/brand_intelligence] = 50 + 25 * active_with_role["Janitor"]
+	possibleEvents[/datum/event/carp_migration] = 20 + 10 * active_with_role["Engineer"]
+	possibleEvents[/datum/event/brand_intelligence] = 20 + 25 * active_with_role["Janitor"]
 
-	possibleEvents[/datum/event/rogue_drone] = 25 + 25 * active_with_role["Engineer"] + 25 * active_with_role["Security"]
-	possibleEvents[/datum/event/infestation] = 50 + 25 * active_with_role["Janitor"]
+	possibleEvents[/datum/event/rogue_drone] = 5 + 25 * active_with_role["Engineer"] + 25 * active_with_role["Security"]
+	possibleEvents[/datum/event/infestation] = 100 + 100 * active_with_role["Janitor"]
 
 	possibleEvents[/datum/event/communications_blackout] = 50 + 25 * active_with_role["AI"] + active_with_role["Scientist"] * 25
 	possibleEvents[/datum/event/ionstorm] = active_with_role["AI"] * 25 + active_with_role["Cyborg"] * 25 + active_with_role["Engineer"] * 10 + active_with_role["Scientist"] * 5
-	possibleEvents[/datum/event/grid_check] = 25 + 20 * active_with_role["Engineer"]
-	possibleEvents[/datum/event/electrical_storm] = 10 * active_with_role["Janitor"] + 5 * active_with_role["Engineer"]
+	possibleEvents[/datum/event/grid_check] = 25 + 10 * active_with_role["Engineer"]
+	possibleEvents[/datum/event/electrical_storm] = 15 * active_with_role["Janitor"] + 5 * active_with_role["Engineer"]
 	possibleEvents[/datum/event/wallrot] = 30 * active_with_role["Engineer"] + 50 * active_with_role["Botanist"]
 
 	if(!spacevines_spawned)
-		possibleEvents[/datum/event/spacevine] = 5 + 5 * active_with_role["Engineer"]
+		possibleEvents[/datum/event/spacevine] = 10 + 5 * active_with_role["Engineer"]
 	if(minutes_passed >= 30) // Give engineers time to set up engine
 		possibleEvents[/datum/event/meteor_wave] = 10 * active_with_role["Engineer"]
-		possibleEvents[/datum/event/meteor_shower] = 40 * active_with_role["Engineer"]
+		possibleEvents[/datum/event/meteor_shower] = 20 * active_with_role["Engineer"]
 		possibleEvents[/datum/event/blob] = 20 * active_with_role["Engineer"]
 
-	possibleEvents[/datum/event/viral_infection] = 25 + active_with_role["Medical"] * 100
+	possibleEvents[/datum/event/viral_infection] = 25 + active_with_role["Medical"] * 15
 	if(active_with_role["Medical"] > 0)
-		possibleEvents[/datum/event/radiation_storm] = active_with_role["Medical"] * 50
-		possibleEvents[/datum/event/spontaneous_appendicitis] = active_with_role["Medical"] * 150
-		possibleEvents[/datum/event/viral_infection] = active_with_role["Medical"] * 10
+		possibleEvents[/datum/event/radiation_storm] = active_with_role["Medical"] * 10
+		possibleEvents[/datum/event/spontaneous_appendicitis] = active_with_role["Medical"] * 10
+		possibleEvents[/datum/event/viral_infection] = active_with_role["Medical"] * 20
 		possibleEvents[/datum/event/organ_failure] = active_with_role["Medical"] * 50
 
 	possibleEvents[/datum/event/prison_break] = active_with_role["Security"] * 50

code/modules/events/event_manager.dm

@@ -2,8 +2,8 @@ var/list/allEvents = typesof(/datum/event) - /datum/event
 var/list/potentialRandomEvents = typesof(/datum/event) - /datum/event
 //var/list/potentialRandomEvents = typesof(/datum/event) - /datum/event - /datum/event/spider_infestation - /datum/event/alien_infestation
 
-var/eventTimeLower = 9000	//15 minutes
-var/eventTimeUpper = 15000	//25 minutes
+var/eventTimeLower = 12000	//20 minutes
+var/eventTimeUpper = 24000	//40 minutes
 var/scheduledEvent = null
 
 

code/modules/mob/dead/observer/observer.dm

@@ -65,6 +65,23 @@
 	real_name = name
 	..()
 
+
+/mob/dead/attackby(obj/item/W, mob/user)
+	if(istype(W,/obj/item/weapon/tome))
+		var/mob/dead/M = src
+		if(src.invisibility != 0)
+			M.invisibility = 0
+			user.visible_message( \
+				"\red [user] drags ghost, [M], to our plan of reality!", \
+				"\red You drag [M] to our plan of reality!" \
+			)
+		else
+			user.visible_message ( \
+				"\red [user] just tried to smash his book into that ghost!  It's not very effective", \
+				"\red You get the feeling that the ghost can't become any more visible." \
+			)
+
+
 /mob/dead/CanPass(atom/movable/mover, turf/target, height=0, air_group=0)
 	return 1
 /*

config/.gitignore

@@ -0,0 +1,3 @@
+#ignore everything here, except subdirectories.
+*
+!*/