[TM] BALANCE: Reworking old Sharplite

mod_celadon/economy/code/exports/weapons.dm

@@ -67,50 +67,50 @@
 // MARK: Nanotrasen
 
 /datum/export/weapon/mini_energy
-	unit_name = "NT-SL X26 Miniature energy pistol"
+	unit_name = "SL X-26 'Ember' Miniature Energy Pistol"
 	desc = "One of the most basic energy weapons in the universe. Compact but low capacity. Shoots lethal and disabler lasers. A simple, yet an inefficient PDW. Power in a pocket! Produced by Nanotrasen-Sharplite"
 	export_types = list(/obj/item/gun/energy/e_gun/e_old/mini)
 	cost = 50
 
 /datum/export/weapon/energy
-	unit_name = "NT-SL E-Rifle"
+	unit_name = "SL X-10 'Patriot' Energy Carbine"
 	desc = "One of the most basic energy weapons in the universe. Shoots lethal and disabler lasers. A simple, yet an efficient PDW. It is the egun. Produced by Nanotrasen-Sharplite"
 	export_types = list(/obj/item/gun/energy/e_gun/e_old)
 	cost = 125
 	include_subtypes = FALSE
 
 /datum/export/weapon/etar
-	unit_name = "NT-SL 'E-TAR' SMG energy rifle"
+	unit_name = "SL X-36 E-TAR SMG"
 	desc = "compact energy-based PDW platform, ideal for suppressing threats at mid-range. For NT employee use only."
 	export_types = list(/obj/item/gun/energy/e_gun/e_old/smg)
 	cost = 200
 
 /datum/export/weapon/ultima
-	unit_name = "NT-SL 'E-SG 500 Second Edition' energy shotgun"
-	desc = "Contains an energy-based shotgun equipped with dual kill/disable modes, ideal for short range. The on-board computer is notoriously unreliable. For NT employee use only."
+	unit_name = "SL E-SG 500 Second Edition"
+	desc = "Contains an energy-based shotgun equipped with dual kill/disable modes, ideal for short range. For NT employee use only."
 	export_types = list(/obj/item/gun/energy/e_gun/e_old/iot)
 	cost = 300
 
 /datum/export/weapon/heavylaser
-	unit_name = "NT-SL Laser Accelerator Cannon"
+	unit_name = "SL AL-602 'Phoenix' Energy Cannon"
 	desc = "A sniper-like Nanotrasen laser gun that deals more damage if the target is far away. You can't attach a scope to it, though"
 	export_types = list(/obj/item/gun/energy/lasercannon)
 	cost = 350
 
 /datum/export/weapon/hades
-	unit_name = "NT-SL AL-655 'Hades' energy rifle"
+	unit_name = "SL AL-655 'Hades' energy rifle"
 	desc = "Nanotrasen's pride in energy weapon development. This premium assault rifle is the most reliable Nanotrasen-Sharplite energy weapon."
 	export_types = list(/obj/item/gun/energy/e_gun/e_old/hades)
 	cost = 600
 
 /datum/export/weapon/cryogelida
-	unit_name = "NT-SL PPD-142 'Cryogelida' plasma pistol"
+	unit_name = "SL PPD-142 'Cryogelida' plasma pistol"
 	desc = "A fresh-new experimental plasma pistol developed by Nanotrasen-Sharplite, it has 2 firemodes. Freeze firemode is perfect for cooling syndicate terrorists' heat, and frostbite firemode allows for sending them back into ice age. It synergizes well with Pyrogelida plasma pistol."
 	export_types = list(/obj/item/gun/energy/e_gun/plasmapistol_cryo)
 	cost = 800
 
 /datum/export/weapon/pyrogelida
-	unit_name = "NT-SL PPD-238 'Pyrogelida' plasma pistol"
+	unit_name = "SL PPD-238 'Pyrogelida' plasma pistol"
 	desc = "A fresh-new experimental plasma pistol developed by Nanotrasen-Sharplite, it has 2 firemodes. Burn firemode is perfect for non-Geneva-convention-violating combat, and IMMOLATE mode lets you commit warcrimes at the rate of 50 per minute. It synergizes well with Cryogelida plasma pistol."
 	export_types = list(/obj/item/gun/energy/e_gun/plasmapistol_fire)
 	cost = 900

mod_celadon/mobs/_mobs.dme

@@ -44,6 +44,7 @@
 #include "code/simple_animal/bots.dm"
 #include "code/simple_animal/iriska.dm"
 #include "code/simple_animal/faction/nanotrasen.dm"
