Merge remote-tracking branch 'refs/remotes/PolarisSS13/master' into GunsGunsGuns

code/modules/client/preference_setup/global/setting_datums.dm

@@ -5,7 +5,7 @@ var/list/_client_preferences_by_type
 /proc/get_client_preferences()
 	if(!_client_preferences)
 		_client_preferences = list()
-		for(var/ct in subtypes(/datum/client_preference))
+		for(var/ct in subtypesof(/datum/client_preference))
 			var/datum/client_preference/client_type = ct
 			if(initial(client_type.description))
 				_client_preferences += new client_type()

code/modules/lighting/lighting_process.dm

@@ -22,7 +22,7 @@
 		L.force_update = 0
 		L.needs_update = 0
 
-		scheck()
+		SCHECK
 
 	var/list/lighting_update_overlays_old = lighting_update_overlays //Same as above.
 	lighting_update_overlays = null //Same as above
@@ -32,4 +32,4 @@
 		O.update_overlay()
 		O.needs_update = 0
 
-		scheck()
+		SCHECK

code/modules/mob/living/carbon/human/human.dm

@@ -56,8 +56,8 @@
 /mob/living/carbon/human/Stat()
 	..()
 	if(statpanel("Status"))
-		stat(null, "Intent: [a_intent]")
-		stat(null, "Move Mode: [m_intent]")
+		stat("Intent:", "[a_intent]")
+		stat("Move Mode:", "[m_intent]")
 		if(emergency_shuttle)
 			var/eta_status = emergency_shuttle.get_status_panel_eta()
 			if(eta_status)

code/modules/mob/mob.dm

@@ -661,15 +661,13 @@
 
 		if(client.holder)
 			if(statpanel("Status"))
-				stat("Location:","([x], [y], [z])")
-			if(statpanel("Processes"))
+				stat("Location:", "([x], [y], [z]) [loc]")
 				stat("CPU:","[world.cpu]")
 				stat("Instances:","[world.contents.len]")
-				if(processScheduler && processScheduler.getIsRunning())
-					for(var/datum/controller/process/P in processScheduler.processes)
-						stat(P.getStatName(), P.getTickTime())
-				else
-					stat("processScheduler is not running.")
+
+			if(statpanel("Processes"))
+				if(processScheduler)
+					processScheduler.statProcesses()
 
 		if(listed_turf && client)
 			if(!TurfAdjacent(listed_turf))

code/modules/reagents/reagent_containers/food/lunch.dm

@@ -107,7 +107,7 @@ var/list/lunchables_ethanol_reagents_ = list(/datum/reagent/ethanol/acid_spit,
 
 /proc/init_lunchable_reagent_list(var/list/banned_reagents, var/reagent_types)
 	. = list()
-	for(var/reagent_type in subtypes(reagent_types))
+	for(var/reagent_type in subtypesof(reagent_types))
 		if(reagent_type in banned_reagents)
 			continue
 		var/datum/reagent/reagent = reagent_type

code/modules/research/designs.dm

@@ -206,6 +206,60 @@ other types of metals and chemistry for reagents).
 	build_path = /obj/item/weapon/storage/part_replacer
 	sort_string = "CBAAA"
 
+/datum/design/item/powercell
+	build_type = PROTOLATHE | MECHFAB
+
+/datum/design/item/powercell/AssembleDesignName()
+	name = "Power cell model ([item_name])"
+
+/datum/design/item/powercell/AssembleDesignDesc()
+	if(build_path)
+		var/obj/item/weapon/cell/C = build_path
+		desc = "Allows the construction of power cells that can hold [initial(C.maxcharge)] units of energy."
+
+/datum/design/item/powercell/Fabricate()
+	var/obj/item/weapon/cell/C = ..()
+	C.charge = 0 //shouldn't produce power out of thin air.
+	return C
+
+/datum/design/item/powercell/basic
+	name = "basic"
+	build_type = PROTOLATHE | MECHFAB
+	id = "basic_cell"
+	req_tech = list(TECH_POWER = 1)
+	materials = list(DEFAULT_WALL_MATERIAL = 700, "glass" = 50)
+	build_path = /obj/item/weapon/cell
+	category = "Misc"
+	sort_string = "DAAAA"
+
+/datum/design/item/powercell/high
+	name = "high-capacity"
+	build_type = PROTOLATHE | MECHFAB
+	id = "high_cell"
+	req_tech = list(TECH_POWER = 2)
+	materials = list(DEFAULT_WALL_MATERIAL = 700, "glass" = 60)
+	build_path = /obj/item/weapon/cell/high
+	category = "Misc"
+	sort_string = "DAAAB"
+
+/datum/design/item/powercell/super
+	name = "super-capacity"
+	id = "super_cell"
+	req_tech = list(TECH_POWER = 3, TECH_MATERIAL = 2)
+	materials = list(DEFAULT_WALL_MATERIAL = 700, "glass" = 70)
+	build_path = /obj/item/weapon/cell/super
+	category = "Misc"
+	sort_string = "DAAAC"
+
+/datum/design/item/powercell/hyper
+	name = "hyper-capacity"
+	id = "hyper_cell"
+	req_tech = list(TECH_POWER = 5, TECH_MATERIAL = 4)
+	materials = list(DEFAULT_WALL_MATERIAL = 400, "gold" = 150, "silver" = 150, "glass" = 70)
+	build_path = /obj/item/weapon/cell/hyper
+	category = "Misc"
+	sort_string = "DAAAD"
+
 /datum/design/item/hud
 	materials = list(DEFAULT_WALL_MATERIAL = 50, "glass" = 50)
 

code/modules/research/research.dm

@@ -124,7 +124,7 @@ research holder datum.
 
 // A simple helper proc to find the name of a tech with a given ID.
 /proc/CallTechName(var/ID)
-	for(var/T in subtypes(/datum/tech))
+	for(var/T in subtypesof(/datum/tech))
 		var/datum/tech/check_tech = T
 		if(initial(check_tech.id) == ID)
 			return  initial(check_tech.name)