Bay Update 02

code/WorkInProgress/Cael_Aislinn/ShieldGen/energy_field.dm

@@ -11,6 +11,7 @@
 	density = 0
 	invisibility = 101
 	var/strength = 0
+	var/ticks_recovering = 10
 
 /obj/effect/energy_field/ex_act(var/severity)
 	Stress(0.5 + severity)
@@ -27,9 +28,12 @@
 	strength -= severity
 
 	//if we take too much damage, drop out - the generator will bring us back up if we have enough power
+	ticks_recovering = min(ticks_recovering + 2, 10)
 	if(strength < 1)
 		invisibility = 101
 		density = 0
+		ticks_recovering = 10
+		strength = 0
 	else if(strength >= 1)
 		invisibility = 0
 		density = 1

code/WorkInProgress/Cael_Aislinn/ShieldGen/shield_capacitor.dm

@@ -9,12 +9,10 @@
 	icon_state = "capacitor"
 	var/active = 1
 	density = 1
-	anchored = 1
 	var/stored_charge = 0
 	var/time_since_fail = 100
-	var/max_charge = 1000000
-	var/max_charge_rate = 100000
-	var/min_charge_rate = 0
+	var/max_charge = 5e6
+	var/charge_limit = 200000
 	var/locked = 0
 	//
 	use_power = 1			//0 use nothing
@@ -23,6 +21,7 @@
 	idle_power_usage = 10
 	active_power_usage = 100
 	var/charge_rate = 100
+	var/obj/machinery/shield_gen/owned_gen
 
 /obj/machinery/shield_capacitor/New()
 	spawn(10)
@@ -55,17 +54,17 @@
 		src.anchored = !src.anchored
 		src.visible_message("\blue \icon[src] [src] has been [anchored ? "bolted to the floor" : "unbolted from the floor"] by [user].")
 
-		spawn(0)
-			for(var/obj/machinery/shield_gen/gen in range(1, src))
-				if(get_dir(src, gen) == src.dir)
-					if(!src.anchored && gen.owned_capacitor == src)
-						gen.owned_capacitor = null
-						break
-					else if(src.anchored && !gen.owned_capacitor)
-						gen.owned_capacitor = src
-						break
-					gen.updateDialog()
-					updateDialog()
+		if(anchored)
+			spawn(0)
+				for(var/obj/machinery/shield_gen/gen in range(1, src))
+					if(get_dir(src, gen) == src.dir && !gen.owned_capacitor)
+						owned_gen = gen
+						owned_gen.owned_capacitor = src
+						owned_gen.updateDialog()
+		else
+			if(owned_gen && owned_gen.owned_capacitor == src)
+				owned_gen.owned_capacitor = null
+			owned_gen = null
 	else
 		..()
 
@@ -94,17 +93,19 @@
 		t += "[time_since_fail > 2 ? "<font color=green>Charging stable.</font>" : "<font color=red>Warning, low charge!</font>"]<br>"
 		t += "Charge: [stored_charge] Watts ([100 * stored_charge/max_charge]%)<br>"
 		t += "Charge rate: \
-		<a href='?src=\ref[src];charge_rate=[-max_charge_rate]'>\[min\]</a> \
+		<a href='?src=\ref[src];charge_rate=-100000'>\[----\]</a> \
+		<a href='?src=\ref[src];charge_rate=-10000'>\[---\]</a> \
 		<a href='?src=\ref[src];charge_rate=-1000'>\[--\]</a> \
 		<a href='?src=\ref[src];charge_rate=-100'>\[-\]</a>[charge_rate] Watts/sec \
 		<a href='?src=\ref[src];charge_rate=100'>\[+\]</a> \
 		<a href='?src=\ref[src];charge_rate=1000'>\[++\]</a> \
-		<a href='?src=\ref[src];charge_rate=[max_charge_rate]'>\[max\]</a><br>"
+		<a href='?src=\ref[src];charge_rate=10000'>\[+++\]</a> \
+		<a href='?src=\ref[src];charge_rate=100000'>\[+++\]</a><br>"
 	t += "<hr>"
 	t += "<A href='?src=\ref[src]'>Refresh</A> "
 	t += "<A href='?src=\ref[src];close=1'>Close</A><BR>"
 
-	user << browse(t, "window=shield_capacitor;size=500x800")
+	user << browse(t, "window=shield_capacitor;size=500x400")
 	user.set_machine(src)
 
 /obj/machinery/shield_capacitor/process()
