Merge pull request #5714 from Cyrelius/Weapons/Armour

Energy Weapons Balance Pass.

code/modules/mining/ore_redemption_machine/survey_vendor.dm

@@ -54,10 +54,10 @@
 		EQUIPMENT("Defense Equipment - Plasteel Machete",		/obj/item/weapon/material/knife/machete,							50),
 		EQUIPMENT("Defense Equipment - Razor Drone Deployer",	/obj/item/weapon/grenade/spawnergrenade/manhacks/station/locked,	100),
 		EQUIPMENT("Defense Equipment - Sentry Drone Deployer",	/obj/item/weapon/grenade/spawnergrenade/ward,						150),
-		EQUIPMENT("Defense Equipment - Marksman Frontier Phaser", 	/obj/item/weapon/gun/energy/locked/frontier/rifle,				1500), //CHOMPADD
+		EQUIPMENT("Defense Equipment - Marksman Frontier Phaser", 	/obj/item/weapon/gun/energy/locked/frontier/rifle,				800), //CHOMPADD
-		EQUIPMENT("Defense Equipment - Frontier Carbine",		/obj/item/weapon/gun/energy/locked/frontier/carbine,				1500), //CHOMPEDIT
+		EQUIPMENT("Defense Equipment - Frontier Carbine",		/obj/item/weapon/gun/energy/locked/frontier/carbine,				800), //CHOMPEDIT
-		EQUIPMENT("Defense Equipment - Frontier Phaser",		/obj/item/weapon/gun/energy/locked/frontier,					1200), //CHOMPADD
+		EQUIPMENT("Defense Equipment - Frontier Phaser",		/obj/item/weapon/gun/energy/locked/frontier,					600), //CHOMPADD
-		EQUIPMENT("Defense Equipment - Holdout Frontier Phaser", 	/obj/item/weapon/gun/energy/locked/frontier/holdout,				700), //CHOMPADD
+		EQUIPMENT("Defense Equipment - Holdout Frontier Phaser", 	/obj/item/weapon/gun/energy/locked/frontier/holdout,				300), //CHOMPADD
 		EQUIPMENT("Hybrid Equipment - Proto-Kinetic Dagger",	/obj/item/weapon/kinetic_crusher/machete/dagger,					75),
 		EQUIPMENT("Hybrid Equipment - Proto-Kinetic Machete",	/obj/item/weapon/kinetic_crusher/machete,							250),
 		EQUIPMENT("Fishing Net",								/obj/item/weapon/material/fishing_net,								50),

code/modules/projectiles/guns/energy/laser.dm

@@ -8,7 +8,7 @@
 	wielded_item_state = "laser-wielded"
 	fire_delay = 8
 	slot_flags = SLOT_BELT|SLOT_BACK
-	w_class = ITEMSIZE_HUGE //CHOMP Edit
+	w_class = ITEMSIZE_LARGE //CHOMP Edit - huge was dumb for this.
 	force = 10
 	origin_tech = list(TECH_COMBAT = 3, TECH_MAGNET = 2)
 	matter = list(MAT_STEEL = 2000)
@@ -258,15 +258,15 @@
 	icon_state = "lasercannon"
 	item_state = null
 	wielded_item_state = "mhdhowitzer-wielded" //Placeholder
-	origin_tech = list(TECH_COMBAT = 4, TECH_MATERIAL = 3, TECH_POWER = 3)
+	origin_tech = list(TECH_COMBAT = 6, TECH_MATERIAL = 6, TECH_POWER = 6)  //ChompEdit improved.
 	slot_flags = SLOT_BELT|SLOT_BACK
 	projectile_type = /obj/item/projectile/beam/heavylaser/cannon
-	battery_lock = 1
+	battery_lock = 0  //ChompEdit  This thing is worthless with this.
 	fire_delay = 20
-	w_class = ITEMSIZE_HUGE //CHOMP Edit. Lol a cannon used to be just large size? Are you kidding me? A CANNON.
+	w_class = ITEMSIZE_HUGE //CHOMP Edit. Lol a cannon used to be just large size? Are you kidding me? A CANNON.  Deserves this.
 	one_handed_penalty = 90 // The thing's heavy and huge.
 	accuracy = 45
