fixes and tweaks for the harvester

Signed-off-by: caelaislinn <cael_aislinn@yahoo.com.au>

code/modules/research/artifact_analysis.dm

@@ -209,6 +209,7 @@
 	cur_artifact.name = "alien artifact ([cur_artifact.display_id])"
 	cur_artifact.desc = "A large alien device. It has a small tag near the bottom that reads \"[cur_artifact.display_id]\"."
 	cur_id = cur_artifact.display_id
+	cur_artifact.my_effect.artifact_id = cur_artifact.display_id
 
 /obj/machinery/artifact_analyser/Topic(href, href_list)
 

code/modules/research/artifact_effect.dm

@@ -293,11 +293,11 @@
 					if(istype(M:wear_suit,/obj/item/clothing/suit/bio_suit/anomaly) && istype(M:head,/obj/item/clothing/head/bio_hood/anomaly))
 						continue
 					M << "\blue A wave of energy invigorates you."
-					M.adjustBruteLoss(5)
+					M.adjustBruteLoss(-5)
-					M.adjustFireLoss(5)
+					M.adjustFireLoss(-5)
-					M.adjustToxLoss(5)
+					M.adjustToxLoss(-5)
-					M.adjustOxyLoss(5)
+					M.adjustOxyLoss(-5)
-					M.adjustBrainLoss(5)
+					M.adjustBrainLoss(-5)
 					M.updatehealth()
 				return 1
 			if("injure")

code/modules/research/artifact_harvester.dm

@@ -66,7 +66,7 @@
 		else
 			if(inserted_battery)
 				dat += "<b>[inserted_battery.name]</b> inserted, charge level: [inserted_battery.stored_charge]/[inserted_battery.capacity] ([(inserted_battery.stored_charge/inserted_battery.capacity)*100]%)<BR>"
-				dat += "<b>Energy signature ID:</b>[inserted_battery.battery_effect.artifact_id]<BR>"
+				dat += "<b>Energy signature ID:</b>[inserted_battery.battery_effect.artifact_id == "" ? "???" : "[inserted_battery.battery_effect.artifact_id]"]<BR>"
 				dat += "<A href='?src=\ref[src];ejectbattery=1'>Eject battery</a><BR>"
 				dat += "<A href='?src=\ref[src];drainbattery=1'>Drain battery of all charge</a><BR>"
 				dat += "<A href='?src=\ref[src];harvest=1'>Begin harvesting</a><BR>"
@@ -94,7 +94,7 @@
 
 		var/mundane = 0
 		for(var/obj/O in get_turf(owned_pad))
-			if(!istype(O, /obj/machinery/artifact))
+			if(!istype(O, /obj/machinery/artifact) && !istype(O, /obj/machinery/analyser_pad))
 				mundane++
 				break
 		for(var/mob/O in get_turf(owned_pad))

code/modules/research/artifact_synthetic.dm

@@ -44,9 +44,9 @@
 		if(!inserted_battery)
 			dat += "Please insert battery<BR>"
 		else
-			dat += "[inserted_battery] inserted, anomaly ID: [inserted_battery.battery_effect.artifact_id]<BR>"
+			dat += "[inserted_battery] inserted, anomaly ID: [inserted_battery.battery_effect.artifact_id == "" ? "???" : "[inserted_battery.battery_effect.artifact_id]"]<BR>"
 			dat += "<b>Total Power:</b> [inserted_battery.stored_charge]/[inserted_battery.capacity]<BR><BR>"
-			dat += "<b>Timed activation:</b> <A href='?src=\ref[src];changetime=-100'>--</a> <A href='?src=\ref[src];changetime=-10'>-</a> [time >= 1000 ? "[time/10]" : time >= 100 ? " [time/10]" : "  [time/10]" ] <A href='?src=\ref[src];changetime=10'>+</a> <A href='?src=\ref[src];changetime=100'>++</a><BR>"
+			dat += "<b>Timed activation:</b> <A href='?src=\ref[src];neg_changetime_max=-100'>--</a> <A href='?src=\ref[src];neg_changetime=-10'>-</a> [time >= 1000 ? "[time/10]" : time >= 100 ? " [time/10]" : "  [time/10]" ] <A href='?src=\ref[src];changetime=10'>+</a> <A href='?src=\ref[src];changetime_max=100'>++</a><BR>"
 			if(cooldown && !activated)
 				dat += "<font color=red>Cooldown in progress.</font><BR>"
 			else if(activated)
@@ -87,13 +87,13 @@
 /obj/item/weapon/anodevice/proc/pulse()
 	if(activated)
 		time -= 10
+		stored_charge -= 10 + rand(-1,1)
 		cooldown += 10
 		if(time <= 0)
 			time = 0
 			activated = 0
 			var/turf/T = get_turf(src)
 			T.visible_message("\icon[src]\blue The utiliser device buzzes.", "\icon[src]\blue You hear something buzz.")
-			updateDialog()
 		else
 			inserted_battery.battery_effect.DoEffect(src)
 	else if(cooldown > 0)
@@ -102,15 +102,36 @@
 			cooldown = 0
 			var/turf/T = get_turf(src)
 			T.visible_message("\icon[src]\blue The utiliser device chimes.", "\icon[src]\blue You hear something chime.")
-			updateDialog()
 
 	spawn(10)
 		pulse()
 
 /obj/item/weapon/anodevice/Topic(href, href_list)
+
+	if(href_list["neg_changetime_max"])
+		time += -100
+		if(time > inserted_battery.capacity)
+			time = inserted_battery.capacity
+		else if (time < 0)
+			time = 0
+	if(href_list["neg_changetime"])
+		time += -10
+		if(time > inserted_battery.capacity)
+			time = inserted_battery.capacity
+		else if (time < 0)
+			time = 0
 	if(href_list["changetime"])
-		var/mod = href_list["changetime"]
+		time += 10
-		time += num2text(mod)
+		if(time > inserted_battery.capacity)
+			time = inserted_battery.capacity
+		else if (time < 0)
+			time = 0
+	if(href_list["changetime_max"])
+		time += 100
+		if(time > inserted_battery.capacity)
+			time = inserted_battery.capacity
+		else if (time < 0)
+			time = 0
 
 	if(href_list["stoptimer"])
 		activated = 0
@@ -127,4 +148,5 @@
 		usr << browse(null, "window=anodevice")
 		usr.machine = null
 
-	updateDialog()
+	if(usr)
+		src.interact(usr)

config/admins.txt

@@ -2,6 +2,7 @@ abi79 - Game Master
 arcalane - Game Admin
 bobbehluvspropane - Game Admin
 cacophony - Retired Admin
+caelaislinn - Game Master
 cajoes - Game Admin
 cib - Game Master
 compactninja - Game Master