@@ -137,10 +138,10 @@
 			use_power = 1
 	if( href_list["charge_rate"] )
 		charge_rate += text2num(href_list["charge_rate"])
-		if(charge_rate > max_charge_rate)
-			charge_rate = max_charge_rate
-		else if(charge_rate < min_charge_rate)
-			charge_rate = min_charge_rate
+		if(charge_rate > charge_limit)
+			charge_rate = charge_limit
+		else if(charge_rate < 0)
+			charge_rate = 0
 	//
 	updateDialog()
 

code/WorkInProgress/Cael_Aislinn/ShieldGen/shield_gen.dm

@@ -14,7 +14,6 @@
 	var/field_radius = 3
 	var/list/field
 	density = 1
-	anchored = 1
 	var/locked = 0
 	var/average_field_strength = 0
 	var/strengthen_rate = 0.2
@@ -22,7 +21,7 @@
 	var/powered = 0
 	var/check_powered = 1
 	var/obj/machinery/shield_capacitor/owned_capacitor
-	var/max_field_strength = 10
+	var/target_field_strength = 10
 	var/time_since_fail = 100
 	var/energy_conversion_rate = 0.01	//how many renwicks per watt?
 	//
@@ -63,17 +62,22 @@
 		src.anchored = !src.anchored
 		src.visible_message("\blue \icon[src] [src] has been [anchored?"bolted to the floor":"unbolted from the floor"] by [user].")
 
-		spawn(0)
-			for(var/obj/machinery/shield_gen/gen in range(1, src))
-				if(get_dir(src, gen) == src.dir)
-					if(!src.anchored && gen.owned_capacitor == src)
-						gen.owned_capacitor = null
+		if(active)
+			toggle()
+		if(anchored)
+			spawn(0)
+				for(var/obj/machinery/shield_capacitor/cap in range(1, src))
+					if(cap.owned_gen)
+						continue
+					if(get_dir(cap, src) == cap.dir && src.anchored)
+						owned_capacitor = cap
+						owned_capacitor.owned_gen = src
+						updateDialog()
 						break
-					else if(src.anchored && !gen.owned_capacitor)
-						gen.owned_capacitor = src
-						break
-					gen.updateDialog()
-					updateDialog()
+		else
+			if(owned_capacitor && owned_capacitor.owned_gen == src)
+				owned_capacitor.owned_gen = null
+			owned_capacitor = null
 	else
 		..()
 
@@ -102,67 +106,65 @@
 		t += "This generator is: [active ? "<font color=green>Online</font>" : "<font color=red>Offline</font>" ] <a href='?src=\ref[src];toggle=1'>[active ? "\[Deactivate\]" : "\[Activate\]"]</a><br>"
 		t += "[time_since_fail > 2 ? "<font color=green>Field is stable.</font>" : "<font color=red>Warning, field is unstable!</font>"]<br>"
 		t += "Coverage radius (restart required): \
+		<a href='?src=\ref[src];change_radius=-50'>---</a> \
 		<a href='?src=\ref[src];change_radius=-5'>--</a> \
 		<a href='?src=\ref[src];change_radius=-1'>-</a> \
 		[field_radius * 2]m \
 		<a href='?src=\ref[src];change_radius=1'>+</a> \
-		<a href='?src=\ref[src];change_radius=5'>++</a><br>"
-		t += "Overall field strength: [average_field_strength] Renwicks ([max_field_strength ? 100 * average_field_strength / max_field_strength : "NA"]%)<br>"
-		t += "Charge rate: <a href='?src=\ref[src];strengthen_rate=-0.1'>--</a> \
-		<a href='?src=\ref[src];strengthen_rate=-0.01'>-</a> \
-		[strengthen_rate] Renwicks/sec \
-		<a href='?src=\ref[src];strengthen_rate=0.01'>+</a> \
-		<a href='?src=\ref[src];strengthen_rate=0.1'>++</a><br>"
+		<a href='?src=\ref[src];change_radius=5'>++</a> \
+		<a href='?src=\ref[src];change_radius=50'>+++</a><br>"
+		t += "Overall field strength: [average_field_strength] Renwicks ([target_field_strength ? 100 * average_field_strength / target_field_strength : "NA"]%)<br>"
 		t += "Upkeep energy: [field.len * average_field_strength / energy_conversion_rate] Watts/sec<br>"