-	charge_cost = 400 //CHOMP Edit. Let's give this thing some more shots, seeing as it needs to be recharged at a charger.
+	charge_cost = 400 //CHOMP Edit. Let's give this thing some more shots, seeing as it needs to be recharged at a charger - Most everything else is cheaper on charge cost now or smaller, this can stay the same, but with replacable batteries.
 
 /obj/item/weapon/gun/energy/lasercannon/mounted
 	name = "mounted laser cannon"
@@ -289,7 +289,7 @@
 	origin_tech = list(TECH_COMBAT = 5, TECH_MATERIAL = 3, TECH_MAGNET = 2)
 	projectile_type = /obj/item/projectile/beam/xray
 	charge_cost = 200
-	w_class = ITEMSIZE_HUGE //CHOMP Edit.
+	w_class = ITEMSIZE_LARGE //CHOMP Edit. - huge is too big, this thing hits for 25
 
 /obj/item/weapon/gun/energy/sniperrifle
 	name = "marksman energy rifle"

code/modules/projectiles/guns/energy/laser_vr.dm

@@ -157,20 +157,20 @@
 	item_icons = list(slot_l_hand_str = 'icons/mob/items/lefthand_guns_vr.dmi', slot_r_hand_str = 'icons/mob/items/righthand_guns_vr.dmi', "slot_belt" = 'icons/inventory/belt/mob_vr.dmi')
 	fire_sound = 'sound/weapons/laser2.ogg'
 	origin_tech = list(TECH_COMBAT = 4, TECH_MAGNET = 2, TECH_POWER = 4)
-	charge_cost = 300
+	charge_cost = 100 //Chompedit Reduced cost
 
 	battery_lock = 1
 	unacidable = TRUE
 
 	var/recharging = 0
-	var/phase_power = 75
+	var/phase_power = 15
 
 	projectile_type = /obj/item/projectile/beam/phaser
-	//CHOMP Edit: Changed beam type to new phaser beam type.
+	//CHOMP Edit: Changed beam type to new phaser beam type.  
 	firemodes = list(
-		list(mode_name="lethal", fire_delay=12, projectile_type=/obj/item/projectile/beam/phaser, charge_cost = 300),
+		list(mode_name="lethal", fire_delay=10, projectile_type=/obj/item/projectile/beam/phaser, charge_cost = 80), //Chompedit Reduced cost
-		list(mode_name="low-power", fire_delay=8, projectile_type=/obj/item/projectile/beam/phaser/light, charge_cost = 80),
+		list(mode_name="low-power", fire_delay=5, projectile_type=/obj/item/projectile/beam/phaser/light, charge_cost = 40), //Chompedit Reduced cost
-	)
+	)  //CHOMPedit Adjusts cost and fire delay to match adjusted beams. 
 	recoil_mode = 0 //CHOMP Addition: Removes recoil for micros.
 
 /obj/item/weapon/gun/energy/locked/frontier/unload_ammo(var/mob/user)
@@ -185,7 +185,7 @@
 			break
 		playsound(src,'sound/items/change_drill.ogg',25,1)
 		user.hud_used.update_ammo_hud(user, src)
-		if(power_supply.give(phase_power/8) < phase_power/8) //CHOMP Edit: Nerfed charge time of all phasers by adding /8 in a couple spots to this line
+		if(power_supply.give(phase_power) < phase_power)
 			break
 
 	recharging = 0
@@ -215,19 +215,22 @@
 
 /obj/item/weapon/gun/energy/locked/frontier/carbine
 	name = "frontier carbine"