+#include "code/simple_animal/faction/nanotrasen_corpse.dm"
 #include "code/simple_animal/faction/solfed.dm"
 #include "code/simple_animal/faction/solfed_corpse.dm"
 

mod_celadon/mobs/code/simple_animal/faction/nanotrasen.dm

@@ -1,32 +1,79 @@
-//возвращает еганы в руки VI мобов
+//возвращает еганы в руки VI мобов и добавляет пару новых
 /mob/living/simple_animal/hostile/human/nanotrasen/ranged/laser
 	desc = "A member of Vigilitas Interstellar, their hands are locked around a laser rifle, actively aiming it at potential threats." //просто на тот случай если оффы решат дергать описание
-	projectiletype = /obj/projectile/beam/laser
+	projectiletype = /obj/projectile/beam/laser/nanotrasen
 	r_hand = /obj/item/gun/energy/e_gun/e_old
 
 /mob/living/simple_animal/hostile/human/nanotrasen/ranged/trooper/smg
 	desc = "A member of Vigilitas Interstellar. Eyes track motion as they saunter confidently, energy SMG at alert."
-	projectiletype = /obj/projectile/beam/laser/light/smg
+	projectiletype = /obj/projectile/beam/laser/nanotrasen/weak
 	r_hand = /obj/item/gun/energy/e_gun/e_old/smg
 
 /mob/living/simple_animal/hostile/human/nanotrasen/ranged/trooper/shotgun
 	desc = "A member of Vigilitas Interstellar, with their chin high up. They confidently aim around their shotgun, ready to burn away any trespassers."
-	casingtype = /obj/item/ammo_casing/energy/laser/ultima
+	casingtype = /obj/item/ammo_casing/energy/laser/shotgun/nanotrasen
 	projectilesound = 'sound/weapons/laser4.ogg'
 	r_hand = /obj/item/gun/energy/e_gun/e_old/iot
 
 /mob/living/simple_animal/hostile/human/nanotrasen/ranged/trooper/rifle
 	desc = "A well-armed member of Vigilitas Interstellar. They stand at the ready with a Hades energy rifle, smirking underneath their gas mask."
-	projectiletype = /obj/projectile/beam/laser/assault
+	projectiletype = /obj/projectile/beam/laser/nanotrasen/assault
 	r_hand = /obj/item/gun/energy/e_gun/e_old/hades
 
+/mob/living/simple_animal/hostile/human/nanotrasen/ranged/trooper/sniper
+	name = "Vigilitas Ranger"
+	desc = "A watchful member of Vigilitas Interstellar. They proudly wield a Parallax energy rifle, always on guard."
+	projectiletype = /obj/projectile/beam/laser/nanotrasen/dmr
+	r_hand = /obj/item/gun/energy/e_gun/e_old/dmr
+	casingtype = null
+	minimum_distance = 7
+	vision_range = 12
+	aggro_vision_range = 14
+	rapid = 1
+	rapid_fire_delay = 3
+	rapid_melee = 3
+	projectilesound = 'sound/weapons/gun/laser/nt-fire.ogg'
+	mob_spawner = /obj/effect/mob_spawn/human/corpse/vigilitas_sniper
+
+/mob/living/simple_animal/hostile/human/nanotrasen/ranged/trooper/sniper/space
+	armor_base = /obj/item/clothing/suit/space/hardsuit/security/hos
+	minbodytemp = 0
+	maxbodytemp = 1000
+	mob_spawner = /obj/effect/mob_spawn/human/corpse/vigilitas_hos
+
 /mob/living/simple_animal/hostile/human/nanotrasen/elite
 	desc = "A hardened member of Vigilitas Interstellar, clad in well made alloys slathered in red. Their helmet turns, their rifle raises, and they start to move with practiced precision."
-	projectiletype = /obj/projectile/beam/laser/assault
+	projectiletype = /obj/projectile/beam/laser/nanotrasen/assault
 	r_hand = /obj/item/gun/energy/e_gun/e_old/hades
 
 /mob/living/simple_animal/hostile/human/nanotrasen/elite/shotgun
 	desc = "A hardened member of Vigilitas Interstellar, clad in well made alloys slathered in red. Their helmet turns, Their shotgun blinks, and they glare coldly into your eyes."
-	casingtype = /obj/item/ammo_casing/energy/laser/ultima
+	casingtype = /obj/item/ammo_casing/energy/laser/shotgun/nanotrasen
 	projectilesound = 'sound/weapons/laser4.ogg'
 	r_hand = /obj/item/gun/energy/e_gun/e_old/iot
