old energy stuffs

code/__DEFINES/inventory.dm

@@ -572,6 +572,8 @@ GLOBAL_LIST_INIT(storage_shoes_can_hold, typecacheof(list(
 	/obj/item/gun/ballistic/revolver/police,
 	/obj/item/gun/ballistic/revolver/m29/snub,
 	/obj/item/gun/ballistic/automatic/pistol/ninemil/ruby,
+	/obj/item/gun/energy/laser/plasma/pistol/eve,
+	/obj/item/gun/energy/laser/plasma/pistol/light,
 	)))
 
 GLOBAL_LIST_INIT(plushbelt_allowed, typecacheof(list(

code/game/objects/effects/temporary_visuals/miscellaneous.dm

@@ -345,6 +345,10 @@
 	icon_state = "impact_laser"
 	duration = 4
 
+/obj/effect/temp_visual/impact_effect/white_laser
+	icon_state = "punch"
+	duration = 4
+
 /obj/effect/temp_visual/impact_effect/red_laser/wall
 	icon_state = "impact_laser_wall"
 	duration = 10
@@ -361,6 +365,14 @@
 	icon_state = "impact_laser_purple"
 	duration = 4
 
+/obj/effect/temp_visual/impact_effect/cyan_laser
+	icon_state = "impact_laser_cyan"
+	duration = 4
+
+/obj/effect/temp_visual/impact_effect/yellow_laser
+	icon_state = "electricity2"
+	duration = 4
+
 /obj/effect/temp_visual/impact_effect/shrink
 	icon_state = "m_shield"
 	duration = 10

code/game/objects/effects/temporary_visuals/projectiles/impact.dm

@@ -48,3 +48,15 @@
 /obj/effect/projectile/impact/laser/emitter
 	name = "emitter impact"
 	icon_state = "impact_emitter"
+
+/obj/effect/projectile/impact/twin_laser
+	name = "twin laser impact"
+	icon_state = "impact_eye"
+
+/obj/effect/projectile/impact/purple_laser
+	name = "purple laser impact"
+	icon_state = "impact_hcult"
+
+/obj/effect/projectile/impact/plasma
+	name = "plasma stream impact"
+	icon_state = "impact_bfg"

code/game/objects/effects/temporary_visuals/projectiles/muzzle.dm

@@ -39,3 +39,12 @@
 /obj/effect/projectile/muzzle/laser/emitter
 	name = "emitter flash"
 	icon_state = "muzzle_emitter"
+
+/obj/effect/projectile/muzzle/twin_laser
+	icon_state = "muzzle_eye"
+
+/obj/effect/projectile/muzzle/purple_laser
+	icon_state = "muzzle_hcult"
+
+/obj/effect/projectile/muzzle/plasma
+	icon_state = "muzzle_bfg"

code/game/objects/effects/temporary_visuals/projectiles/tracer.dm

@@ -75,3 +75,15 @@
 /obj/effect/projectile/tracer/laser/emitter
 	name = "emitter beam"
 	icon_state = "emitter"
+
+/obj/effect/projectile/tracer/twin_laser
+	name = "twin laser"
+	icon_state = "eye"
+
+/obj/effect/projectile/tracer/purple_laser
+	name = "purple laser"
+	icon_state = "hcult"
+
+/obj/effect/projectile/tracer/plasma
+	name = "plasma stream"
+	icon_state = "bfg"

code/game/objects/items/devices/battery_box.dm

@@ -8,8 +8,8 @@
 	desc = "A HellBurn PRO portable battery bank, used to charge your devices on the go."
 	icon = 'icons/obj/powerbox.dmi'
 	icon_state = "powerbox"
-	w_class = WEIGHT_CLASS_SMALL
-	slot_flags = ITEM_SLOT_BELT
+	w_class = WEIGHT_CLASS_NORMAL
+	slot_flags = ITEM_SLOT_BELT | ITEM_SLOT_NECK
 	flags_1 = CONDUCT_1 // | HEAR_1
 	custom_price = 2000
 	custom_premium_price = 2000
@@ -33,8 +33,9 @@
 
 /// The blender itself
 /datum/component/storage/concrete/box/portable_charger
-	max_items = 4 // Batbox, switch, and a couple batteries
-	max_w_class = WEIGHT_CLASS_SMALL
+	max_items = 7 // Batbox, switch, and a few batteries
+	max_combined_w_class = 7 // two tiny components, and room for 5 tiny batteries / 2 smol / 1 normal
+	max_w_class = WEIGHT_CLASS_NORMAL
 
 /obj/item/storage/battery_box/Initialize()
 	. = ..()
@@ -265,7 +266,7 @@
 	icon = 'icons/obj/power.dmi'
 	icon_state = "cell"
 	item_state = "cell"
-	maxcharge = 900
+	maxcharge = 36000
 	interaction_flags_item = INTERACT_ITEM_ATTACK_HAND_IS_SHIFT
 	w_class = WEIGHT_CLASS_SMALL
 	ratingdesc = FALSE

code/game/objects/items/loadout_beacons.dm

@@ -1327,16 +1327,20 @@ GLOBAL_LIST_EMPTY(loadout_boxes)
 	name = "compact rcw case"
 	w_class = WEIGHT_CLASS_NORMAL //no roundstart laser rifles rn
 
+
 /obj/item/storage/box/gun/energy/PopulateContents()
-	new /obj/item/gun/energy/laser/auto/worn(src)
-	new /obj/item/stock_parts/cell/ammo/ecp(src)
+	new /obj/item/gun/energy/laser/auto(src)
+	new /obj/item/stock_parts/cell/ammo/ec(src)
+
 
+/*
 /obj/item/storage/box/gun/energy/plasma
 	name = "plasma pistol case"
 
 /obj/item/storage/box/gun/energy/plasma/PopulateContents()
 	new /obj/item/gun/energy/laser/plasma/pistol/worn(src)
 	new /obj/item/stock_parts/cell/ammo/ec(src)
+*/
 
 /obj/item/storage/box/gun/energy/stun
 	name = "compliance regulator case"
@@ -1350,7 +1354,7 @@ GLOBAL_LIST_EMPTY(loadout_boxes)
 
 /obj/item/storage/box/gun/energy/compact_rcw/PopulateContents()
 	new /obj/item/gun/energy/laser/auto(src)
-	new /obj/item/stock_parts/cell/ammo/ecp(src)
+	new /obj/item/stock_parts/cell/ammo/ec(src)
 
 /obj/item/storage/box/gun/energy/wattz1000
 	name = "wattz 1000 case"
@@ -1359,12 +1363,15 @@ GLOBAL_LIST_EMPTY(loadout_boxes)
 	new /obj/item/gun/energy/laser/wattz(src)
 	new /obj/item/stock_parts/cell/ammo/ec(src)
 
+/*
 /obj/item/storage/box/gun/energy/wornaep7
 	name = "worn AEP-7 case"
 
+
 /obj/item/storage/box/gun/energy/wornaep7/PopulateContents()
 	new /obj/item/gun/energy/laser/pistol/worn(src)
 	new /obj/item/stock_parts/cell/ammo/ec(src)
+*/
 
 /obj/item/choice_beacon/box/gun //template for sprites
 	name = "weapon case"
@@ -1391,11 +1398,13 @@ GLOBAL_LIST_EMPTY(loadout_boxes)
 	entry_class = LOADOUT_CAT_ENERGY
 	spawn_thing = /obj/item/storage/box/gun/energy
 
+/*
 /datum/loadout_box/plasma
 	entry_tag = "Plasma Pistol"
 	entry_flags = LOADOUT_FLAG_PREMIUM
 	entry_class = LOADOUT_CAT_PREMIUM
 	spawn_thing = /obj/item/storage/box/gun/energy/plasma
+*/
 
 /datum/loadout_box/aer9
 	entry_tag = "AER-9"
@@ -1427,11 +1436,13 @@ GLOBAL_LIST_EMPTY(loadout_boxes)
 	entry_class = LOADOUT_CAT_ENERGY
 	spawn_thing = /obj/item/storage/box/gun/energy/wattz1000
 
+/*
 /datum/loadout_box/wornaep7
 	entry_tag = "Worn AEP-7"
 	entry_flags = LOADOUT_FLAG_WASTER
 	entry_class = LOADOUT_CAT_ENERGY
 	spawn_thing = /obj/item/storage/box/gun/energy/wornaep7
+*/
 
 /// Fancyguns
 

code/modules/power/cell.dm

@@ -474,7 +474,7 @@
 	desc = "A microfusion cell, typically used as ammunition for large energy weapons."
 	icon = 'icons/fallout/objects/powercells.dmi'
 	icon_state = "mfc-full"
-	maxcharge = 2000
+	maxcharge = 9000
 	w_class = WEIGHT_CLASS_SMALL
 
 /obj/item/stock_parts/cell/ammo/mfc/update_icon()
@@ -490,20 +490,29 @@
 // Enhanced Microfusion cell - large energy weapons
 /obj/item/stock_parts/cell/ammo/mfc/large
 	name = "enhanced microfusion cell"
-	desc = "A microfusion cell, typically used as ammunition for large energy weapons. This one has been modified to hold double the normal charge."
+	desc = "A microfusion cell, typically used as ammunition for large energy weapons. This one has been modified to resist EMP and charge faster."
 	icon = 'icons/fallout/objects/powercells.dmi'
 	icon_state = "mfc-full"
-	maxcharge = 3000
+	maxcharge = 9000
+	chargerate = 200
 	w_class = WEIGHT_CLASS_SMALL
 
+/obj/item/stock_parts/cell/ammo/mfc/large/ComponentInitialize()
+	. = ..()
+	AddElement(/datum/element/empprotection, EMP_PROTECT_SELF)
+
+/obj/item/stock_parts/cell/ammo/mfc/large/corrupt()
+	return
+
 // Crafted Microfusion cell - large energy weapons
 /obj/item/stock_parts/cell/ammo/mfc/bad
 	name = "shoddy microfusion cell"
 	desc = "A microfusion cell, typically used as ammunition for large energy weapons. This one looks a little dubious though."
 	icon = 'icons/fallout/objects/powercells.dmi' //TODO: give these bad icons
 	icon_state = "mfc-full"
-	maxcharge = 1000
+	maxcharge = 9000
 	w_class = WEIGHT_CLASS_SMALL
+	cancharge = 0
 
 /obj/item/stock_parts/cell/ammo/ultracite
 	name = "ultracite cell"
@@ -518,7 +527,7 @@
 	desc = "An energy cell, typically used as ammunition for small-arms energy weapons."
 	icon = 'icons/fallout/objects/powercells.dmi'
 	icon_state = "ec-full"
-	maxcharge = 1500
+	maxcharge = 3000
 
 /obj/item/stock_parts/cell/ammo/ec/update_icon()
 	switch(charge)
@@ -535,31 +544,41 @@
 // Enhanced energy cell - small energy weapons
 /obj/item/stock_parts/cell/ammo/ec/large
 	name = "enhanced energy cell"
-	desc = "An energy cell, typically used as ammunition for small-arms energy weapons. This one has been modified to hold far more energy."
+	desc = "An energy cell, typically used as ammunition for small-arms energy weapons. This one has been modified to resist EMP and charge faster."
 	icon = 'icons/fallout/objects/powercells.dmi'
 	icon_state = "ec-full"
-	maxcharge = 2250
+	maxcharge = 3000
+	chargerate = 200
+	w_class = WEIGHT_CLASS_TINY
+
+/obj/item/stock_parts/cell/ammo/ec/large/ComponentInitialize()
+	. = ..()
+	AddElement(/datum/element/empprotection, EMP_PROTECT_SELF)
+
+/obj/item/stock_parts/cell/ammo/ec/large/corrupt()
+	return
 
 // Crafted Energy cell - small energy weapons
 /obj/item/stock_parts/cell/ammo/ec/bad
 	name = "shoddy energy cell"
 	desc = "An energy cell, typically used as ammunition for small-arms energy weapons. This one looks a little suspect though."
 	icon = 'icons/fallout/objects/powercells.dmi' //TODO: Give these a new icon
 	icon_state = "ec-full"
-	maxcharge = 750
+	maxcharge = 3000
+	cancharge = 0
 
 // Microfusion breeder? Okay, sure.
 /obj/item/stock_parts/cell/ammo/breeder
 	name = "microfusion breeder"
 	desc = "A miniature microfusion reactor connected to capacitor banks. This is not a removable part, you messed up."
 	icon = 'icons/fallout/objects/powercells.dmi'
 	icon_state = "ec-full"
-	maxcharge = 2000
+	maxcharge = 3000
 
 // Microfusion breeder? Okay, sure.
 /obj/item/stock_parts/cell/ammo/breeder/xal
 	name = "S.I.D.A. breeder"
-	maxcharge = 1100
+	maxcharge = 3000
 
 
 
@@ -569,8 +588,8 @@
 	desc = "An electron charge pack, typically used as ammunition for rapidly-firing energy weapons."
 	icon = 'icons/fallout/objects/powercells.dmi'
 	icon_state = "ecp-full"
-	maxcharge = 2400
-	w_class = WEIGHT_CLASS_SMALL
+	maxcharge = 18000
+	w_class = WEIGHT_CLASS_NORMAL
 
 /obj/item/stock_parts/cell/ammo/ecp/update_icon()
 	switch(charge)
@@ -585,20 +604,28 @@
 // Enhanced electron charge pack - rapid fire energy
 /obj/item/stock_parts/cell/ammo/ecp/large
 	name = "enhanced electron charge pack"
-	desc = "An electron charge pack, typically used as ammunition for rapidly-firing energy weapons. This one has been modified to hold far more energy."
+	desc = "An electron charge pack, typically used as ammunition for rapidly-firing energy weapons. This one has been modified to resist EMP and charge faster."
 	icon = 'icons/fallout/objects/powercells.dmi'
 	icon_state = "ecp-full"
-	maxcharge = 3600
-	w_class = WEIGHT_CLASS_SMALL
+	maxcharge = 18000
+	w_class = WEIGHT_CLASS_NORMAL
+
+/obj/item/stock_parts/cell/ammo/ecp/large/ComponentInitialize()
+	. = ..()
+	AddElement(/datum/element/empprotection, EMP_PROTECT_SELF)
+
+/obj/item/stock_parts/cell/ammo/ecp/large/corrupt()
+	return
 
 // Crafted Electron charge pack - bad rapid fire energy
 /obj/item/stock_parts/cell/ammo/ecp/bad
 	name = "counterfeit electron charge pack"
 	desc = "An electron charge pack, typically used as ammunition for rapidly-firing energy weapons. This one looks slightly off, somehow."
 	icon = 'icons/fallout/objects/powercells.dmi' //TODO: Give a shitty icon
 	icon_state = "ecp-full"
-	maxcharge = 1200
-	w_class = WEIGHT_CLASS_SMALL
+	maxcharge = 18000
+	w_class = WEIGHT_CLASS_NORMAL
+	cancharge = 0
 
 // Alien power cell
 /obj/item/stock_parts/cell/ammo/alien

code/modules/projectiles/ammunition/energy/_energy.dm

@@ -8,4 +8,4 @@
 	fire_sound = 'sound/weapons/laser.ogg'
 	firing_effect_type = /obj/effect/temp_visual/dir_setting/firing_effect/energy
 	heavy_metal = FALSE
-	damage_threshold_penetration = 5
+//	damage_threshold_penetration = 5