-	desc = "An ergonomically improved version of the venerable frontier phaser, the carbine is a fairly new weapon, and has only been produced in limited numbers so far. Includes a built-in crank charger for recharging away from civilization. This one has a safety interlock that prevents firing while in proximity to the facility."
+	desc = "A larger and more efficient version of the venerable frontier phaser, the carbine is a fairly new weapon, and has only been produced in limited numbers so far.  Includes a built-in crank charger for recharging away from civilization. This one has a safety interlock that prevents firing while in proximity to the facility."
 	description_fluff = "The NT Brand Model AT2 Secured Phaser System, a specialty phaser that has an intergrated chip that prevents the user from opperating the weapon within the vicinity of any NanoTrasen opperated outposts/stations/bases. However, this chip can be disabled so the weapon CAN BE used in the vicinity of any NanoTrasen opperated outposts/stations/bases. The weapon doesn't use traditional weapon power cells and instead works via a pump action that recharges the internal cells. It is a staple amongst exploration personell who usually don't have the license to opperate a lethal weapon through NT and provides them with a weapon that can be recharged away from civilization."
 	icon = 'icons/obj/gun_vr.dmi'
 	icon_state = "carbinekill"
 	item_state = "energykill"
 	item_icons = list(slot_l_hand_str = 'icons/mob/items/lefthand_guns.dmi', slot_r_hand_str = 'icons/mob/items/righthand_guns.dmi')
-	phase_power = 150
+	phase_power = 25
+	one_handed_penalty = 15 //CHOMPEdit Added this, same as phase carbine.
+	w_class = ITEMSIZE_LARGE  //CHOMPEdit Should be bigger.
 
 	modifystate = "carbinekill"
 	//CHOMP Edit: Changed beam type to new phaser beam type.
 	firemodes = list(
-		list(mode_name="lethal", fire_delay=12, projectile_type=/obj/item/projectile/beam/phaser, modifystate="carbinekill", charge_cost = 300),
+		list(mode_name="lethal", fire_delay=10, projectile_type=/obj/item/projectile/beam/phaser, modifystate="carbinekill", charge_cost = 60), //Chompedit Reduced cost
-		list(mode_name="low-power", fire_delay=8, projectile_type=/obj/item/projectile/beam/phaser/light, modifystate="carbinestun", charge_cost = 80),
+		list(mode_name="low-power", fire_delay=5, projectile_type=/obj/item/projectile/beam/phaser/light, modifystate="carbinestun", charge_cost = 30), //Chompedit Reduced cost
+		list(mode_name="burst", burst=3, fire_delay=10, move_delay=4, burst_accuracy=list(0,0,0), dispersion=list(0.0, 0.2, 0.5), projectile_type=/obj/item/projectile/beam/phaser/light, charge_cost = 90), //Chompedit Added this
 	)
 
 /obj/item/weapon/gun/energy/locked/frontier/carbine/update_icon()
@@ -251,15 +254,15 @@
 	icon = 'icons/obj/gun_vr.dmi'
 	icon_state = "holdoutkill"
 	item_state = null
-	phase_power = 100
+	phase_power = 15
 
 	w_class = ITEMSIZE_SMALL
-	charge_cost = 600
+	charge_cost = 200 //Chompedit Reduced cost
 	modifystate = "holdoutkill"
 	//CHOMP Edit: Changed beam type to new phaser beam type.
 	firemodes = list(
-		list(mode_name="lethal", fire_delay=12, projectile_type=/obj/item/projectile/beam/phaser, modifystate="holdoutkill", charge_cost = 600),
+		list(mode_name="lethal", fire_delay=20, projectile_type=/obj/item/projectile/beam/phaser, modifystate="holdoutkill", charge_cost = 200), //Chompedit Reduced cost
-		list(mode_name="low-power", fire_delay=8, projectile_type=/obj/item/projectile/beam/phaser/light, modifystate="holdoutstun", charge_cost = 120),
+		list(mode_name="low-power", fire_delay=10, projectile_type=/obj/item/projectile/beam/phaser/light, modifystate="holdoutstun", charge_cost = 50), //Chompedit Reduced cost
 		list(mode_name="stun", fire_delay=12, projectile_type=/obj/item/projectile/beam/stun/med, modifystate="holdoutshock", charge_cost = 300),
 	)
 
@@ -285,13 +288,13 @@
 	accuracy = -15 //better than most snipers but still has penalty
 	scoped_accuracy = 40
 	one_handed_penalty = 50 // The weapon itself is heavy, and the long barrel makes it hard to hold steady with just one hand.
