Merge branch 'master' into upstream-merge-14976

code/modules/power/cell.dm

@@ -25,6 +25,7 @@
 	var/self_recharge = FALSE // If true, the cell will recharge itself.
 	var/charge_amount = 25 // How much power to give, if self_recharge is true.  The number is in absolute cell charge, as it gets divided by CELLRATE later.
 	var/last_use = 0 // A tracker for use in self-charging
+	var/connector_type = "standard" //What connector sprite to use when in a cell charger, null if no connectors
 	var/charge_delay = 0 // How long it takes for the cell to start recharging after last use
 	matter = list(MAT_STEEL = 700, MAT_GLASS = 50)
 	drop_sound = 'sound/items/drop/component.ogg'

code/modules/power/cells/device_cells.dm

@@ -21,10 +21,45 @@
 	charge = 0
 	update_icon()
 
+/*
+ * Crap Device
+ */
+/obj/item/weapon/cell/device/crap
+	name = "\improper rechargable D battery"
+	desc = "An older, cheap power cell designed to power handheld devices. It's probably been in use for quite some time now."
+	description_fluff = "You can't top the rust top." //TOTALLY TRADEMARK INFRINGEMENT
+	origin_tech = list(TECH_POWER = 0)
+	icon_state = "device_crap"
+	maxcharge = 240
+	matter = list(MAT_STEEL = 350, MAT_GLASS = 30)
+
+/obj/item/weapon/cell/device/crap/update_icon() //No visible charge indicator
+	return
+
+/obj/item/weapon/cell/device/crap/empty/Initialize()
+	. = ..()
+	charge = 0
+	update_icon()
+
+/*
+ * Hyper Device
+ */
+/obj/item/weapon/cell/device/hyper
+	name = "hyper device power cell"
+	desc = "A small power cell designed to power handheld devices. Has a better charge than a standard device cell."
+	icon_state = "hype_device_cell"
+	maxcharge = 600
+	matter = list(MAT_STEEL = 400, MAT_GLASS = 60)
+
+/obj/item/weapon/cell/device/hyper/empty/Initialize()
+	. = ..()
+	charge = 0
+	update_icon()
+
 /*
  * EMP Proof Device
  */
-/obj/item/weapon/cell/device/empproof //UNUSED
+/obj/item/weapon/cell/device/empproof
 	name = "shielded device power cell"
 	desc = "A small power cell designed to power handheld devices. Shielded from EMPs."
 	icon_state = "up_device_cell"

code/modules/power/cells/power_cells.dm

@@ -1,34 +1,30 @@
 //CHOMP Disabled in DME in favor of modular_chomp folder
+/*
+ * Empty
+ */
+/obj/item/weapon/cell/empty/New()
+	..()
+	charge = 0
+
 /*
  * Crap
  */
 /obj/item/weapon/cell/crap
-	name = "\improper rechargable AA battery"
-	desc = "You can't top the plasma top." //TOTALLY TRADEMARK INFRINGEMENT
+	name = "\improper rechargable DD battery"
+	desc = "An older, cheap power cell. It's probably been in use for quite some time now."
+	description_fluff = "You can't top the rust top." //TOTALLY TRADEMARK INFRINGEMENT
 	origin_tech = list(TECH_POWER = 0)
 	icon_state = "crap"
 	maxcharge = 500
 	matter = list(MAT_STEEL = 700, MAT_GLASS = 40)
 
+/obj/item/weapon/cell/crap/update_icon() //No visible charge indicator
+	return
+
 /obj/item/weapon/cell/crap/empty/New()
 	..()
 	charge = 0
 
-/*
- * Security Borg
- */
-/obj/item/weapon/cell/secborg
-	name = "security borg rechargable D battery"
-	origin_tech = list(TECH_POWER = 0)
-	icon_state = "secborg"
-	maxcharge = 600	//600 max charge / 100 charge per shot = six shots
-	matter = list(MAT_STEEL = 700, MAT_GLASS = 40)
-
-/obj/item/weapon/cell/secborg/empty/New()
-	..()
-	charge = 0
-	update_icon()
-
 /*
  * APC
  */
@@ -90,10 +86,23 @@
 /obj/item/weapon/cell/mech
 	name = "mecha power cell"
 	icon_state = "mech"
+	connector_type = "mech"
 	charge = 15000
 	maxcharge = 15000
 	matter = list(MAT_STEEL = 800, MAT_GLASS = 60)
 
+/obj/item/weapon/cell/mech/lead
+	name = "lead acid battery"
+	desc = "An ancient battery design not commonly seen anymore. It looks like it'd fit inside a mech however..."
+	origin_tech = list(TECH_POWER = 0) //Litteraly an old car battery, doesn't need tech
+	icon_state = "lead"
+	charge = 8000
+	maxcharge = 8000
+	matter = list(MAT_STEEL = 300, MAT_GLASS = 10)
+
+/obj/item/weapon/cell/mech/lead/update_icon() //No visible charge indicator
+	return
+
 /obj/item/weapon/cell/mech/high
 	name = "high-capacity mecha power cell"
 	origin_tech = list(TECH_POWER = 3)
@@ -147,6 +156,7 @@
 	origin_tech = list(TECH_POWER = 4, TECH_BIO = 5)
 	icon = 'icons/mob/slimes.dmi' //'icons/obj/harvest.dmi'
 	icon_state = "yellow slime extract" //"potato_battery"
+	connector_type = "slime"
 	description_info = "This 'cell' holds a max charge of 10k and self recharges over time."
 	maxcharge = 10000
 	matter = null
@@ -162,8 +172,12 @@
 	maxcharge = 120 //Emergency lights use 0.2 W per tick, meaning ~10 minutes of emergency power from a cell
 	matter = list(MAT_GLASS = 20)
 	icon_state = "em_light"
+	connector_type = "emergency"
 	w_class = ITEMSIZE_TINY
 
+/obj/item/weapon/cell/emergency_light/update_icon() //No visible charge indicator
+	return
+
 /obj/item/weapon/cell/emergency_light/Initialize()
 	. = ..()
 	var/area/A = get_area(src)