Merge remote-tracking branch 'upstream/master' into dev-freeze

Conflicts:
	code/game/machinery/rechargestation.dm
	code/game/mecha/equipment/tools/medical_tools.dm
 	maps/exodus-1.dmm

code/game/atoms.dm

@@ -66,9 +66,6 @@
 /atom/proc/meteorhit(obj/meteor as obj)
 	return
 
-/atom/proc/allow_drop()
-	return 1
-
 /atom/proc/CheckExit()
 	return 1
 

code/game/dna/dna_modifier.dm

@@ -64,9 +64,6 @@
 	component_parts += new /obj/item/stack/cable_coil(src)
 	RefreshParts()
 
-/obj/machinery/dna_scannernew/allow_drop()
-	return 0
-
 /obj/machinery/dna_scannernew/relaymove(mob/user as mob)
 	if (user.stat)
 		return

code/game/gamemodes/changeling/changeling_powers.dm

@@ -193,7 +193,7 @@ var/global/list/possible_changeling_IDs = list("Alpha","Beta","Gamma","Delta","E
 		src << "<span class='warning'>This creature's DNA is ruined beyond useability!</span>"
 		return
 
-	if(!G.state == GRAB_KILL)
+	if(G.state != GRAB_KILL)
 		src << "<span class='warning'>We must have a tighter grip to absorb this creature.</span>"
 		return
 

code/game/machinery/Sleeper.dm

@@ -177,11 +177,6 @@
 			return
 		return
 
-
-	allow_drop()
-		return 0
-
-
 	process()
 		if (stat & (NOPOWER|BROKEN))
 			return

code/game/machinery/adv_med.dm

@@ -14,9 +14,6 @@
 	idle_power_usage = 60
 	active_power_usage = 10000	//10 kW. It's a big all-body scanner.
 
-/*/obj/machinery/bodyscanner/allow_drop()
-	return 0*/
-
 /obj/machinery/bodyscanner/relaymove(mob/user as mob)
 	if (user.stat)
 		return

code/game/machinery/cryo.dm

@@ -60,11 +60,6 @@
 
 	return 1
 
-
-/obj/machinery/atmospherics/unary/cryo_cell/allow_drop()
-	return 0
-
-
 /obj/machinery/atmospherics/unary/cryo_cell/relaymove(mob/user as mob)
 	if(user.stat)
 		return

code/game/machinery/machinery.dm

@@ -176,7 +176,7 @@ Class Procs:
 		qdel(src)
 
 //sets the use_power var and then forces an area power update
-/obj/machinery/proc/update_use_power(var/new_use_power, var/force_update = 0)
+/obj/machinery/proc/update_use_power(var/new_use_power)
 	use_power = new_use_power
 
 /obj/machinery/proc/auto_use_power()

code/game/machinery/rechargestation.dm

@@ -1,22 +1,25 @@
 /obj/machinery/recharge_station
 	name = "cyborg recharging station"
+	desc = "A heavy duty rapid charging system, designed to quickly recharge cyborg power reserves."
 	icon = 'icons/obj/objects.dmi'
 	icon_state = "borgcharger0"
 	density = 1
 	anchored = 1
 	use_power = 1
 	idle_power_usage = 50
-	active_power_usage = 50
 	var/mob/occupant = null
 	var/obj/item/weapon/cell/cell = null
-	//var/max_internal_charge = 15000 		// Two charged borgs in a row with default cell
-	//var/current_internal_charge = 15000 	// Starts charged, to prevent power surges on round start
-	var/charging_cap_active = 1000			// Active Cap - When cyborg is inside
-	var/charging_cap_passive = 250			// Passive Cap - Recharging internal capacitor when no cyborg is inside
-	var/icon_update_tick = 0				// Used to update icon only once every 10 ticks
-	var/charge_rate = 250					// How much charge is restored per tick
-	var/weld_rate = 0						// How much brute damage is repaired per tick
-	var/wire_rate = 0						// How much burn damage is repaired per tick
+	var/icon_update_tick = 0	// Used to rebuild the overlay only once every 10 ticks
+	var/charging = 0
+
+	var/charging_power			// W. Power rating used for charging the cyborg. 120 kW if un-upgraded
+	var/restore_power_active	// W. Power drawn from APC when an occupant is charging. 40 kW if un-upgraded
+	var/restore_power_passive	// W. Power drawn from APC when idle. 7 kW if un-upgraded
+	var/weld_rate = 0			// How much brute damage is repaired per tick
+	var/wire_rate = 0			// How much burn damage is repaired per tick
+
+	var/weld_power_use = 2300	// power used per point of brute damage repaired. 2.3 kW ~ about the same power usage of a handheld arc welder
+	var/wire_power_use = 500	// power used per point of burn damage repaired.
 
 /obj/machinery/recharge_station/New()
 	..()
@@ -30,51 +33,76 @@
 	component_parts += new /obj/item/weapon/cell/high(src)
 	component_parts += new /obj/item/stack/cable_coil(src, 5)
 
-	build_icon()
+	RefreshParts()
+
 	update_icon()
 
-	RefreshParts()
+/obj/machinery/recharge_station/proc/has_cell_power()
+	return cell && cell.percent() > 0
 
 /obj/machinery/recharge_station/process()
 	if(stat & (BROKEN))
 		return
-
-	if((stat & (NOPOWER)) && (!cell || cell.percent() <= 0)) // No Power.
-		return
-
-	var/chargemode = 0
-	if(occupant)
-		process_occupant()
-		chargemode = 1
-	// Power Stuff
-
 	if(!cell) // Shouldn't be possible, but sanity check
 		return
 
-	if(stat & NOPOWER)
-		cell.use(50 * CELLRATE) // Internal Circuitry, 50W load. No power - Runs from internal cell
-		return // No external power = No charging
+	if((stat & NOPOWER) && !has_cell_power()) // No power and cell is dead.
+		if(icon_update_tick)
+			icon_update_tick = 0 //just rebuild the overlay once more only
+			update_icon()
+		return
 
-	// Calculating amount of power to draw
-	var/charge_diff = (chargemode ? charging_cap_active : charging_cap_passive) + 50 // 50W for circuitry
+	//First, draw from the internal power cell to recharge/repair/etc the occupant
+	if(occupant)
+		process_occupant()
 
-	charge_diff = cell.give(charge_diff)
+	//Then, if external power is available, recharge the internal cell
+	var/recharge_amount = 0
+	if(!(stat & NOPOWER))
+		// Calculating amount of power to draw
+		recharge_amount = (occupant ? restore_power_active : restore_power_passive) * CELLRATE
 
-	if(idle_power_usage != charge_diff) // Force update, but only when our power usage changed this tick.
-		idle_power_usage = charge_diff
-		update_use_power(1, 1)
+		recharge_amount = cell.give(recharge_amount)
+		use_power(recharge_amount / CELLRATE)
 
 	if(icon_update_tick >= 10)
-		update_icon()
 		icon_update_tick = 0
 	else
 		icon_update_tick++
 
+	if(occupant || recharge_amount)
+		update_icon()
+
+//since the recharge station can still be on even with NOPOWER. Instead it draws from the internal cell.
+/obj/machinery/recharge_station/auto_use_power()
+	if(!(stat & NOPOWER))
+		return ..()
+
+	if(!has_cell_power())
+		return 0
+	if(src.use_power == 1)
+		cell.use(idle_power_usage * CELLRATE)
+	else if(src.use_power >= 2)
+		cell.use(active_power_usage * CELLRATE)
 	return 1
 
+//Processes the occupant, drawing from the internal power cell if needed.
+/obj/machinery/recharge_station/proc/process_occupant()
+	if(istype(occupant, /mob/living/silicon/robot))
+		var/mob/living/silicon/robot/R = occupant
 
-/obj/machinery/recharge_station/allow_drop()
-	return 0
+		if(R.module)
+			R.module.respawn_consumable(R, charging_power * CELLRATE / 250) //consumables are magical, apparently
+		if(R.cell && !R.cell.fully_charged())
+			var/diff = min(R.cell.maxcharge - R.cell.charge, charging_power * CELLRATE) // Capped by charging_power / tick
+			var/charge_used = cell.use(diff)
+			R.cell.give(charge_used)
+
+		//Lastly, attempt to repair the cyborg if enabled
+		if(weld_rate && R.getBruteLoss() && cell.checked_use(weld_power_use * weld_rate * CELLRATE))
+			R.adjustBruteLoss(-weld_rate)
+		if(wire_rate && R.getFireLoss() && cell.checked_use(wire_power_use * wire_rate * CELLRATE))
+			R.adjustFireLoss(-wire_rate)
 
 /obj/machinery/recharge_station/examine(mob/user)
 	..(user)
@@ -92,9 +120,6 @@
 	return
 
 /obj/machinery/recharge_station/emp_act(severity)
-	if(stat & (BROKEN|NOPOWER))
-		..(severity)
-		return
 	if(occupant)
 		occupant.emp_act(severity)
 		go_out()
@@ -125,13 +150,20 @@
 			man_rating += P.rating
 	cell = locate(/obj/item/weapon/cell) in component_parts
 
-	charge_rate = 125 * cap_rating
-	charging_cap_passive = charge_rate
+	charging_power = 40000 + 40000 * cap_rating
+	restore_power_active = 10000 + 15000 * cap_rating
+	restore_power_passive = 5000 + 1000 * cap_rating
 	weld_rate = max(0, man_rating - 3)
 	wire_rate = max(0, man_rating - 5)
 
-/obj/machinery/recharge_station/update_icon()
-	..()
+	desc = initial(desc)
+	desc += " Uses a dedicated internal power cell to deliver [charging_power]W when in use."
+	if(weld_rate)
+		desc += "<br>It is capable of repairing structural damage."
+	if(wire_rate)
+		desc += "<br>It is capable of repairing burn damage."
+
+/obj/machinery/recharge_station/proc/build_overlays()
 	overlays.Cut()
 	switch(round(chargepercentage()))
 		if(1 to 20)
@@ -147,50 +179,33 @@
 		if(99 to 110)
 			overlays += image('icons/obj/objects.dmi', "statn_c100")
 
-/obj/machinery/recharge_station/Bumped(var/mob/AM)
-	move_inside(AM)
+/obj/machinery/recharge_station/update_icon()
+	..()
+	if(stat & BROKEN)
+		icon_state = "borgcharger0"
+		return
 
-/obj/machinery/recharge_station/proc/build_icon()
-	if(NOPOWER|BROKEN)
-		if(occupant)
-			icon_state = "borgcharger1"
+	if(occupant)
+		if((stat & NOPOWER) && !has_cell_power())
+			icon_state = "borgcharger2"
 		else
-			icon_state = "borgcharger0"
+			icon_state = "borgcharger1"
 	else
 		icon_state = "borgcharger0"
 
-/obj/machinery/recharge_station/proc/process_occupant()
-	if(occupant)
-		if(istype(occupant, /mob/living/silicon/robot))
-			var/mob/living/silicon/robot/R = occupant
-			if(R.module)
-				R.module.respawn_consumable(R, charge_rate / 250)
-			if(!R.cell)
-				return
-			if(!R.cell.fully_charged())
-				var/diff = min(R.cell.maxcharge - R.cell.charge, charge_rate) 	// Capped at charge_rate charge / tick
-				if (cell.charge >= diff)
-					cell.use(diff)
-					R.cell.give(diff)
-			if(weld_rate && R.getBruteLoss())
-				R.adjustBruteLoss(-1)
-			if(wire_rate && R.getFireLoss())
-				R.adjustFireLoss(-1)
-			else
-				update_use_power(1)
+	if(icon_update_tick == 0)
+		build_overlays()
+
+/obj/machinery/recharge_station/Bumped(var/mob/AM)
+	move_inside(AM)
 
 /obj/machinery/recharge_station/proc/go_out()
 	if(!(occupant))
 		return
-	//for(var/obj/O in src)
-	//	O.loc = loc
-	if(occupant.client)
-		occupant.client.eye = occupant.client.mob
-		occupant.client.perspective = MOB_PERSPECTIVE
 	occupant.loc = loc
+	occupant.reset_view()
 	occupant = null
-	build_icon()
-	update_use_power(1)
+	update_icon()
 	return
 
 /obj/machinery/recharge_station/verb/move_eject()
@@ -202,37 +217,26 @@
 	add_fingerprint(usr)
 	return
 
-/obj/machinery/recharge_station/verb/move_inside(var/mob/user = usr)
+/obj/machinery/recharge_station/verb/move_inside()
 	set category = "Object"
 	set src in oview(1)
 
-	if(!user)
-		return
-
-	if(!(istype(user, /mob/living/silicon/robot)))
-		user << "<span class='notice'>Only non-organics may enter the recharger!</span>"
-		return
-	var/mob/living/silicon/robot/R = user
-
-	if(R.stat == 2)
-		//Whoever had it so that a borg with a dead cell can't enter this thing should be shot. --NEO
+	if(usr.stat == DEAD)
 		return
 	if(occupant)
-		R << "<span class='notice'>The cell is already occupied!</span>"
+		usr << "<span class='notice'>\The [src] is already occupied!</span>"
+		return
+
+	var/mob/living/silicon/robot/R = usr
+	if(!istype(R))
+		usr << "<span class='notice'>Only synthetics may enter the recharger!</span>"
 		return
 	if(!R.cell)
-		R << "<span class='notice'>Without a powercell, you can't be recharged.</span>"
-		//Make sure they actually HAVE a cell, now that they can get in while powerless. --NEO
+		usr << "<span class='notice'>Without a powercell, you can't be recharged.</span>"
 		return
-	R.stop_pulling()
-	if(R.client)
-		R.client.perspective = EYE_PERSPECTIVE
-		R.client.eye = src
-	R.loc = src
-	occupant = R
-	/*for(var/obj/O in src)
-		O.loc = loc*/
-	add_fingerprint(R)
-	build_icon()
-	update_use_power(1)
-	return
+
+	usr.reset_view(src)
+	usr.loc = src
+	occupant = usr
+	add_fingerprint(usr)
+	update_icon()

code/game/mecha/equipment/tools/medical_tools.dm

@@ -23,12 +23,6 @@
 
 	Destroy()
 		qdel(pr_mech_sleeper)
-		..()
-
-	allow_drop()
-		return 0
-
-	destroy()
 		for(var/atom/movable/AM in src)
 			AM.forceMove(get_turf(src))
 		return ..()

code/game/mecha/equipment/tools/tools.dm

@@ -1085,9 +1085,6 @@
 	var/door_locked = 1
 	salvageable = 0
 
-/obj/item/mecha_parts/mecha_equipment/tool/passenger/allow_drop()
-	return 0
-
 /obj/item/mecha_parts/mecha_equipment/tool/passenger/destroy()
 	for(var/atom/movable/AM in src)
 		AM.forceMove(get_turf(src))

code/modules/admin/ToRban.dm

@@ -23,7 +23,7 @@
 /proc/ToRban_update()
 	spawn(0)
 		log_misc("Downloading updated ToR data...")
-		var/http[] = world.Export("http://exitlist.torproject.org/exit-addresses")
+		var/http[] = world.Export("https://check.torproject.org/exit-addresses")
 
 		var/list/rawlist = file2list(http["CONTENT"])
 		if(rawlist.len)

code/modules/reagents/Chemistry-Machinery.dm

@@ -123,7 +123,7 @@
 
 			if(href_list["amount"])
 				var/id = href_list["add"]
-				var/amount = text2num(href_list["amount"])
+				var/amount = isgoodnumber(text2num(href_list["amount"]))
 				R.trans_id_to(src, id, amount)
 
 		else if (href_list["addcustom"])
@@ -137,7 +137,7 @@
 
 			if(href_list["amount"])
 				var/id = href_list["remove"]
-				var/amount = text2num(href_list["amount"])
+				var/amount = isgoodnumber(text2num(href_list["amount"]))
 				if(mode)
 					reagents.trans_id_to(beaker, id, amount)
 				else
@@ -301,18 +301,10 @@
 
 /obj/machinery/chem_master/proc/isgoodnumber(var/num)
 	if(isnum(num))
-		if(num > 200)
-			num = 200
-		else if(num < 0)
-			num = 1
-		else
-			num = round(num)
-		return num
+		return Clamp(round(num), 0, 200)
 	else
 		return 0
 
-
-
 /obj/machinery/chem_master/condimaster
 	name = "CondiMaster 3000"
 	condi = 1