-	phase_power = 150 //efficient crank charger
+	phase_power = 30 //ChompEdit efficient crank charger
 	projectile_type = /obj/item/projectile/beam/phaser/heavy //CHOMPEdit
 	modifystate = "riflekill"
 	//CHOMP Edit: Changed beam type to new phaser beam type.
 	firemodes = list(
-		list(mode_name="sniper", fire_delay=35, projectile_type=/obj/item/projectile/beam/phaser/heavy, modifystate="riflekill", charge_cost = 600),
+		list(mode_name="lethal", fire_delay=12, projectile_type=/obj/item/projectile/beam/phaser, modifystate="riflestun", charge_cost = 60), //Chompedit Reduced cost
-		list(mode_name="lethal", fire_delay=12, projectile_type=/obj/item/projectile/beam/phaser, modifystate="riflestun", charge_cost = 200),
+		list(mode_name="sniper", fire_delay=35, move_delay=4, projectile_type=/obj/item/projectile/beam/phaser/heavy, modifystate="riflekill", charge_cost = 100), //Chompedit Reduced cost
 	)
 
 /obj/item/weapon/gun/energy/locked/frontier/rifle/ui_action_click()
@@ -325,14 +328,14 @@
 	icon = 'icons/obj/gun_vr.dmi'
 	icon_state = "handbowkill"
 	item_state = null
-	phase_power = 100
+	phase_power = 20 
 
 	w_class = ITEMSIZE_SMALL
-	charge_cost = 600
+	charge_cost = 200 //Chompedit Reduced cost
 	modifystate = "handbowkill"
 	firemodes = list(
-		list(mode_name="lethal", fire_delay=12, projectile_type=/obj/item/projectile/energy/phase/bolt/heavy, modifystate="handbowkill", charge_cost = 600), //CHOMP Edit
+		list(mode_name="lethal", fire_delay=12, projectile_type=/obj/item/projectile/energy/phase/bolt/heavy, modifystate="handbowkill", charge_cost = 200), //CHOMP Edit
-		list(mode_name="low-power", fire_delay=8, projectile_type=/obj/item/projectile/energy/phase/bolt, modifystate="handbowstun", charge_cost = 200), //CHOMP Edit
+		list(mode_name="low-power", fire_delay=8, projectile_type=/obj/item/projectile/energy/phase/bolt, modifystate="handbowstun", charge_cost = 100), //CHOMP Edit
 	)
 
 /obj/item/weapon/gun/energy/locked/frontier/handbow/unlocked

code/modules/projectiles/guns/energy/phase.dm

@@ -10,7 +10,7 @@
 	item_state = "phasecarbine"
 	wielded_item_state = "phasecarbine-wielded"
 	slot_flags = SLOT_BACK|SLOT_BELT
-	charge_cost = 240
+	charge_cost = 80  //Chompedit Bringing charge cost down for all phase weapons.
 	projectile_type = /obj/item/projectile/energy/phase
 	one_handed_penalty = 15
 	recoil_mode = 0 //CHOMP Addition: Removes recoil for micros.
@@ -27,8 +27,8 @@
 	one_handed_penalty = 0
 
 /obj/item/weapon/gun/energy/locked/phasegun/unlocked/mounted/cyborg
-	charge_cost = 200  //ChompEdit  Reduced from 480 to 200
+	charge_cost = 80  //ChompEdit  Reduced from 480 to 200, further reduced to 80 to match normal phase guns
-	recharge_time = 5  //ChompEdit  Reduced from 7 to 5
+	recharge_time = 16  //ChompEdit  set up to 16 due to lower charge cost
 
 /obj/item/weapon/gun/energy/locked/phasegun/pistol
 	name = "phase pistol"
@@ -37,7 +37,7 @@
 	item_state = "taser"	//I don't have an in-hand sprite, taser will be fine
 	w_class = ITEMSIZE_NORMAL
 	slot_flags = SLOT_BELT|SLOT_HOLSTER
-	charge_cost = 300
+	charge_cost = 80  //Chompedit Bringing charge cost down for all phase weapons.
 	projectile_type = /obj/item/projectile/energy/phase/light
 	one_handed_penalty = 0
 	move_delay = 0 // CHOMPEdit: Pistols have move_delay of 0
