diff --git a/mod_celadon/_storage_icons/icons/actions/actions_items.dmi b/mod_celadon/_storage_icons/icons/actions/actions_items.dmi index 962e90457f6c..73d77447bf03 100644 Binary files a/mod_celadon/_storage_icons/icons/actions/actions_items.dmi and b/mod_celadon/_storage_icons/icons/actions/actions_items.dmi differ diff --git a/mod_celadon/_storage_icons/icons/items/weapons/48x32_old.dmi b/mod_celadon/_storage_icons/icons/items/weapons/48x32_old.dmi index d37b5f39bac3..23551c423d68 100644 Binary files a/mod_celadon/_storage_icons/icons/items/weapons/48x32_old.dmi and b/mod_celadon/_storage_icons/icons/items/weapons/48x32_old.dmi differ diff --git a/mod_celadon/_storage_icons/icons/items/weapons/48x32guns.dmi b/mod_celadon/_storage_icons/icons/items/weapons/48x32guns.dmi index b8dc42b8b8d4..828bc100707a 100644 Binary files a/mod_celadon/_storage_icons/icons/items/weapons/48x32guns.dmi and b/mod_celadon/_storage_icons/icons/items/weapons/48x32guns.dmi differ diff --git a/mod_celadon/_storage_icons/icons/items/weapons/ammo/projectiles.dmi b/mod_celadon/_storage_icons/icons/items/weapons/ammo/projectiles.dmi index f66d4f1e1dc7..c5b1615eecb0 100644 Binary files a/mod_celadon/_storage_icons/icons/items/weapons/ammo/projectiles.dmi and b/mod_celadon/_storage_icons/icons/items/weapons/ammo/projectiles.dmi differ diff --git a/mod_celadon/_storage_icons/icons/items/weapons/attachments.dmi b/mod_celadon/_storage_icons/icons/items/weapons/attachments.dmi new file mode 100644 index 000000000000..fd3ae63f2a9e Binary files /dev/null and b/mod_celadon/_storage_icons/icons/items/weapons/attachments.dmi differ diff --git a/mod_celadon/_storage_icons/icons/items/weapons/energy_old.dmi b/mod_celadon/_storage_icons/icons/items/weapons/energy_old.dmi new file mode 100644 index 000000000000..44b301e56e68 Binary files /dev/null and b/mod_celadon/_storage_icons/icons/items/weapons/energy_old.dmi differ diff --git a/mod_celadon/_storage_icons/icons/items/weapons/in_hands/lefthand_old.dmi b/mod_celadon/_storage_icons/icons/items/weapons/in_hands/lefthand_old.dmi index 8ce50b8a176f..0ffd9e3d9557 100644 Binary files a/mod_celadon/_storage_icons/icons/items/weapons/in_hands/lefthand_old.dmi and b/mod_celadon/_storage_icons/icons/items/weapons/in_hands/lefthand_old.dmi differ diff --git a/mod_celadon/_storage_icons/icons/items/weapons/in_hands/righthand_old.dmi b/mod_celadon/_storage_icons/icons/items/weapons/in_hands/righthand_old.dmi index b7020f882464..2e6b93789103 100644 Binary files a/mod_celadon/_storage_icons/icons/items/weapons/in_hands/righthand_old.dmi and b/mod_celadon/_storage_icons/icons/items/weapons/in_hands/righthand_old.dmi differ diff --git a/mod_celadon/_storage_icons/icons/items/weapons/overlay/onmob.dmi b/mod_celadon/_storage_icons/icons/items/weapons/overlay/onmob.dmi index 70f744e4dcef..284b206bccbe 100644 Binary files a/mod_celadon/_storage_icons/icons/items/weapons/overlay/onmob.dmi and b/mod_celadon/_storage_icons/icons/items/weapons/overlay/onmob.dmi differ diff --git a/mod_celadon/economy/code/exports/weapons.dm b/mod_celadon/economy/code/exports/weapons.dm index ab8cd94b9f8d..b1fa906aa8e0 100644 --- a/mod_celadon/economy/code/exports/weapons.dm +++ b/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 diff --git a/mod_celadon/mobs/_mobs.dme b/mod_celadon/mobs/_mobs.dme index 59b36018c087..538ba2cb02ce 100644 --- a/mod_celadon/mobs/_mobs.dme +++ b/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" diff --git a/mod_celadon/mobs/code/simple_animal/faction/nanotrasen.dm b/mod_celadon/mobs/code/simple_animal/faction/nanotrasen.dm index 048a2c98c6b1..cd7d8a24fb6d 100644 --- a/mod_celadon/mobs/code/simple_animal/faction/nanotrasen.dm +++ b/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 diff --git a/mod_celadon/mobs/code/simple_animal/faction/nanotrasen_corpse.dm b/mod_celadon/mobs/code/simple_animal/faction/nanotrasen_corpse.dm new file mode 100644 index 000000000000..9d09aecff4c6 --- /dev/null +++ b/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 diff --git a/mod_celadon/outpost_console/code/supply_pack/independent/security/gun.dm b/mod_celadon/outpost_console/code/supply_pack/independent/security/gun.dm index f7055033a2a7..9ea48a07dbb8 100644 --- a/mod_celadon/outpost_console/code/supply_pack/independent/security/gun.dm +++ b/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 diff --git a/mod_celadon/outpost_console/code/supply_pack/inteq/security/gun.dm b/mod_celadon/outpost_console/code/supply_pack/inteq/security/gun.dm index 4d9c7108a7eb..5e72e5492cff 100644 --- a/mod_celadon/outpost_console/code/supply_pack/inteq/security/gun.dm +++ b/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 diff --git a/mod_celadon/outpost_console/code/supply_pack/inteq/security/magazines.dm b/mod_celadon/outpost_console/code/supply_pack/inteq/security/magazines.dm index 579412f75391..8c30851df8b2 100644 --- a/mod_celadon/outpost_console/code/supply_pack/inteq/security/magazines.dm +++ b/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 diff --git a/mod_celadon/outpost_console/code/supply_pack/nanotrasen/security/gun.dm b/mod_celadon/outpost_console/code/supply_pack/nanotrasen/security/gun.dm index 65cdef6b9806..c072336a697b 100644 --- a/mod_celadon/outpost_console/code/supply_pack/nanotrasen/security/gun.dm +++ b/mod_celadon/outpost_console/code/supply_pack/nanotrasen/security/gun.dm @@ -6,82 +6,109 @@ 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) @@ -89,7 +116,7 @@ MARK: E-Guns - NT-SL 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 diff --git a/mod_celadon/turrets/code/turrets.dm b/mod_celadon/turrets/code/turrets.dm index 69333ebc6268..249bfb8f6ada 100644 --- a/mod_celadon/turrets/code/turrets.dm +++ b/mod_celadon/turrets/code/turrets.dm @@ -228,24 +228,45 @@ /obj/machinery/porta_turret/ship/syndicate/weak desc = "A low powered turret designed by the Gorlex Maurauders. Effectively weaponizes mining equipment." //no fucking icw -//Nanotrasen turrets - даем хеви турелям хевилазеры дизейблера и возвращаем лазеры +// MARK: NANOTRASEN +//Nanotrasen ship turrets /obj/machinery/porta_turret/ship/nt - stun_projectile = /obj/projectile/beam/disabler - lethal_projectile = /obj/projectile/beam/laser + stun_projectile = /obj/projectile/beam/disabler/nanotrasen + lethal_projectile = /obj/projectile/beam/laser/nanotrasen /obj/machinery/porta_turret/ship/nt/light - stun_projectile = /obj/projectile/beam/disabler/weak - lethal_projectile = /obj/projectile/beam/laser/light + stun_projectile = /obj/projectile/beam/disabler/nanotrasen/weak + lethal_projectile = /obj/projectile/beam/laser/nanotrasen/weak /obj/machinery/porta_turret/ship/nt/heavy - stun_projectile = /obj/projectile/beam/disabler/heavylaser/sharplite + stun_projectile = /obj/projectile/beam/disabler/nanotrasen/heavylaser + lethal_projectile = /obj/projectile/beam/laser/nanotrasen/heavylaser stun_projectile_sound = 'sound/weapons/wave.ogg' /obj/machinery/porta_turret/ship/nt/pulse - stun_projectile = /obj/projectile/beam/disabler/heavylaser/sharplite + stun_projectile = /obj/projectile/beam/disabler/nanotrasen/heavylaser stun_projectile_sound = 'sound/weapons/wave.ogg' +//Nanotrasen derelict turrets +// removes plasma projectiles + +/obj/machinery/porta_turret/ruin/nt + stun_projectile = /obj/projectile/beam/disabler/nanotrasen + lethal_projectile = /obj/projectile/beam/laser/nanotrasen + +/obj/machinery/porta_turret/ruin/nt/light + stun_projectile = /obj/projectile/beam/disabler/nanotrasen/weak + lethal_projectile = /obj/projectile/beam/laser/nanotrasen/weak + +/obj/machinery/porta_turret/ruin/nt/light/sniper + stun_projectile = /obj/projectile/beam/disabler/nanotrasen/weak + lethal_projectile = /obj/projectile/beam/laser/nanotrasen/weak + +/obj/machinery/porta_turret/ruin/nt/heavy + stun_projectile = /obj/projectile/beam/disabler/nanotrasen/heavylaser + lethal_projectile = /obj/projectile/beam/laser/nanotrasen/heavylaser + //Pirate turrets - даем фракцию пиратов вместо фронтиров /obj/machinery/porta_turret/ship/frontiersmen diff --git a/mod_celadon/weapons/code/guncases.dm b/mod_celadon/weapons/code/guncases.dm index 3505aa94c608..4b1c7fa81123 100644 --- a/mod_celadon/weapons/code/guncases.dm +++ b/mod_celadon/weapons/code/guncases.dm @@ -61,7 +61,6 @@ MARK: InteQ guncases gun_type = /obj/item/gun/ballistic/shotgun/automatic/bulldog/inteq mag_type = /obj/item/ammo_box/magazine/m12g_bulldog - /obj/item/storage/guncase/skm_carabine gun_type = /obj/item/gun/ballistic/automatic/smg/skm_carbine/inteq mag_type = /obj/item/ammo_box/magazine/smgm10mm @@ -77,6 +76,11 @@ MARK: InteQ guncases /obj/item/storage/guncase/skm44_inteq gun_type = /obj/item/gun/ballistic/automatic/assault/skm/inteq mag_type = /obj/item/ammo_box/magazine/skm_762_40 + +/obj/item/storage/guncase/energy/gleam + gun_type = /obj/item/gun/energy/e_gun/e_old/smg/sunbeam/inteq + mag_type = /obj/item/stock_parts/cell/gun + /* MARK: Syndicate guncases */ @@ -122,7 +126,7 @@ MARK: Nanotrasen guncases mag_type = /obj/item/stock_parts/cell/gun /obj/item/storage/guncase/heavylaser - gun_type = /obj/item/gun/energy/lasercannon + gun_type = /obj/item/gun/energy/e_gun/e_old/sniper mag_type = /obj/item/stock_parts/cell/gun/large /obj/item/storage/guncase/sabersmg @@ -168,6 +172,10 @@ MARK: Nanotrasen guncases gun_type = /obj/item/gun/energy/e_gun/e_old/mini mag_type = /obj/item/stock_parts/cell/gun/mini +/obj/item/storage/guncase/energy/laser_old + gun_type = /obj/item/gun/energy/e_gun/e_old/laser + mag_type = /obj/item/stock_parts/cell/gun + /obj/item/storage/guncase/energy/egun_old gun_type = /obj/item/gun/energy/e_gun/e_old mag_type = /obj/item/stock_parts/cell/gun @@ -178,7 +186,23 @@ MARK: Nanotrasen guncases /obj/item/storage/guncase/hades_old gun_type = /obj/item/gun/energy/e_gun/e_old/hades - mag_type = /obj/item/stock_parts/cell/gun/upgraded + mag_type = /obj/item/stock_parts/cell/gun + +/obj/item/storage/guncase/energy/daybreak + gun_type = /obj/item/gun/energy/e_gun/e_old/emg + mag_type = /obj/item/stock_parts/cell/gun/large + +/obj/item/storage/guncase/energy/parallax + gun_type = /obj/item/gun/energy/e_gun/e_old/dmr + mag_type = /obj/item/stock_parts/cell/gun + +/obj/item/storage/guncase/energy/sunbeam + gun_type = /obj/item/gun/energy/e_gun/e_old/smg/sunbeam + mag_type = /obj/item/stock_parts/cell/gun + +/obj/item/storage/guncase/energy/blaze + gun_type = /obj/item/gun/energy/e_gun/e_old/iot/blaze + mag_type = /obj/item/stock_parts/cell/gun /* Old NT */ diff --git a/mod_celadon/weapons/code/modules/projectiles/ammunition/energy/laser.dm b/mod_celadon/weapons/code/modules/projectiles/ammunition/energy/laser.dm index afb9747ad5f3..bef9053f5078 100644 --- a/mod_celadon/weapons/code/modules/projectiles/ammunition/energy/laser.dm +++ b/mod_celadon/weapons/code/modules/projectiles/ammunition/energy/laser.dm @@ -1,58 +1,117 @@ -// MARK: REBALANCE +// MARK: AMMO CASINGS -//////////// -//IOT egun -//////////// - -//Ammo Casings - -/obj/item/ammo_casing/energy/laser/ultima - projectile_type = /obj/projectile/beam/laser/iot +/obj/item/ammo_casing/energy/laser/shotgun/nanotrasen + projectile_type = /obj/projectile/beam/laser/nanotrasen/shotgun fire_sound = 'sound/weapons/laser4.ogg' pellets = 6 //now actually working like an eshotgun, and not a shitty bursting egun variance = 35 e_cost = 1428 select_name = "kill" -/obj/item/ammo_casing/energy/disabler/scatter/ultima - projectile_type = /obj/projectile/beam/disabler/iot +/obj/item/ammo_casing/energy/disabler/scatter/shotgun/nanotrasen + projectile_type = /obj/projectile/beam/disabler/nanotrasen/shotgun select_name = "disable" pellets = 6 variance = 35 e_cost = 1428 -//////////// -//etar SMG egun -//////////// - -//Ammo casings - /obj/item/ammo_casing/energy/disabler/smg - projectile_type = /obj/projectile/beam/disabler/weak/smg + projectile_type = /obj/projectile/beam/disabler/nanotrasen/weak e_cost = 300 +/obj/item/ammo_casing/energy/disabler/smg/ap + projectile_type = /obj/projectile/beam/disabler/nanotrasen/weak/ap + select_name = "disable" + delay = 0.1 SECONDS + // Тепер етар использует данный снаряд /obj/item/ammo_casing/energy/laser/smg - projectile_type = /obj/projectile/beam/laser/light/smg + projectile_type = /obj/projectile/beam/laser/nanotrasen/weak e_cost = 396 //cheaper to fire but worse projectiles as stated above +/obj/item/ammo_casing/energy/laser/smg/ap + projectile_type = /obj/projectile/beam/laser/nanotrasen/weak/ap + select_name = "kill" + delay = 0.1 SECONDS + /obj/item/ammo_casing/energy/laser/sharplite/smg projectile_type = /obj/projectile/beam/weak/sharplite e_cost = 396 //25 shots with a normal power cell, 50 with an upgraded //Ammo casings -/obj/item/ammo_casing/energy/disabler/assault - projectile_type = /obj/projectile/beam/disabler/assault +/obj/item/ammo_casing/energy/laser/nanotrasen + projectile_type = /obj/projectile/beam/laser/nanotrasen + select_name = "kill" + e_cost = 500 + delay = 0.3 SECONDS //eoehoma type speed + +/obj/item/ammo_casing/energy/disabler/nanotrasen + projectile_type = /obj/projectile/beam/disabler/nanotrasen + select_name = "disable" + e_cost = 500 + delay = 0.3 SECONDS + +/obj/item/ammo_casing/energy/laser/nanotrasen/less + e_cost = 666 + +/obj/item/ammo_casing/energy/laser/nanotrasen/hos + projectile_type = /obj/projectile/beam/laser/nanotrasen/hos + +/obj/item/ammo_casing/energy/laser/nanotrasen/dmr + projectile_type = /obj/projectile/beam/laser/nanotrasen/dmr + select_name = "kill" + e_cost = 1000 + delay = 0.7 SECONDS + +/obj/item/ammo_casing/energy/electrode/nanotrasen + projectile_type = /obj/projectile/energy/electrode/nanotrasen + select_name = "stun" + e_cost = 5000 + +/obj/item/ammo_casing/energy/disabler/assault/nanotrasen + projectile_type = /obj/projectile/beam/disabler/nanotrasen/assault fire_sound = 'sound/weapons/pulse2.ogg' delay = 2 e_cost = 500 -/obj/item/ammo_casing/energy/laser/assault +/obj/item/ammo_casing/energy/laser/assault/nanotrasen + projectile_type = /obj/projectile/beam/laser/nanotrasen/assault + fire_sound = 'sound/weapons/gun/laser/e40_las.ogg' + delay = 2 e_cost = 500 //gives hades 5 more shots to balance out the standart power cell -/obj/item/ammo_casing/energy/laser/hos - e_cost = 500 +/obj/item/ammo_casing/energy/laser/assault/nanotrasen/emg + projectile_type = /obj/projectile/beam/laser/nanotrasen/assault + fire_sound = 'sound/weapons/gun/laser/e40_las.ogg' + delay = 0.15 SECONDS + e_cost = 714 + +/obj/item/ammo_casing/energy/laser/accelerator/nanotrasen + projectile_type = /obj/projectile/beam/laser/nanotrasen/sniper + select_name = "kill" + fire_sound = 'sound/weapons/lasercannonfire.ogg' + delay = 1 SECONDS + e_cost = 5000 + +/obj/item/ammo_casing/energy/laser/shotgun/nanotrasen/burst + projectile_type = /obj/projectile/beam/laser/nanotrasen/shotgun + pellets = 3 + variance = 30 + e_cost = 1000 + +/obj/item/ammo_casing/energy/laser/nanotrasen/mini + fire_sound = 'sound/weapons/gun/laser/nt-fire_light.ogg' + projectile_type = /obj/projectile/beam/laser/nanotrasen/weak/mini + delay = 0.2 SECONDS + +/obj/item/ammo_casing/energy/disabler/nanotrasen/mini + projectile_type = /obj/projectile/beam/disabler/nanotrasen/weak/mini + delay = 0.2 SECONDS + +/obj/item/ammo_casing/energy/laser/antique + fire_sound = 'sound/weapons/laser.ogg' + projectile_type = /obj/projectile/beam/laser/nanotrasen/hellfire // Баланс Ионочек /obj/item/ammo_casing/energy/ion diff --git a/mod_celadon/weapons/code/modules/projectiles/guns/energy/energy.dm b/mod_celadon/weapons/code/modules/projectiles/guns/energy/energy.dm index 3bc4023a6710..f2c8e377d92d 100644 --- a/mod_celadon/weapons/code/modules/projectiles/guns/energy/energy.dm +++ b/mod_celadon/weapons/code/modules/projectiles/guns/energy/energy.dm @@ -1,57 +1,64 @@ +#define SHARPLITE_ATTACHMENTS list(/obj/item/attachment/laser_sight,/obj/item/attachment/rail_light,/obj/item/attachment/bayonet,/obj/item/attachment/energy_bayonet,/obj/item/attachment/scope,/obj/item/attachment/gun) +#define SHARPLITE_ATTACH_SLOTS list(ATTACHMENT_SLOT_MUZZLE = 1, ATTACHMENT_SLOT_SCOPE = 1, ATTACHMENT_SLOT_RAIL = 1) + // Баланс ионок. Снаряд находится в mod_celadon\weapons\code\modules\projectiles\projectile\energy\beams.dm /obj/item/gun/energy/ionrifle w_class = WEIGHT_CLASS_BULKY // Мьелниз наделал эти изменения. // https://github.com/CeladonSS13/Shiptest/pull/845 -/obj/item/gun/energy/laser/captain - internal_cell = TRUE - /obj/item/gun/energy/laser/bluetag - internal_cell = TRUE + internal_magazine = TRUE /obj/item/gun/energy/laser/redtag - internal_cell = TRUE + internal_magazine = TRUE /obj/item/gun/energy/spur - internal_cell = TRUE + internal_magazine = TRUE // MARK: RETURN OLD /obj/item/gun/energy/e_gun/e_old + name = "SL X-10 'Patriot' Energy Carbine" + desc = "A lightweight energy carbine capable of discharging decently powerful laser and disabler bolts. Commonly seen as a security self-defence weapon." icon_state = "energy" icon = 'mod_celadon/_storage_icons/icons/items/weapons/48x32_old.dmi' lefthand_file = 'mod_celadon/_storage_icons/icons/items/weapons/in_hands/lefthand_old.dmi' righthand_file = 'mod_celadon/_storage_icons/icons/items/weapons/in_hands/righthand_old.dmi' mob_overlay_icon = 'mod_celadon/_storage_icons/icons/items/weapons/overlay/onmob.dmi' - ammo_type = list(/obj/item/ammo_casing/energy/laser, /obj/item/ammo_casing/energy/disabler) - // таким образом НТ пушки будут принимать и НТшные магазины, и Эохомы + ammo_type = list(/obj/item/ammo_casing/energy/laser/nanotrasen, /obj/item/ammo_casing/energy/disabler/nanotrasen) allowed_ammo_types = list( /obj/item/stock_parts/cell/gun, /obj/item/stock_parts/cell/gun/upgraded, /obj/item/stock_parts/cell/gun/empty, - /obj/item/stock_parts/cell/gun/upgraded/empty, - /obj/item/stock_parts/cell/gun/sharplite, - /obj/item/stock_parts/cell/gun/sharplite/plus, - /obj/item/stock_parts/cell/gun/sharplite/empty, - /obj/item/stock_parts/cell/gun/sharplite/plus/empty, + /obj/item/stock_parts/cell/gun/upgraded/empty ) + valid_attachments = SHARPLITE_ATTACHMENTS manufacturer = MANUFACTURER_SHARPLITE_NEW /obj/item/gun/energy/e_gun/e_old/empty_cell spawn_no_ammo = TRUE +/obj/item/gun/energy/e_gun/e_old/laser + name = "SL L-204 'Fuse' Laser Carbine" + desc = "A basic energy-based laser carbine and somewhat of a predecessor to the X-10. Famed for its low price and reliability." + icon_state = "laser" + ammo_type = list(/obj/item/ammo_casing/energy/laser/nanotrasen/less) + w_class = WEIGHT_CLASS_BULKY + /obj/item/gun/energy/e_gun/e_old/mini - name = "miniature energy gun" - desc = "A small, pistol-sized energy gun with a built-in flashlight. It has two settings: disable and kill." + name = "SL X-26 'Ember' Miniature Energy Pistol" + desc = "A lightweight, civilian marketed Sharplite pistol, popular among Vigilitas security personnel as a reliable dual-mode sidearm. Built-in flashlight included." icon_state = "mini" - item_state = "gun" + ammo_type = list(/obj/item/ammo_casing/energy/laser/nanotrasen/mini, /obj/item/ammo_casing/energy/disabler/nanotrasen/mini) w_class = WEIGHT_CLASS_SMALL default_ammo_type = /obj/item/stock_parts/cell/gun/mini allowed_ammo_types = list( /obj/item/stock_parts/cell/gun/mini, /obj/item/stock_parts/cell/gun/sharplite/mini, + /obj/item/stock_parts/cell/gun/mini/empty, + /obj/item/stock_parts/cell/gun/sharplite/mini/empty, ) throwforce = 11 //This is funny, trust me. ammo_x_offset = 2 @@ -59,23 +66,27 @@ wield_delay = 0.2 SECONDS wield_slowdown = LASER_PISTOL_SLOWDOWN + fire_delay = 0.2 SECONDS + spread = 2 spread_unwielded = 5 + unique_attachments = list( + /obj/item/attachment/rail_light/mini + ) + default_attachments = list(/obj/item/attachment/rail_light/mini) + /obj/item/gun/energy/e_gun/e_old/mini/empty_cell spawn_no_ammo = TRUE /obj/item/gun/energy/e_gun/e_old/hades // Перенёс изменения хомячков - name = "SL AL-655 'Hades' energy rifle" - desc = "Nanotrasen-Sharplite's premium assault energy rifle. This elite energy weapon is focused on heavy fire support. A powerful, but expensive and rare assault rifle." //новое описание без лора оффов - // desc = "The standard issue rifle of Nanotrasen's Security Forces. Most have been put in long term storage following the ICW, and usually aren't issued to low ranking security divisions." + name = "SL AL-655 'Hades' Assault Energy Rifle" + desc = "A powerful energy rifle built on a fairly heavy frame, capable of rapidly producing high-power lethal laser bolts, as well as overcharged disabling projectiles." icon_state = "energytac" ammo_x_offset = 2 charge_sections = 5 - ammo_type = list(/obj/item/ammo_casing/energy/laser/assault, /obj/item/ammo_casing/energy/disabler/assault) - //default_ammo_type = /obj/item/stock_parts/cell/gun/upgraded - default_ammo_type = /obj/item/stock_parts/cell/gun //nerfs the power cell to a standart one + ammo_type = list(/obj/item/ammo_casing/energy/laser/assault/nanotrasen, /obj/item/ammo_casing/energy/disabler/assault/nanotrasen) weapon_weight = WEAPON_MEDIUM w_class = WEIGHT_CLASS_BULKY @@ -99,18 +110,21 @@ manufacturer = MANUFACTURER_NANOTRASEN_OLD /obj/item/gun/energy/e_gun/e_old/hos - name = "\improper X-01 MultiPhase Energy Gun" - desc = "This is an expensive, modern recreation of an antique laser gun. This gun has several unique firemodes, but lacks the ability to recharge over time." - default_ammo_type = /obj/item/stock_parts/cell/gun/upgraded + name = "\improper SL X-01 MultiPhase Energy Gun" + desc = "An expensive, high-capacity, high-power energy pistol built on the X-00 chasis. Modified to have a wide array of energy settings, including a burst firemode. Favored by Vigilitas Security Directors." icon_state = "hoslaser" force = 10 - ammo_type = list(/obj/item/ammo_casing/energy/laser/hos, /obj/item/ammo_casing/energy/disabler, /obj/item/ammo_casing/energy/ion/hos, /obj/item/ammo_casing/energy/electrode/hos) + ammo_type = list(/obj/item/ammo_casing/energy/laser/nanotrasen, /obj/item/ammo_casing/energy/disabler/nanotrasen, /obj/item/ammo_casing/energy/ion/hos, /obj/item/ammo_casing/energy/electrode/nanotrasen) shaded_charge = TRUE - resistance_flags = INDESTRUCTIBLE | LAVA_PROOF | FIRE_PROOF | ACID_PROOF + resistance_flags = LAVA_PROOF | FIRE_PROOF | ACID_PROOF //я не думаю, что оно должно быть индестрактбл manufacturer = MANUFACTURER_SHARPLITE_NEW -/obj/item/ammo_casing/energy/laser/hos - e_cost = 500 + gun_firemodes = list(FIREMODE_SEMIAUTO, FIREMODE_BURST) + default_firemode = FIREMODE_SEMIAUTO + + fire_delay = 0.3 SECONDS + burst_size = 2 + burst_delay = 0.10 SECONDS /obj/item/gun/energy/e_gun/e_old/hos/brazil name = "modified antique laser gun" @@ -154,12 +168,12 @@ can_charge = FALSE internal_magazine = TRUE ammo_x_offset = 2 - ammo_type = list(/obj/item/ammo_casing/energy/laser, /obj/item/ammo_casing/energy/disabler) + ammo_type = list(/obj/item/ammo_casing/energy/laser/nanotrasen, /obj/item/ammo_casing/energy/disabler/nanotrasen) selfcharge = 1 var/reactor_overloaded var/fail_tick = 0 var/fail_chance = 0 - manufacturer = MANUFACTURER_NONE + manufacturer = MANUFACTURER_SHARPLITE_NEW /obj/item/gun/energy/e_gun/e_old/nuclear/process(seconds_per_tick) if(fail_tick > 0) @@ -205,18 +219,20 @@ . += "[icon_state]_fail_2" /obj/item/gun/energy/e_gun/e_old/adv_stopping - name = "advanced stopping revolver" + name = "SL X-14 Advanced Stopping Revolver" desc = "An advanced energy revolver with the capacity to shoot both disabler and lethal lasers, as well as futuristic safari nets." icon_state = "bsgun" item_state = "gun" force = 7 - ammo_type = list(/obj/item/ammo_casing/energy/disabler, /obj/item/ammo_casing/energy/laser/hos, /obj/item/ammo_casing/energy/trap) + ammo_type = list(/obj/item/ammo_casing/energy/disabler/nanotrasen, /obj/item/ammo_casing/energy/laser/nanotrasen, /obj/item/ammo_casing/energy/trap) ammo_x_offset = 1 shaded_charge = TRUE manufacturer = MANUFACTURER_SHARPLITE_NEW +//Base ESMG + /obj/item/gun/energy/e_gun/e_old/smg - name = "\improper E-TAR SMG" + name = "\improper SL X-36 E-TAR SMG" desc = "A dual-mode energy gun capable of discharging weaker shots at a much faster rate than the standard energy gun." icon_state = "esmg" ammo_type = list(/obj/item/ammo_casing/energy/laser/smg, /obj/item/ammo_casing/energy/disabler/smg) @@ -231,36 +247,182 @@ default_firemode = FIREMODE_SEMIAUTO slot_flags = ITEM_SLOT_BACK | ITEM_SLOT_SUITSTORE +//AP ESMG + +/obj/item/gun/energy/e_gun/e_old/smg/sunbeam + name = "\improper SL X-39 'Sunbeam' Energy SMG" + desc = "A variable Sharplite energy SMG capable of discharging armor-piercing bolts, at the cost of a bulkier frame. Frequently used by Vigilitas Troopers against heavy armor." + icon_state = "sunbeam" + ammo_type = list(/obj/item/ammo_casing/energy/laser/smg/ap, /obj/item/ammo_casing/energy/disabler/smg/ap) + + shaded_charge = TRUE + fire_delay = 0.1 SECONDS + + w_class = WEIGHT_CLASS_BULKY + + slot_offsets = list( + ATTACHMENT_SLOT_RAIL = list( + "x" = 30, + "y" = 15, + ) + ) + +/obj/item/gun/energy/e_gun/e_old/smg/sunbeam/inteq + name = "\improper VEC-04 'Gleam' Energy SMG" + desc = "A mostly cosmetic IRMG modification of the Sharplite X-39 'Sunbeam'. Rapidly fires weak lethal and disabler bolts." + icon_state = "sunbeam_inteq" + icon = 'mod_celadon/_storage_icons/icons/items/weapons/48x32guns.dmi' + +//Base Eshotgun + /obj/item/gun/energy/e_gun/e_old/iot - name = "\improper E-SG 500 Second Edition" - desc = "A improved version of the E-SG 255. It now includes two firing modes, disable and kill, while still keeping that sweet integrated computer. Please note that the screen is right next to the switch mode button." + name = "\improper SL E-SG 500 Second Edition" + desc = "A cumbersome, variable energy weapon with a multifaceted lens allowing it to function similarly to a ballistic shotgun." icon_state = "iotshotgun" fire_delay = 0.6 SECONDS shaded_charge = TRUE - ammo_type = list(/obj/item/ammo_casing/energy/laser/ultima, /obj/item/ammo_casing/energy/disabler/scatter/ultima) + ammo_type = list(/obj/item/ammo_casing/energy/laser/shotgun/nanotrasen, /obj/item/ammo_casing/energy/disabler/scatter/shotgun/nanotrasen) charge_sections = 5 ammo_x_offset = 2 automatic_charge_overlays = TRUE + randomspread = FALSE + gun_firemodes = list(FIREMODE_SEMIAUTO) + default_firemode = FIREMODE_SEMIAUTO + w_class = WEIGHT_CLASS_BULKY + weapon_weight = WEAPON_MEDIUM + +//Burst EShotgun + +/obj/item/gun/energy/e_gun/e_old/iot/blaze + name = "\improper SL AL-370 'Blaze' Energy Shotgun" + desc = "An experimental improvement over the aging E-SG series, featuring double laser bursts and a heavier frame, it now can apply even more pressure on whatever you decide to kill. The nonlethal disabler mode had to be sacrificed in order to achieve higher power output." + icon_state = "blaze" + ammo_type = list(/obj/item/ammo_casing/energy/laser/shotgun/nanotrasen/burst) + charge_sections = 4 + gun_firemodes = list(FIREMODE_BURST) + default_firemode = FIREMODE_BURST + + burst_size = 2 + + slot_available = SHARPLITE_ATTACH_SLOTS + slot_offsets = list( + ATTACHMENT_SLOT_RAIL = list( + "x" = 30, + "y" = 15, + ) + ) + +//Heavy energy machine gun... truly cursed + +/obj/item/gun/energy/e_gun/e_old/emg + name = "SL AL-690 'Daybreak' Energy Machine Gun" + desc = "Dear God. Somehow, the development of Sharplite energy weaponry has led us to this. It will absolutely decimate whatever stands in your way with an endless stream of assault lasers. How this does not violate some galactic convention is beyond you." + icon_state = "daybreak" + w_class = WEAPON_VERY_HEAVY + weapon_weight = WEAPON_VERY_HEAVY + wield_slowdown = 1.2 + default_ammo_type = /obj/item/stock_parts/cell/gun/large + ammo_type = list(/obj/item/ammo_casing/energy/laser/assault/nanotrasen/emg) + allowed_ammo_types = list( + /obj/item/stock_parts/cell/gun/large, + /obj/item/stock_parts/cell/gun/large/empty, + ) + gun_firemodes = list(FIREMODE_FULLAUTO) + default_firemode = FIREMODE_FULLAUTO + shaded_charge = TRUE + + slot_flags = ITEM_SLOT_BACK | ITEM_SLOT_SUITSTORE + fire_delay = 0.15 SECONDS + wield_delay = 2 SECONDS + + fire_sound_volume = 90 + spread = 12 + spread_unwielded = 35 + + slot_offsets = list( + ATTACHMENT_SLOT_RAIL = list( + "x" = 36, + "y" = 14, + ) + ) + +//EDMR + +/obj/item/gun/energy/e_gun/e_old/dmr + name = "SL L-211 'Parallax' Energy Marksman Rifle" + desc = "An extensive modification on the X-10 frame, featuring stronger armor-piercing bolts and a decent scope. The energy efficiency had to be somewhat sacrificed." + icon_state = "parallax" + ammo_type = list(/obj/item/ammo_casing/energy/laser/nanotrasen/dmr) + ammo_x_offset = 1 + shaded_charge = TRUE + manufacturer = MANUFACTURER_SHARPLITE_NEW + + zoomable = TRUE + wield_slowdown = RIFLE_SLOWDOWN + aimed_wield_slowdown = LONG_RIFLE_AIM_SLOWDOWN + wield_delay = 1 SECONDS + fire_delay = 0.7 SECONDS + + slot_flags = ITEM_SLOT_BACK | ITEM_SLOT_SUITSTORE + + spread = 0 + spread_unwielded = 40 + + zoom_amt = DMR_ZOOM + zoom_out_amt = 5 + + slot_offsets = list( + ATTACHMENT_SLOT_RAIL = list( + "x" = 35, + "y" = 15, + ) + ) + +//Laser cannon - Esniper + +/obj/item/gun/energy/e_gun/e_old/sniper + name = "SL AL-602 'Phoenix' Energy Cannon" + desc = "An advanced sniper-like laser cannon that does more damage the farther away the target is. You can attach a scope to it! Infact, it comes with one already inbuit." + icon = 'mod_celadon/_storage_icons/icons/items/weapons/48x32_old.dmi' + lefthand_file = 'mod_celadon/_storage_icons/icons/items/weapons/in_hands/lefthand_old.dmi' + righthand_file = 'mod_celadon/_storage_icons/icons/items/weapons/in_hands/righthand_old.dmi' + mob_overlay_icon = 'mod_celadon/_storage_icons/icons/items/weapons/overlay/onmob.dmi' + icon_state = "phoenix" + item_state = "phoenix" + shaded_charge = TRUE + charge_sections = 5 w_class = WEIGHT_CLASS_BULKY - var/obj/item/modular_computer/integratedNTOS - var/NTOS_type = /obj/item/modular_computer/internal + weapon_weight = WEAPON_HEAVY + default_ammo_type = /obj/item/stock_parts/cell/gun/large + allowed_ammo_types = list( + /obj/item/stock_parts/cell/gun/large, + /obj/item/stock_parts/cell/gun/large/empty, + ) + force = 10 + flags_1 = CONDUCT_1 + slot_flags = ITEM_SLOT_BACK | ITEM_SLOT_SUITSTORE + ammo_type = list(/obj/item/ammo_casing/energy/laser/accelerator/nanotrasen) + ammo_x_offset = 3 + fire_sound_volume = 90 + zoom_amt = 8 + zoom_out_amt = 5 + wield_slowdown = LASER_SNIPER_SLOWDOWN + manufacturer = MANUFACTURER_SHARPLITE_NEW -/obj/item/gun/energy/e_gun/e_old/iot/examine(mob/user) - . = ..() - . += "You can use integrated computer by pressing the secondary action key. By default, this is Shift + Space" + spread = -5 + spread_unwielded = 40 -/obj/item/gun/energy/e_gun/e_old/iot/Initialize() - . = ..() - if(NTOS_type) - integratedNTOS = new NTOS_type(src) - integratedNTOS.physical = src + wield_delay = 1.3 SECONDS -/obj/item/gun/energy/e_gun/e_old/iot/secondary_action(user) - if(!integratedNTOS) - return - integratedNTOS.interact(user) - . = ..() + slot_available = SHARPLITE_ATTACH_SLOTS + +//disabler + +/obj/item/gun/energy/disabler + ammo_type = list(/obj/item/ammo_casing/energy/disabler/nanotrasen) + +//empty guns /obj/item/gun/energy/e_gun/e_old/hades/empty_cell spawn_no_ammo = TRUE @@ -296,7 +458,7 @@ /obj/item/stock_parts/cell/gun/sharplite name = "plasma power cell" - desc = "A proprietary power cell primarily used by Sharplite Plasma weaponry. Nanotrasen's large market share has forced some weapon developers to include adapters for these cells" + desc = "A proprietary power cell primarily used by Sharplite Plasma weaponry. Nanotrasen's large market share has forced some weapon developers to include adapters for these cells." icon = 'mod_celadon/_storage_icons/icons/items/weapons/power.dmi' icon_state = "plasma-cell" base_state = "plasma" // Оверлей - Цвет-заряда батареек @@ -311,7 +473,11 @@ maxcharge = 30000 /obj/item/stock_parts/cell/gun/mini + name = "miniature energy power cell" + desc = "A compact weapon cell primarily used by Sharplite Energy weaponry. Nanotrasen's large market share has forced some weapon developers to include adapters for these cells. It holds less charge and is intended for usage in energy handguns." + w_class = WEIGHT_CLASS_TINY icon = 'icons/obj/power.dmi' + icon_state = "mg-cell" reskin = FALSE /obj/item/stock_parts/cell/gun/solgov @@ -331,9 +497,14 @@ reskin = FALSE /obj/item/stock_parts/cell/gun/sharplite/mini + name = "miniature plasma power cell" + desc = "A compact weapon cell used exclusively by Sharplite Plasma weaponry. It holds less charge and is intended for usage in energy handguns." icon = 'icons/obj/power.dmi' reskin = FALSE // Выше вместимость увеличена была в 1.5 раза, и расход тоже соответственно /obj/item/ammo_casing/energy/lasergun/sharplite/sniper e_cost = 3000 // 5 per regular cell 10 per upgraded cell + +#undef SHARPLITE_ATTACHMENTS +#undef SHARPLITE_ATTACH_SLOTS diff --git a/mod_celadon/weapons/code/modules/projectiles/guns/energy/laser.dm b/mod_celadon/weapons/code/modules/projectiles/guns/energy/laser.dm index 30581e544e1f..03ddf2a8c865 100644 --- a/mod_celadon/weapons/code/modules/projectiles/guns/energy/laser.dm +++ b/mod_celadon/weapons/code/modules/projectiles/guns/energy/laser.dm @@ -1,21 +1,12 @@ -// де факто это вот этот объект /obj/item/gun/energy/laser/retro -/obj/item/gun/energy/laser - name = "SL L-104 laser gun" - desc = "A basic energy-based laser gun that fires concentrated beams of light which pass through glass and thin metal." - w_class = WEIGHT_CLASS_NORMAL - manufacturer = MANUFACTURER_SHARPLITE - -// Добавляем поддержку батарей типа Эохомы и типа Шарплайта /obj/item/gun/energy/laser/retro + name ="SL L-104 Laser Gun" + desc = "An antiquated model of the L-204, no longer used or sold by Sharplite. Nevertheless, the sheer popularity of this model makes it a somewhat common sight to this day." + icon_state = "retro" allowed_ammo_types = list( /obj/item/stock_parts/cell/gun, /obj/item/stock_parts/cell/gun/upgraded, /obj/item/stock_parts/cell/gun/empty, - /obj/item/stock_parts/cell/gun/upgraded/empty, - /obj/item/stock_parts/cell/gun/sharplite, - /obj/item/stock_parts/cell/gun/sharplite/plus, - /obj/item/stock_parts/cell/gun/sharplite/empty, - /obj/item/stock_parts/cell/gun/sharplite/plus/empty, + /obj/item/stock_parts/cell/gun/upgraded/empty ) /obj/item/gun/energy/laser/retro/empty_cell @@ -23,3 +14,22 @@ /obj/item/gun/energy/lasercannon/empty_cell spawn_no_ammo = TRUE + +/obj/item/gun/energy/laser/captain + name = "SL X-00 Laser Gun" + lefthand_file = 'mod_celadon/_storage_icons/icons/items/weapons/in_hands/lefthand_old.dmi' + righthand_file = 'mod_celadon/_storage_icons/icons/items/weapons/in_hands/righthand_old.dmi' + mob_overlay_icon = 'mod_celadon/_storage_icons/icons/items/weapons/overlay/onmob.dmi' + icon_state = "caplaser" + item_state = "caplaser" + desc = "This is the SL X-00, an antique laser gun, out of production for decades and well beyond anyone's capacity to recreate. All craftsmanship is of the highest quality. It is decorated with ashdrake leather and chrome. The gun menaces with spikes of energy. On the item is an image of a space ship. The ship is exploding." + force = 10 + ammo_x_offset = 3 + ammo_type = list(/obj/item/ammo_casing/energy/laser/antique) + selfcharge = TRUE + internal_magazine = TRUE + resistance_flags = INDESTRUCTIBLE | LAVA_PROOF | FIRE_PROOF | ACID_PROOF + manufacturer = MANUFACTURER_SHARPLITE_NEW + + spread = 2 + spread_unwielded = 5 diff --git a/mod_celadon/weapons/code/modules/projectiles/guns/weapon_attachments.dm b/mod_celadon/weapons/code/modules/projectiles/guns/weapon_attachments.dm index aa1773c67d1d..c3e0c95582a5 100644 --- a/mod_celadon/weapons/code/modules/projectiles/guns/weapon_attachments.dm +++ b/mod_celadon/weapons/code/modules/projectiles/guns/weapon_attachments.dm @@ -1,3 +1,15 @@ //https://github.com/CeladonSS13/Shiptest/pull/1739 /obj/item/attachment/silencer size_mod = 0 + +//Mini egun light +/obj/item/attachment/rail_light/mini + name = "X-26 flashlight" + desc = "A flashlight built specifically for the X-26. You should not see this." + icon = 'mod_celadon/_storage_icons/icons/items/weapons/attachments.dmi' + icon_state = "mini" + light_color = LIGHT_COLOR_HALOGEN + light_system = MOVABLE_LIGHT_DIRECTIONAL + + attach_features_flags = ATTACH_TOGGLE + wield_delay = 0 SECONDS diff --git a/mod_celadon/weapons/code/modules/projectiles/projectile/energy/beams.dm b/mod_celadon/weapons/code/modules/projectiles/projectile/energy/beams.dm index 954f0039f2ec..e553cb2281a0 100644 --- a/mod_celadon/weapons/code/modules/projectiles/projectile/energy/beams.dm +++ b/mod_celadon/weapons/code/modules/projectiles/projectile/energy/beams.dm @@ -148,57 +148,138 @@ // MARK: LASER PROJECTILES -//HADES projectiles -// Меняет баланс Хейдеса -// Это трогает ещё эохому e40_laser_secondary +//Base NT-SL Laser +/obj/projectile/beam/laser/nanotrasen //таким образом еоехома не словит бесплатный бафф + удобнее редачить древний код + icon = 'mod_celadon/_storage_icons/icons/items/weapons/ammo/projectiles.dmi' + icon_state = "sl_laser" + speed = 0.3 //egun buff - просто мувспид с плазмапушек + +/obj/projectile/beam/laser/nanotrasen/weak + icon_state = "sl_laser_light" + damage = 15 + armour_penetration = -15 + +//Base NT-SL Disabler beam + +/obj/projectile/beam/disabler/nanotrasen + icon = 'mod_celadon/_storage_icons/icons/items/weapons/ammo/projectiles.dmi' + icon_state = "sl_disabler" + speed = 0.3 + +/obj/projectile/beam/disabler/nanotrasen/weak + icon_state = "sl_disabler_light" + damage = 18 + armour_penetration = -10 + +// /obj/item/gun/energy/e_gun/e_old/hos + +/obj/projectile/beam/laser/nanotrasen/hos + damage = 20 + +/obj/projectile/beam/laser/nanotrasen/weak + damage = 15 + armour_penetration = -15 + +// /obj/item/gun/energy/e_gun/e_old/dmr + +/obj/projectile/beam/laser/nanotrasen/dmr + icon_state = "sl_laser_hellfire" + damage = 35 + armour_penetration = 30 + +// /obj/item/gun/energy/e_gun/e_old/smg/sunbeam + +/obj/projectile/beam/laser/nanotrasen/weak/ap //more armorpen, less damage + damage = 12 + armour_penetration = 10 + +/obj/projectile/beam/disabler/nanotrasen/weak/ap + damage = 15 + armour_penetration = 20 -/obj/projectile/beam/disabler/assault +// /obj/item/gun/energy/e_gun/e_old/hades +// /obj/item/gun/energy/e_gun/e_old/emg + +/obj/projectile/beam/laser/nanotrasen/assault + icon_state = "sl_laser_heavy" + damage = 25 + armour_penetration = 20 + +/obj/projectile/beam/disabler/nanotrasen/assault icon = 'mod_celadon/_storage_icons/icons/items/weapons/ammo/projectiles.dmi' - icon_state = "heavylaser_blue" - speed = 0.7 // 0.8 изначально у оффов + icon_state = "sl_disabler_heavy" damage = 25 armour_penetration = 20 -/obj/projectile/beam/laser/assault - speed = 0.7 //makes the ASSAULT lasers go faster to make them not shit - // 0.8 изначально у оффов. - // armour_penetration = 20 // У оффов уже изменено до 20 +// /obj/item/gun/energy/e_gun/e_old/hos -// Здесь были изменения Хейдеса. Искать его в mod_celadon\return_egun\code\e_gun.dm +/obj/projectile/energy/electrode/nanotrasen + damage = 80 //по сути даже за берст ты навешаешь лишь слоудаун человеку в броне + range = 8 //Honorable mentions -/obj/projectile/beam/disabler/heavylaser - icon = 'mod_celadon/_storage_icons/icons/items/weapons/ammo/projectiles.dmi' - icon_state = "heavylaser_blue" +/obj/projectile/beam/laser/nanotrasen/heavylaser //NT-SL turrets + icon_state = "sl_laser_heavy" damage = 40 + speed = 0.4 -/obj/projectile/beam/disabler/heavylaser/sharplite //NT-SL turrets +/obj/projectile/beam/disabler/nanotrasen/heavylaser + icon_state = "sl_disabler_heavy" + damage = 40 speed = 0.4 -//Iot Projectiles +// /obj/item/gun/energy/e_gun/e_old/iot +// /obj/item/gun/energy/e_gun/e_old/iot/blaze -/obj/projectile/beam/disabler/iot - icon_state = "blue_laser" +/obj/projectile/beam/disabler/nanotrasen/shotgun + icon_state = "sl_disabler_light" damage = 15 range = 15 + armour_penetration = -10 + speed = 0.5 //just to make it a bit more fair -/obj/projectile/beam/laser/iot - icon_state = "red_laser" +/obj/projectile/beam/laser/nanotrasen/shotgun + icon_state = "sl_laser_light" damage = 15 armour_penetration = -10 range = 15 + speed = 0.5 -//etar-smg projectiles +// /obj/item/gun/energy/lasercannon -/obj/projectile/beam/disabler/weak/smg - speed = 0.5 - armour_penetration = -15 - range = 40 +/obj/projectile/beam/laser/nanotrasen/sniper + icon = 'mod_celadon/_storage_icons/icons/items/weapons/ammo/projectiles.dmi' + name = "accelerator laser" + icon_state = "sl_laser_light" + range = 255 + damage = 10 + armour_penetration = 30 + var/damage_cap = 60 -/obj/projectile/beam/laser/light/smg //makes the gun not too op like it was, but at the same time quite useful - speed = 0.5 //actual smg speed - armour_penetration = -15 +/obj/projectile/beam/laser/nanotrasen/sniper/Range() + ..() + damage += 4 + transform *= 1 + ((damage/4) * 0.2) + if(damage_cap < damage) + damage = damage_cap + +// /obj/item/gun/energy/e_gun/e_old/mini + +/obj/projectile/beam/laser/nanotrasen/weak/mini + icon = 'mod_celadon/_storage_icons/icons/items/weapons/ammo/projectiles.dmi' + armour_penetration = 5 + +/obj/projectile/beam/disabler/nanotrasen/weak/mini + icon = 'mod_celadon/_storage_icons/icons/items/weapons/ammo/projectiles.dmi' + armour_penetration = 10 + +// /obj/item/gun/energy/laser/captain + +/obj/projectile/beam/laser/nanotrasen/hellfire + icon_state = "sl_laser_hellfire" + damage = 30 + armour_penetration = 25 // MARK: Ion balance