+
+/mob/living/simple_animal/hostile/human/nanotrasen/elite/sniper
+	desc = "A hardened member of Vigilitas Interstellar, clad in well made alloys slathered in red. Their helmet turns, their marksman rifle raises, and they start to take aim at you."
+	projectiletype = /obj/projectile/beam/laser/nanotrasen/dmr
+	r_hand = /obj/item/gun/energy/e_gun/e_old/dmr
+	minimum_distance = 7
+	vision_range = 12
+	aggro_vision_range = 14
+	rapid = 3
+	rapid_fire_delay = 5
+	rapid_melee = 3
+	retreat_distance = 0
+	minbodytemp = 0
+	projectilesound = 'sound/weapons/gun/laser/nt-fire.ogg'
+
+/mob/living/simple_animal/hostile/human/nanotrasen/elite/heavy
+	desc = "A hardened member of Vigilitas Interstellar, clad in well made alloys slathered in red. Their helmet turns, their energy machine gun raises, as they prepare to remove the enemy's direction."
+	rapid = 10
+	rapid_fire_delay = 2
+	rapid_melee = 3
+	retreat_distance = 0
+	minimum_distance = 1
+	projectiletype = /obj/projectile/beam/laser/nanotrasen/assault
+	projectilesound = 'sound/weapons/gun/laser/e40_las.ogg'
+	r_hand = /obj/item/gun/energy/e_gun/e_old/emg
+	weapon_drop_chance = 1

mod_celadon/mobs/code/simple_animal/faction/nanotrasen_corpse.dm

@@ -0,0 +1,10 @@
+/datum/outfit/vigilitas/sniper
+	name = "VI Ranger"
+	gloves = /obj/item/clothing/gloves/combat
+	head = /obj/item/clothing/head/nanotrasen/beret/security
+	back = /obj/item/storage/backpack/duffelbag/sec
+
+/obj/effect/mob_spawn/human/corpse/vigilitas_sniper
+	name = "VI Ranger"
+	id_job = "Vigilitas Assault Force"
+	outfit = /datum/outfit/vigilitas/sniper

mod_celadon/outpost_console/code/supply_pack/independent/security/gun.dm

@@ -278,10 +278,10 @@ hp
 	crate_name = "laser crate"
 
 /datum/supply_pack/faction/independent/gun/laser
-	name = "Energy - SL L-204 Laser Gun"
+	name = "Energy - SL L-204 'Fuse'"
 	desc = "Contains a NT-SL mass-produced lethal, high-energy laser gun."
 	cost = 1000
-	contains = list(/obj/item/storage/guncase/energy/laser)
+	contains = list(/obj/item/storage/guncase/energy/laser_old)
 	crate_name = "laser crate"
 
 /datum/supply_pack/faction/independent/gun/scatterlaser

mod_celadon/outpost_console/code/supply_pack/inteq/security/gun.dm

@@ -200,6 +200,15 @@ bullet
 	armour_penetration = 50
 */
 
+/* MARK: Energy
+*/
+/datum/supply_pack/faction/inteq/gun/gleam
+	name = "E-SMG - VEC-04 'Gleam'"
+	desc = "A seized Sharplite X-39 energy SMG reworked in IRMG colors. Uses energy weapon cells."
+	cost = 2700
+	contains = list(/obj/item/storage/guncase/energy/gleam)
+	crate_name = "SMG crate"
+
 /* // Отключено до реворка плазмы
 // Plasma ETAR - Inteq
 /datum/supply_pack/faction/inteq/gun/energy/cadejo

mod_celadon/outpost_console/code/supply_pack/inteq/security/magazines.dm

@@ -117,6 +117,14 @@
 	contains = list(/obj/item/ammo_box/magazine/g36/drum/empty)
 	cost = 3000
 
+/* Energy cells */
+
+/datum/supply_pack/faction/inteq/magazine/guncell
+	name = "E-Cell - Weapon Cell"
+	desc = "Contains a weapon cell, compatible with laser guns."
+	contains = list(/obj/item/stock_parts/cell/gun)
+	cost = 600
+
 /* // Отключено до реворка плазмы
 // Plasma Weapon Cells (Export NT)
 /datum/supply_pack/faction/inteq/magazine/cellinteq

mod_celadon/outpost_console/code/supply_pack/nanotrasen/security/gun.dm

@@ -6,90 +6,117 @@ MARK: E-Guns - NT-SL
 */
 
 /datum/supply_pack/faction/nanotrasen/gun/mini_energy