@@ -54,7 +54,7 @@
 	use_external_power = 1
 
 /obj/item/weapon/gun/energy/locked/phasegun/pistol/unlocked/mounted/cyborg
-	charge_cost = 400
+	charge_cost = 80  //Chompedit, bringing in line with normal phase weapons
 	recharge_time = 7
 
 
@@ -66,7 +66,7 @@
 	wielded_item_state = "phaserifle-wielded"
 	w_class = ITEMSIZE_LARGE
 	slot_flags = SLOT_BACK
-	charge_cost = 150
+	charge_cost = 80  //Chompedit Bringing charge cost down for all phase weapons.
 	projectile_type = /obj/item/projectile/energy/phase/heavy
 	accuracy = 15
 	one_handed_penalty = 30
@@ -85,7 +85,7 @@
 	wielded_item_state = "phasecannon-wielded"	//TODO: New Sprites
 	w_class = ITEMSIZE_HUGE		// This thing is big.
 	slot_flags = SLOT_BACK
-	charge_cost = 100
+	charge_cost = 80  //Chompedit Bringing charge cost down for all phase weapons.
 	projectile_type = /obj/item/projectile/energy/phase/heavy/cannon
 	accuracy = 15
 	one_handed_penalty = 65

code/modules/projectiles/projectile/beams_ch.dm

@@ -1,7 +1,7 @@
 /obj/item/projectile/beam/phaser //The "medium" phaser beam.
-	damage = 10
+	damage = 20
-	SA_bonus_damage = 40
+	SA_bonus_damage = 20
-	SA_vulnerability = list(SA_ANIMAL, MOB_CLASS_SYNTHETIC, MOB_CLASS_ABERRATION, MOB_CLASS_HUMANOID)
+	SA_vulnerability = list(SA_ANIMAL, MOB_CLASS_SYNTHETIC, MOB_CLASS_ABERRATION)
 	icon = 'icons/obj/projectiles_ch.dmi'
 	icon_state = "phaser"
 	light_color = "#F18F12"
@@ -12,8 +12,8 @@
 
 
 /obj/item/projectile/beam/phaser/light
-	damage = 5
+	damage = 10
-	SA_bonus_damage = 30
+	SA_bonus_damage = 10
 	icon_state = "phaser_light"
 	light_range = 1.5
 	light_power = 0.3
@@ -23,7 +23,8 @@
 
 
 /obj/item/projectile/beam/phaser/heavy
-	SA_bonus_damage = 55
+	damage = 30
+	SA_bonus_damage = 30
 	icon_state = "phaser_heavy"
 	light_range = 3
 	light_power = 1
@@ -33,8 +34,8 @@
 
 
 /obj/item/projectile/beam/phaser/heavy/cannon
-	damage = 15
+	damage = 40
-	SA_bonus_damage = 60
+	SA_bonus_damage = 40
 
 
 /obj/effect/projectile/tracer/phaser

code/modules/projectiles/projectile/energy.dm

@@ -288,6 +288,7 @@
 	impact_effect_type = /obj/effect/temp_visual/impact_effect/monochrome_laser
 	hud_state = "plasma_sphere"
 
+/* ChompEdit, moving over to energy_ch.dm
 /obj/item/projectile/energy/phase
 	name = "phase wave"
 	icon_state = "phase"
@@ -312,6 +313,7 @@
 	damage = 15
 	SA_bonus_damage = 60	// 75 total on animals
 	hud_state = "laser_heat"
+*/
 
 /obj/item/projectile/energy/electrode/strong
 	agony = 70

code/modules/projectiles/projectile/energy_ch.dm

@@ -24,3 +24,32 @@
 	hitsound = 'sound/weapons/sear.ogg'
 	hud_state = "laser_overcharge"
 