+		t += "Charge rate: <a href='?src=\ref[src];strengthen_rate=-0.1'>--</a> \
+		[strengthen_rate] Renwicks/sec \
+		<a href='?src=\ref[src];strengthen_rate=0.1'>++</a><br>"
 		t += "Additional energy required to charge: [field.len * strengthen_rate / energy_conversion_rate] Watts/sec<br>"
 		t += "Maximum field strength: \
-		<a href='?src=\ref[src];max_field_strength=-100'>\[min\]</a> \
-		<a href='?src=\ref[src];max_field_strength=-10'>--</a> \
-		<a href='?src=\ref[src];max_field_strength=-1'>-</a> \
-		[max_field_strength] Renwicks \
-		<a href='?src=\ref[src];max_field_strength=1'>+</a> \
-		<a href='?src=\ref[src];max_field_strength=10'>++</a> \
-		<a href='?src=\ref[src];max_field_strength=100'>\[max\]</a><br>"
+		<a href='?src=\ref[src];target_field_strength=-100'>\[min\]</a> \
+		<a href='?src=\ref[src];target_field_strength=-10'>--</a> \
+		<a href='?src=\ref[src];target_field_strength=-1'>-</a> \
+		[target_field_strength] Renwicks \
+		<a href='?src=\ref[src];target_field_strength=1'>+</a> \
+		<a href='?src=\ref[src];target_field_strength=10'>++</a> \
+		<a href='?src=\ref[src];target_field_strength=100'>\[max\]</a><br>"
 	t += "<hr>"
 	t += "<A href='?src=\ref[src]'>Refresh</A> "
 	t += "<A href='?src=\ref[src];close=1'>Close</A><BR>"
-	user << browse(t, "window=shield_generator;size=500x800")
+	user << browse(t, "window=shield_generator;size=500x400")
 	user.set_machine(src)
 
 /obj/machinery/shield_gen/process()
 
-	if(active && field.len)
+	if(field.len)
+		time_since_fail++
 		var/stored_renwicks = 0
-		var/target_field_strength = min(strengthen_rate + max(average_field_strength, 0), max_field_strength)
-		if(owned_capacitor)
-			var/required_energy = field.len * target_field_strength / energy_conversion_rate
+		var/target_strength_this_update = min(strengthen_rate + max(average_field_strength, 0), target_field_strength)
+
+		if(active && owned_capacitor)
+			var/required_energy = field.len * target_strength_this_update / energy_conversion_rate
 			var/assumed_charge = min(owned_capacitor.stored_charge, required_energy)
 			stored_renwicks = assumed_charge * energy_conversion_rate
 			owned_capacitor.stored_charge -= assumed_charge
 
-		time_since_fail++
-
 		average_field_strength = 0
-		target_field_strength = stored_renwicks / field.len
+		var/renwicks_per_field = 0
+		if(stored_renwicks != 0)
+			renwicks_per_field = stored_renwicks / field.len
 
 		for(var/obj/effect/energy_field/E in field)
-			if(stored_renwicks)
-				var/strength_change = target_field_strength - E.strength
-				if(strength_change > stored_renwicks)
-					strength_change = stored_renwicks
-				if(E.strength < 0)
-					E.strength = 0
+			if(active && renwicks_per_field > 0)
+				var/amount_to_strengthen = min(renwicks_per_field - E.strength, strengthen_rate)
+				if(E.ticks_recovering > 0 && amount_to_strengthen > 0)
+					E.Strengthen( min(amount_to_strengthen / 10, 0.1) )
+					E.ticks_recovering -= 1
 				else
-					E.Strengthen(strength_change)
-
-				stored_renwicks -= strength_change
-
+					E.Strengthen(amount_to_strengthen)
 				average_field_strength += E.strength
 			else
 				E.Strengthen(-E.strength)
 
 		average_field_strength /= field.len
-		if(average_field_strength < 0)
+		if(average_field_strength < 1)
 			time_since_fail = 0
 	else
 		average_field_strength = 0
@@ -187,12 +189,12 @@
 			strengthen_rate = 1
 		else if(strengthen_rate < 0)
 			strengthen_rate = 0
-	else if( href_list["max_field_strength"] )
-		max_field_strength += text2num(href_list["max_field_strength"])
-		if(max_field_strength > 1000)
-			max_field_strength = 1000
-		else if(max_field_strength < 0)
-			max_field_strength = 0
+	else if( href_list["target_field_strength"] )
+		target_field_strength += text2num(href_list["target_field_strength"])
+		if(target_field_strength > 1000)
+			target_field_strength = 1000
+		else if(target_field_strength < 0)
+			target_field_strength = 0
 	//
 	updateDialog()
 
@@ -252,6 +254,7 @@
 			*/
 
 /obj/machinery/shield_gen/proc/toggle()