-	name = "E-Pistol - NT-SL X26 Miniature energy pistol"
-	desc = "One of the most basic energy weapons in the universe. Compact but low capacity. Shoots lethal and disabler lasers. A simple, yet an inefficient PDW. Power in a pocket! Produced by Nanotrasen-Sharplite"
+	name = "E-Pistol - SL X-26 'Ember'"
+	desc = "A civilian-grade siderarm marketed under the slogan 'Power in a pocket!'. Produced by Nanotrasen-Sharplite"
 	cost = 500
 	contains = list(/obj/item/storage/guncase/pistol/miniegun_old)
 	crate_name = "laser crate"
 
 /datum/supply_pack/faction/nanotrasen/gun/laser
-	name = "E-Rifle - NT-SL L-204 laser gun"
-	desc = "Basic energy-based laser gun that fires concentrated beams of light which pass through glass and thin metal. Produced by Nanotrasen-Sharplite."
+	name = "E-Rifle - SL L-204 'Fuse'"
+	desc = "A basic energy-based laser gun that fires concentrated beams of light which pass through glass and thin metal. Produced by Nanotrasen-Sharplite."
 	cost = 1000
-	contains = list(/obj/item/storage/guncase/energy/laser)
+	contains = list(/obj/item/storage/guncase/energy/laser_old)
 	crate_name = "laser crate"
 
 /datum/supply_pack/faction/nanotrasen/gun/energy/disabler
-	name = "E-Pistol - NT-SL Disabler"
+	name = "E-Pistol - SL Disabler"
 	desc = "A self-defense weapon that exhausts organic targets, weakening them until they collapse. Produced by Nanotrasen-Sharplite."
 	cost = 1000
 	contains = list(/obj/item/storage/guncase/disabler)
 	crate_name = "disabler crate"
 
 /datum/supply_pack/faction/nanotrasen/gun/energy
-	name = "E-Rifle - NT-SL"
-	desc = "One of the most basic energy weapons in the universe. Shoots lethal and disabler lasers. A simple, yet an efficient PDW. It is the egun. Produced by Nanotrasen-Sharplite"
-	cost = 1250
+	name = "E-Rifle - SL X-10 'Patriot'"
+	desc = "A semi-automatic security-grade energy weapon. Fires lethal and disabler bolts. It is the egun. Produced by Nanotrasen-Sharplite"
+	cost = 1750
 	contains = list(/obj/item/storage/guncase/energy/egun_old)
 	crate_name = "energy gun crate"
 	crate_type = /obj/structure/closet/crate/secure/plasma
 
 /datum/supply_pack/faction/nanotrasen/gun/energy/taser
-	name = "E-Pistol - NT-SL Hybrid Taser"
+	name = "E-Pistol - SL Hybrid Taser"
 	desc = "A dual-mode taser designed to fire both short-range high-power electrodes and long-range disabler beams. Produced by Nanotrasen-Sharplite."
 	cost = 1250
 	contains = list(/obj/item/storage/guncase/advtaser)
 	crate_name = "hybrid taser crate"
 
 /datum/supply_pack/faction/nanotrasen/gun/etar
-	name = "E-SMG - NT-SL 'E-TAR' SMG energy rifle"
+	name = "E-SMG - SL X-36 E-TAR"
 	desc = "Contains a compact energy-based PDW platform, ideal for suppressing threats at mid-range. For NT employee use only."
 	cost = 2000
 	contains = list(/obj/item/storage/guncase/energy/etar_old)
 	crate_name = "SMG crate"
 
+/datum/supply_pack/faction/nanotrasen/gun/sunbeam
+	name = "E-SMG - SL X-49 'Sunbeam'"
+	desc = "A dual-mode energy SMG capable of discharging weak armor-piercing projectiles. Produced by Nanotrasen-Sharplite."
+	cost = 2500
+	contains = list(/obj/item/storage/guncase/energy/sunbeam)
+
 /datum/supply_pack/faction/nanotrasen/gun/ultima
-	name = "E-Shotgun - NT-SL 'E-SG 500 Second Edition'"
-	desc = "Contains an energy-based shotgun equipped with dual kill/disable modes, ideal for short range. The on-board computer is notoriously unreliable. For NT employee use only."
+	name = "E-Shotgun - SL 'E-SG 500 Second Edition'"
+	desc = "Contains an energy-based shotgun equipped with dual kill/disable modes, ideal for short range. For NT employee use only."
 	cost = 3000
 	contains = list(/obj/item/gun/energy/e_gun/e_old/iot)
 	crate_name = "shotgun crate"
 