+/obj/item/projectile/energy/phase
+	name = "phase wave"
+	icon_state = "phase"
+	range = 13 
+	damage = 5
+	SA_bonus_damage = 45
+	armor_penetration = -35
+	SA_vulnerability = list(SA_ANIMAL, MOB_CLASS_SYNTHETIC, MOB_CLASS_ABERRATION, MOB_CLASS_HUMANOID) //CHOMP Edit expand this list
+	hud_state = "laser_heat"
+
+/obj/item/projectile/energy/phase/light
+	range = 11
+	SA_bonus_damage = 35
+	armor_penetration = -50
+	hud_state = "laser_heat"
+
+/obj/item/projectile/energy/phase/heavy
+	range = 16 //Chompedit This range was not great
+	damage = 10
+	SA_bonus_damage = 50
+	armor_penetration = -25
+	hud_state = "laser_heat"
+
+/obj/item/projectile/energy/phase/heavy/cannon
+	range = 20 //Chompedit This range was mediocre, but not worth a cannon.
+	damage = 15
+	SA_bonus_damage = 60
+	armor_penetration = -20
+	hud_state = "laser_heat"

modular_chomp/code/modules/power/cells/device_cells.dm

@@ -91,7 +91,7 @@
 	icon_state = "meb_m_hi"
 	maxcharge = 10000
 	charge_amount = 20
-	origin_tech = list(TECH_POWER = 5, TECH_PRECURSOR = 1)
+	origin_tech = list(TECH_POWER = 8)
 
 /obj/item/weapon/cell/device/giga/empty/Initialize()
 	. = ..()
@@ -161,10 +161,10 @@
 	catalogue_data = list(/datum/category_item/catalogue/anomalous/precursor_a/alien_void_cell)
 	icon = 'icons/obj/abductor.dmi'
 	icon_state = "cell"
-	maxcharge = 3600
+	maxcharge = 5000
-	charge_amount = 180 // 5%.
+	charge_amount = 130 // 2.5%.
 	charge_delay = 50 // Every five seconds, bit faster than the default.
-	origin_tech = list(TECH_POWER = 7, TECH_ENGINEERING = 5, TECH_PHORON = 5, TECH_ARCANE = 1, TECH_PRECURSOR = 1)
+	origin_tech = list(TECH_POWER = 7, TECH_ENGINEERING = 6, TECH_PHORON = 6, TECH_ARCANE = 2, TECH_PRECURSOR = 2)
 
 /obj/item/weapon/cell/device/weapon/recharge/alien/update_icon()
 	return // No overlays please.
@@ -192,8 +192,8 @@
 	origin_tech = list(TECH_POWER = 8, TECH_ENGINEERING = 6)
 	icon = 'icons/obj/abductor.dmi'
 	icon_state = "cell"
-	maxcharge = 4800 //10x the device version
+	maxcharge = 10000 
-	charge_amount = 1200 //10x the device version
+	charge_amount = 500
 	self_recharge = TRUE
 	charge_delay = 50
 	matter = null
@@ -224,11 +224,12 @@
 //YAWN Addtion
 /obj/item/weapon/cell/device/weapon/recharge/alien/omni
 	name = "omni weapon power cell"
-	desc = "A mix between alien technology and phoron tech. Seems to fit in almost any cell slot..."
+	desc = "A mix between alien technology and phoron-based tech. Not quite as good as a true void cell though."
-	charge_amount = 120 // 2.5%.
+	charge_amount = 90 // 2.5%.
-	maxcharge = 4800
+	maxcharge = 3600
 	charge_delay = 50
-	origin_tech = list(TECH_POWER = 8, TECH_ENGINEERING = 6, TECH_PHORON = 6, TECH_ARCANE = 2, TECH_PRECURSOR = 2)
+	swaps_to = null
+	origin_tech = list(TECH_POWER = 8, TECH_ENGINEERING = 6, TECH_PHORON = 6, TECH_ARCANE = 1, TECH_PRECURSOR = 1)
 
 /obj/item/weapon/cell/device/weapon/recharge/alien/omni/empty/Initialize()
 	. = ..()

modular_chomp/code/modules/power/cells/power_cells.dm

@@ -20,7 +20,7 @@
 	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