+	set background = 1
 	active = !active
 	power_change()
 	if(active)
@@ -269,7 +272,7 @@
 	else
 		for(var/obj/effect/energy_field/D in field)
 			field.Remove(D)
-			del D
+			D.loc = null
 
 		for(var/mob/M in view(5,src))
 			M << "\icon[src] You hear heavy droning fade out."

code/WorkInProgress/Cael_Aislinn/ShieldGen/shield_gen_external.dm

@@ -1,7 +1,9 @@
-
 //---------- external shield generator
 //generates an energy field that loops around any built up area in space (is useless inside) halts movement and airflow, is blocked by walls, windows, airlocks etc
 
+/obj/machinery/shield_gen/external
+	name = "hull shield generator"
+
 /obj/machinery/shield_gen/external/New()
 	..()
 

code/WorkInProgress/Chinsky/ashtray.dm

@@ -32,6 +32,7 @@
 				var/obj/item/butt = new cig.type_butt(src)
 				cig.transfer_fingerprints_to(butt)
 				del(cig)
+				W = butt
 			else if (cig.lit == 0)
 				user << "You place [cig] in [src] without even smoking it. Why would you do that?"
 

code/WorkInProgress/Sigyn/Softcurity/wardrobe.dm

@@ -193,12 +193,12 @@
 	return
 
 
-/obj/structure/closet/wardrobe/toxins_white
-	name = "toxins wardrobe"
+/obj/structure/closet/wardrobe/science_white
+	name = "science wardrobe"
 	icon_state = "white"
 	icon_closed = "white"
 
-/obj/structure/closet/wardrobe/toxins_white/New()
+/obj/structure/closet/wardrobe/science_white/New()
 	new /obj/item/clothing/under/rank/scientist(src)
 	new /obj/item/clothing/under/rank/scientist(src)
 	new /obj/item/clothing/under/rank/scientist(src)

code/WorkInProgress/SkyMarshal/wardrobes.dm

@@ -340,7 +340,7 @@
 		var/obj/item/weapon/storage/backpack/BPK = new /obj/item/weapon/storage/backpack(src)
 		new /obj/item/weapon/storage/box(BPK)
 		new /obj/item/weapon/pen(src)
-		new /obj/item/device/pda/toxins(src)
+		new /obj/item/device/pda/science(src)
 		new /obj/item/weapon/tank/oxygen(src)
 		new /obj/item/clothing/mask/gas(src)
 		new /obj/item/clothing/suit/storage/labcoat/science(src)
@@ -360,7 +360,7 @@
 		new /obj/item/device/radio/headset/headset_medsci(src)
 		new /obj/item/clothing/under/rank/chemist(src)
 		new /obj/item/clothing/shoes/white(src)
-		new /obj/item/device/pda/toxins(src)
+		new /obj/item/device/pda/science(src)
 		new /obj/item/clothing/suit/storage/labcoat/chemist(src)
 
 /obj/item/wardrobe/hos

code/WorkInProgress/Tastyfish/Eliza_Data.dm

@@ -246,8 +246,8 @@
 			list("bomb", "explosive", "toxin", "plasma"),
 			list(
 				"Do you worry about bombs often?",
-				"Do you work in toxins?",
-				"Do you find it odd to worry about bombs on a toxins research vessel?")),
+				"Do you work in science?",
+				"Do you find it odd to worry about bombs on a science research vessel?")),
 		new/datum/text_parser/keyword(
 			list("work", "job", "head", "staff", "transen"),
 			list(

code/WorkInProgress/autopsy.dm

@@ -8,7 +8,7 @@
 	icon = 'icons/obj/autopsy_scanner.dmi'
 	icon_state = ""
 	flags = FPRINT | TABLEPASS | CONDUCT
-	w_class = 1.0
+	w_class = 2.0
 	origin_tech = "materials=1;biotech=1"
 	var/list/datum/autopsy_data_scanner/wdata = list()
 	var/list/datum/autopsy_data_scanner/chemtraces = list()

code/WorkInProgress/kilakk/fax.dm

@@ -136,7 +136,9 @@ var/list/alldepartments = list("Central Command")
 		authenticated = 0
 
 	if(href_list["dept"])
+		var/lastdpt = dpt
 		dpt = input(usr, "Which department?", "Choose a department", "") as null|anything in alldepartments
+		if(!dpt) dpt = lastdpt
 
 	if(href_list["auth"])
 		if ( (!( authenticated ) && (scan)) )