Merge pull request #3984 from Citadel-Station-13/upstream-merge-32188

[MIRROR] JSON feedback

code/modules/power/cell.dm

@@ -25,7 +25,7 @@
 	return src
 
 /obj/item/stock_parts/cell/New()
-	..()
+	. = ..()
 	START_PROCESSING(SSobj, src)
 	charge = maxcharge
 	if(ratingdesc)
@@ -74,7 +74,7 @@
 		return 0
 	charge = (charge - amount)
 	if(!istype(loc, /obj/machinery/power/apc))
-		SSblackbox.add_details("cell_used","[src.type]")
+		SSblackbox.record_feedback("tally", "cell_used", 1, "[src.type]")
 	return 1
 
 // recharge the cell
@@ -166,8 +166,8 @@
 	materials = list(MAT_GLASS=40)
 	rating = 2
 
-/obj/item/stock_parts/cell/crap/empty/New()
-	..()
+/obj/item/stock_parts/cell/crap/empty/Initialize()
+	. = ..()
 	charge = 0
 
 /obj/item/stock_parts/cell/upgraded
@@ -190,8 +190,8 @@
 	materials = list(MAT_GLASS=40)
 	rating = 2.5
 
-/obj/item/stock_parts/cell/secborg/empty/New()
-	..()
+/obj/item/stock_parts/cell/secborg/empty/Initialize()
+	. = ..()
 	charge = 0
 
 /obj/item/stock_parts/cell/pulse //200 pulse shots
@@ -224,8 +224,8 @@
 	maxcharge = 15000
 	chargerate = 2250
 
-/obj/item/stock_parts/cell/high/empty/New()
-	..()
+/obj/item/stock_parts/cell/high/empty/Initialize()
+	. = ..()
 	charge = 0
 
 /obj/item/stock_parts/cell/super
@@ -237,8 +237,8 @@
 	rating = 4
 	chargerate = 2000
 
-/obj/item/stock_parts/cell/super/empty/New()
-	..()
+/obj/item/stock_parts/cell/super/empty/Initialize()
+	. = ..()
 	charge = 0
 
 /obj/item/stock_parts/cell/hyper
@@ -250,8 +250,8 @@
 	rating = 5
 	chargerate = 3000
 
-/obj/item/stock_parts/cell/hyper/empty/New()
-	..()
+/obj/item/stock_parts/cell/hyper/empty/Initialize()
+	. = ..()
 	charge = 0
 
 /obj/item/stock_parts/cell/bluespace
@@ -264,8 +264,8 @@
 	rating = 6
 	chargerate = 4000
 
-/obj/item/stock_parts/cell/bluespace/empty/New()
-	..()
+/obj/item/stock_parts/cell/bluespace/empty/Initialize()
+	. = ..()
 	charge = 0
 
 /obj/item/stock_parts/cell/infinite
@@ -321,8 +321,8 @@
 	maxcharge = 500
 	rating = 2
 
-/obj/item/stock_parts/cell/emproof/empty/New()
-	..()
+/obj/item/stock_parts/cell/emproof/empty/Initialize()
+	. = ..()
 	charge = 0
 
 /obj/item/stock_parts/cell/emproof/emp_act(severity)

code/modules/power/singularity/generator.dm

@@ -32,7 +32,7 @@
 	if(energy > 0)
 		if(energy >= 200)
 			var/turf/T = get_turf(src)
-			SSblackbox.add_details("engine_started","[src.type]")
+			SSblackbox.record_feedback("tally", "engine_started", 1, type)
 			var/obj/singularity/S = new creation_type(T, 50)
 			transfer_fingerprints_to(S)
 			qdel(src)