+	maxcharge = 2400	//who the hell thought 6 shots was enough for a dogborg taser?
 	matter = list(MAT_STEEL = 700, MAT_GLASS = 40)
 
 /obj/item/weapon/cell/secborg/empty/New()
@@ -88,7 +88,7 @@
  */
 /obj/item/weapon/cell/giga
 	name = "giga-capacity power cell"
-	origin_tech = list(TECH_POWER = 6, TECH_PRECURSOR = 1)
+	origin_tech = list(TECH_POWER = 8)
 	icon_state = "meb_b_hi"
 	maxcharge = 40000
 	matter = list(MAT_STEEL = 1000, MAT_GLASS = 100)
@@ -162,7 +162,7 @@
 	icon_state = "yellow slime extract" //"potato_battery"
 	description_info = "This 'cell' holds a max charge of 20k and self recharges over time."
 	maxcharge = 20000
-	charge_amount = 1000 // 5%.
+	charge_amount = 500 // 2.5%.
 	matter = null
 	self_recharge = TRUE
 	standard_overlays = FALSE

modular_chomp/code/modules/research/designs/power_cells.dm

@@ -57,8 +57,8 @@
 /datum/design/item/powercell/giga
 	name = "giga-capacity"
 	id = "giga_cell"
-	req_tech = list(TECH_POWER = 6, TECH_MATERIAL = 5, TECH_PRECURSOR = 1, TECH_PHORON = 4)
+	req_tech = list(TECH_POWER = 7, TECH_MATERIAL = 5, TECH_ARCANE = 1, TECH_PHORON = 4)
-	materials = list(MAT_STEEL = 1000, MAT_GOLD = 300, MAT_SILVER = 300, MAT_GLASS = 100, MAT_PHORON = 1000, MAT_METALHYDROGEN = 250, MAT_DURASTEEL = 100, MAT_URANIUM = 100)
+	materials = list(MAT_STEEL = 1000, MAT_GOLD = 300, MAT_SILVER = 300, MAT_GLASS = 100, MAT_PHORON = 1000, MAT_DURASTEEL = 100, MAT_URANIUM = 100)
 	build_path = /obj/item/weapon/cell/giga
 	category = list("Misc")
 	sort_string = "BAAAE"
@@ -140,8 +140,8 @@
 /datum/design/item/powercell/giga_device
 	name = "device, giga"
 	id = "giga_device"
-	req_tech = list(TECH_POWER = 6, TECH_MATERIAL = 6, TECH_PRECURSOR = 1, TECH_PHORON = 4)
+	req_tech = list(TECH_POWER = 7, TECH_MATERIAL = 6, TECH_ARCANE = 1, TECH_PHORON = 4)
-	materials = list(MAT_STEEL = 2000, MAT_GOLD = 500, MAT_SILVER = 500, MAT_GLASS = 100, MAT_PHORON = 2000, MAT_METALHYDROGEN = 500, MAT_DURASTEEL = 200, MAT_URANIUM = 200)
+	materials = list(MAT_STEEL = 2000, MAT_GOLD = 500, MAT_SILVER = 500, MAT_GLASS = 100, MAT_PHORON = 2000, MAT_DURASTEEL = 200, MAT_URANIUM = 200)
 	build_path = /obj/item/weapon/cell/device/giga
 	category = list("Misc")
 	sort_string = "BAAAH"

modular_chomp/code/modules/research/designs/weapons.dm

@@ -39,35 +39,35 @@
 /datum/design/item/weapon/phase/frontier_holdout
 	id = "holdout frontier phaser"
 	req_tech = list(TECH_COMBAT = 4, TECH_POWER = 7, TECH_MATERIAL = 6, TECH_PHORON = 6)
-	materials = list(MAT_STEEL = 6000, MAT_GLASS = 900, MAT_DURASTEEL = 100, MAT_METALHYDROGEN = 150, MAT_VERDANTIUM = 100, MAT_PHORON = 1000)
+	materials = list(MAT_STEEL = 6000, MAT_GLASS = 900, MAT_DURASTEEL = 100, MAT_VERDANTIUM = 100, MAT_PHORON = 1000)
 	build_path = /obj/item/weapon/gun/energy/locked/frontier/holdout
 	sort_string = "MACAE"
 
 /datum/design/item/weapon/phase/frontier_phaser
 	id = "frontier phaser"
 	req_tech = list(TECH_COMBAT = 4, TECH_POWER = 7, TECH_MATERIAL = 6, TECH_PHORON = 6)