+/datum/supply_pack/faction/nanotrasen/gun/blaze
+	name = "E-Shotgun - SL AL-370 'Blaze'"
+	desc = "A continuation of the E-SG prototypes featuring a different firemode compared to the classic energy shotgun. Produced by Nanotrasen-Sharplite."
+	cost = 5500
+	contains = list(/obj/item/storage/guncase/energy/blaze)
+	crate_name = "shotgun crate"
+
 /datum/supply_pack/faction/nanotrasen/gun/heavylaser
-	name = "E-Rifle - NT-SL Laser Accelerator Cannon"
-	desc = "A sniper-like Nanotrasen laser gun that deals more damage if the target is far away. You can't attach a scope to it, though"
+	name = "E-Sniper-Rifle - SL AL-602 'Phoenix'"
+	desc = "A sniper-like Sharplite energy weapon that deals more damage if the target is far away. Scope included."
 	contains = list(/obj/item/storage/guncase/heavylaser)
-	cost = 3500
+	cost = 9000
+
+/datum/supply_pack/faction/nanotrasen/gun/parallax
+	name = "E-Marksman - SL L-211 'Parallax'"
+	desc = "An energy marksman rifle featuring experimental hellfire bolts and a decent scope. Produced by Nanotrasen-Sharplite."
+	cost = 5000
+	contains = list(/obj/item/storage/guncase/energy/parallax)
+	crate_name = "marksman crate"
 
 /datum/supply_pack/faction/nanotrasen/gun/hades
-	name = "E-Assault-Rifle - NT-SL AL-655 'Hades'"
-	desc = "Nanotrasen's pride in energy weapon development. This premium assault rifle is the most reliable Nanotrasen-Sharplite energy weapon. Good for burning armored targets!"
+	name = "E-Assault-Rifle - SL AL-655 'Hades'"
+	desc = "A powerful variable energy assault rifle, ideal for fire support. Useful for armored targets."
 	cost = 6000
 	contains = list(/obj/item/storage/guncase/hades_old)
-	crate_name = "laser crate"
+	crate_name = "advanced laser crate"
+
+/datum/supply_pack/faction/nanotrasen/gun/daybreak
+	name = "EMG - SL AL-690 'Daybreak'"
+	desc = "A monstrous refitting of the AL-655. Decimates anything in your way. Uses large weapon cells. Produced by Nanotrasen-Sharplite."
+	cost = 9000
+	contains = list(/obj/item/storage/guncase/energy/daybreak)
+	crate_name = "EMG crate"
 
 /datum/supply_pack/faction/nanotrasen/gun/cryogelida
-	name = "Cryo-Pistol - NT-SL PPD-142 'Cryogelida'"
+	name = "Cryo-Pistol - SL PPD-142 'Cryogelida'"
 	desc = "A fresh-new experimental plasma pistol developed by Nanotrasen-Sharplite, it has 2 firemodes. Freeze firemode is perfect for cooling syndicate terrorists' heat, and frostbite firemode allows for sending them back into ice age. It synergizes well with Pyrogelida plasma pistol."
 	contains = list(/obj/item/storage/guncase/cryogelida)
 	cost = 8000
 
 /datum/supply_pack/faction/nanotrasen/gun/pyrogelida
-	name = "Pyro-Pistol - NT-SL PPD-238 'Pyrogelida'"
+	name = "Pyro-Pistol - SL PPD-238 'Pyrogelida'"
 	desc = "A fresh-new experimental plasma pistol developed by Nanotrasen-Sharplite, it has 2 firemodes. Burn firemode is perfect for non-Geneva-convention-violating combat, and IMMOLATE mode lets you commit warcrimes at the rate of 50 per minute. It synergizes well with Cryogelida plasma pistol."
 	contains = list(/obj/item/storage/guncase/pyrogelida)
 	cost = 9000
 
 /datum/supply_pack/faction/nanotrasen/gun/ion
-	name = "Ion-Rifle - NT-SL Ion"
+	name = "Ion-Rifle - SL Ion Projector"
 	desc = "A man-portable anti-armor weapon designed to disable mechanical threats at range. Produced by Nanotrasen-Sharplite."
 	cost = 10000
 	contains = list(/obj/item/storage/guncase/energy/iongun)
 	crate_name = "ion rifle crate"
 	crate_type = /obj/structure/closet/crate/secure/plasma
 
 /datum/supply_pack/faction/nanotrasen/gun/ion_carbine
-	name = "Ion-Rifle - NT-SL MK2 Ion carbine"
+	name = "Ion-Rifle - SL MK2 Ion carbine"
 	desc = "An improved model on the ion projector, built to be more compact and ergonomic, while keeping the same max charge. Developed by Nanotrasen-Sharplite"
 	contains = list(/obj/item/storage/guncase/ion_carbine)
 	cost = 11000