-	materials = list(MAT_STEEL = 7000, MAT_GLASS = 900, MAT_DURASTEEL = 100, MAT_METALHYDROGEN = 200, MAT_VERDANTIUM = 150, MAT_PHORON = 2000)
+	materials = list(MAT_STEEL = 7000, MAT_GLASS = 900, MAT_DURASTEEL = 100, MAT_VERDANTIUM = 150, MAT_PHORON = 2000)
 	build_path = /obj/item/weapon/gun/energy/locked/frontier
 	sort_string = "MACAF"
 
 /datum/design/item/weapon/phase/frontier_carbine
 	id = "carbine frontier phaser"
 	req_tech = list(TECH_COMBAT = 4, TECH_POWER = 8, TECH_MATERIAL = 6, TECH_PHORON = 6)
-	materials = list(MAT_STEEL = 6500, MAT_GLASS = 900, MAT_DURASTEEL = 150, MAT_METALHYDROGEN = 250, MAT_VERDANTIUM = 200, MAT_PHORON = 4000)
+	materials = list(MAT_STEEL = 6500, MAT_GLASS = 900, MAT_DURASTEEL = 150, MAT_VERDANTIUM = 200, MAT_PHORON = 4000)
 	build_path = /obj/item/weapon/gun/energy/locked/frontier/carbine
 	sort_string = "MACAG"
 
 /datum/design/item/weapon/phase/frontier_rifle
 	id = "marksman rifle frontier phaser"
 	req_tech = list(TECH_COMBAT = 4, TECH_POWER = 7, TECH_MATERIAL = 6, TECH_PHORON = 6)
-	materials = list(MAT_STEEL = 8000, MAT_GLASS = 900, MAT_DURASTEEL = 200, MAT_METALHYDROGEN = 300, MAT_VERDANTIUM = 250, MAT_PHORON = 2000)
+	materials = list(MAT_STEEL = 8000, MAT_GLASS = 900, MAT_DURASTEEL = 200, MAT_VERDANTIUM = 250, MAT_PHORON = 2000)
 	build_path = /obj/item/weapon/gun/energy/locked/frontier/rifle
 	sort_string = "MACAH"
 
 /datum/design/item/weapon/phase/frontier_handbow
 	id = "handbow frontier phaser"
 	req_tech = list(TECH_COMBAT = 4, TECH_POWER = 7, TECH_MATERIAL = 6, TECH_PHORON = 6)
-	materials = list(MAT_STEEL = 5000, MAT_GLASS = 900, MAT_DURASTEEL = 100, MAT_METALHYDROGEN = 200, MAT_VERDANTIUM = 150, MAT_PHORON = 1000)
+	materials = list(MAT_STEEL = 5000, MAT_GLASS = 900, MAT_DURASTEEL = 100, MAT_VERDANTIUM = 150, MAT_PHORON = 1000)
 	build_path = /obj/item/weapon/gun/energy/locked/frontier/handbow
 	sort_string = "MACAI"
 
@@ -79,3 +79,10 @@
 	build_path = /obj/item/weapon/gun/projectile/caseless/prototype
 	sort_string = "MACBA"
 
+/datum/design/item/weapon/energy/lasercannon
+	desc = "The lasing medium of this prototype is enclosed in a tube lined with uranium-235 and subjected to high neutron flux in a nuclear reactor core."
+	id = "lasercannon"
+	req_tech = list(TECH_COMBAT = 6, TECH_MATERIAL = 6, TECH_POWER = 5)
+	materials = list(MAT_STEEL = 4000, MAT_GLASS = 1000, MAT_DIAMOND = 2000, MAT_TITANIUM = 4000, MAT_LEAD = 4000, MAT_URANIUM = 5000)
+	build_path = /obj/item/weapon/gun/energy/lasercannon
+	sort_string = "MAAAD"