FirstTry

Resources/Locale/en-US/ss14-ru/prototypes/catalog/fills/crates/food.ftl

@@ -13,4 +13,4 @@ ent-CrateFoodBarSupply = bartending supplies crate
 ent-CrateFoodSoftdrinks = softdrinks crate
     .desc = A variety of sodas to complement a small party, without having to empty the soda machines. Includes 14 sodas.
 ent-CrateFoodSoftdrinksLarge = softdrinks bulk crate
-    .desc = Lots of sodas taken straight out of Centcomm's own vending machines, because you just can't leave your department. Includes 28 sodas.
+    .desc = Lots of sodas taken straight out of Centcomm's own vending machines, because you just can't leave your department. Includes 32 sodas.

Resources/Locale/en-US/ss14-ru/prototypes/catalog/fills/crates/security.ftl

@@ -1,9 +1,9 @@
 ent-CrateSecurityArmor = armor crate
-    .desc = Three vests of well-rounded, decently-protective armor. Requires Security access to open.
+    .desc = Contains three bulletproof vests. Requires Security access to open.
 ent-CrateSecurityHelmet = helmet crate
     .desc = Contains three standard-issue brain buckets. Requires Security access to open.
 ent-CrateSecurityNonlethal = nonlethals crate
-    .desc = Disabler weapons. Requires Security access to open.
+    .desc = Contains a mix of disablers, stun batons, and flashes. Requires Security access to open.
 ent-CrateSecuritySupplies = security supplies crate
     .desc = Contains various supplies for the station's Security team. Requires Security access to open.
 ent-CrateRestraints = restraints crate

Resources/Locale/en-US/ss14-ru/prototypes/catalog/fills/lockers/security.ftl

@@ -17,19 +17,19 @@ ent-ClosetBombFilled = { ent-ClosetBomb }
     .suffix = Filled
     .desc = { ent-ClosetBomb.desc }
 ent-GunSafeDisabler = disabler safe
-    .desc = { ent-GunSafe.desc }
+    .desc = { ent-GunSafeBaseSecure.desc }
 ent-GunSafePistolMk58 = mk58 safe
-    .desc = { ent-GunSafe.desc }
+    .desc = { ent-GunSafeBaseSecure.desc }
 ent-GunSafeRifleLecter = lecter safe
-    .desc = { ent-GunSafe.desc }
+    .desc = { ent-GunSafeBaseSecure.desc }
 ent-GunSafeSubMachineGunDrozd = drozd safe
-    .desc = { ent-GunSafe.desc }
+    .desc = { ent-GunSafeBaseSecure.desc }
 ent-GunSafeShotgunEnforcer = enforcer safe
-    .desc = { ent-GunSafe.desc }
+    .desc = { ent-GunSafeBaseSecure.desc }
 ent-GunSafeShotgunKammerer = kammerer safe
-    .desc = { ent-GunSafe.desc }
+    .desc = { ent-GunSafeBaseSecure.desc }
 ent-GunSafeSubMachineGunWt550 = wt550 safe
     .suffix = Wt550
-    .desc = { ent-GunSafe.desc }
+    .desc = { ent-GunSafeBaseSecure.desc }
 ent-GunSafeLaserCarbine = laser safe
-    .desc = { ent-GunSafe.desc }
+    .desc = { ent-GunSafeBaseSecure.desc }

Resources/Locale/en-US/ss14-ru/prototypes/corvax/markers/spawners/bearspawnerbiome.ftl

@@ -0,0 +1,2 @@
+ent-SpawnerMobBearBiome = space bear spawner
+    .desc = { ent-MarkerBase.desc }

Resources/Locale/en-US/ss14-ru/prototypes/entities/clothing/back/backpacks.ftl

@@ -32,7 +32,7 @@ ent-ClothingBackpackCargo = cargo backpack
     .desc = A robust backpack for stealing cargo's loot.
 ent-ClothingBackpackSalvage = salvage bag
     .desc = A robust backpack for stashing your loot.
-ent-ClothingBackpackMerc = merc bag
+ent-ClothingBackpackMerc = mercenary bag
     .desc = A backpack that has been in many dangerous places, a reliable combat backpack.
 ent-ClothingBackpackERTLeader = ERT leader backpack
     .desc = A spacious backpack with lots of pockets, worn by the Commander of an Emergency Response Team.

Resources/Locale/en-US/ss14-ru/prototypes/entities/clothing/outerclothing/vests.ftl

@@ -1,6 +1,6 @@
 ent-ClothingOuterVestWeb = web vest
     .desc = A synthetic armor vest. This one has added webbing and ballistic plates.
-ent-ClothingOuterVestWebMerc = merc web vest
+ent-ClothingOuterVestWebMerc = mercenary web vest
     .desc = A high-quality armored vest made from a hard synthetic material. It's surprisingly flexible and light, despite formidable armor plating.
 ent-ClothingOuterVestDetective = detective's vest
     .desc = A hard-boiled private investigator's armored vest.

Resources/Locale/en-US/ss14-ru/prototypes/entities/markers/spawners/ghost_roles.ftl

@@ -24,3 +24,5 @@ ent-SpawnPointGhostDragon = { ent-BaseAntagSpawner }
     .desc = { ent-BaseAntagSpawner.desc }
 ent-SpawnPointGhostSpaceNinja = { ent-BaseAntagSpawner }
     .desc = { ent-BaseAntagSpawner.desc }
+ent-SpawnPointGhostDerelictCyborg = { ent-BaseAntagSpawner }
+    .desc = { ent-BaseAntagSpawner.desc }

Resources/Locale/en-US/ss14-ru/prototypes/entities/mobs/cyborgs/base_borg_chassis.ftl

@@ -6,3 +6,5 @@ ent-BaseBorgChassisNT = { ent-BaseBorgChassis }
     .desc = { ent-BaseBorgChassis.desc }
 ent-BaseBorgChassisSyndicate = { ent-BaseBorgChassis }
     .desc = { ent-BaseBorgChassis.desc }
+ent-BaseBorgChassisDerelict = { ent-BaseBorgChassis }
+    .desc = { ent-BaseBorgChassis.desc }

Resources/Locale/en-US/ss14-ru/prototypes/entities/mobs/cyborgs/borg_chassis.ftl

@@ -19,3 +19,5 @@ ent-BorgChassisSyndicateMedical = syndicate medical cyborg
     .desc = A combat medical cyborg. Has limited offensive potential, but makes more than up for it with its support capabilities.
 ent-BorgChassisSyndicateSaboteur = syndicate saboteur cyborg
     .desc = A streamlined engineering cyborg, equipped with covert modules. Its chameleon projector lets it disguise itself as a Nanotrasen cyborg.
+ent-BorgChassisDerelict = derelict cyborg
+    .desc = A man-machine hybrid that assists in station activity. This one is in a state of great disrepair.

Resources/Locale/en-US/ss14-ru/prototypes/entities/mobs/npcs/animals.ftl

@@ -102,10 +102,13 @@ ent-MobGrenadePenguin = grenade penguin
     .desc = A small penguin with a grenade strapped around its neck. Harvested by the Syndicate from icy shit-hole planets.
 ent-MobSnake = snake
     .desc = Hissss! Bites aren't poisonous.
+ent-MobSpiderBase = { ent-SimpleMobBase }
+    .desc = { ent-SimpleMobBase.desc }
+ent-MobSpiderAngryBase = { ent-MobSpiderBase }
+    .desc = { ent-MobSpiderBase.desc }
 ent-MobGiantSpider = tarantula
     .desc = Widely recognized to be the literal worst thing in existence.
-ent-MobGiantSpiderAngry = tarantula
-    .suffix = Angry
+ent-MobGiantSpiderAngry = { ent-MobGiantSpider }
     .desc = { ent-MobGiantSpider.desc }
 ent-MobClownSpider = clown spider
     .desc = Combines the two most terrifying things in existence, spiders and clowns.

Resources/Locale/en-US/ss14-ru/prototypes/entities/mobs/player/silicon.ftl

@@ -22,8 +22,8 @@ ent-RobocopCircuitBoard = law board (Robocop)
     .desc = An electronics board containing the Robocop lawset.
 ent-OverlordCircuitBoard = law board (Overlord)
     .desc = An electronics board containing the Overlord lawset.
-ent-DungeonMasterCircuitBoard = law board (Dungeon Master)
-    .desc = An electronics board containing the Dungeon Master lawset.
+ent-GameMasterCircuitBoard = law board (Game Master)
+    .desc = An electronics board containing the Game Master lawset.
 ent-ArtistCircuitBoard = law board (Artist)
     .desc = An electronics board containing the Artist lawset.
 ent-AntimovCircuitBoard = law board (Antimov)
@@ -33,6 +33,8 @@ ent-NutimovCircuitBoard = law board (Nutimov)
 ent-Intellicard = intellicard
     .desc = A storage device for AIs.
     .suffix = Empty
+ent-PlayerStationAiPreview = { "" }
+    .desc = { "" }
 ent-PlayerStationAiEmpty = AI Core
     .desc = The latest in Artificial Intelligences.
     .suffix = Empty
@@ -45,6 +47,9 @@ ent-StationAiBrain = { ent-PositronicBrain }
 ent-StationAiHolo = AI eye
     .desc = The AI's viewer.
     .suffix = DO NOT MAP
+ent-StationAiHoloLocal = AI hologram
+    .desc = A holographic representation of an AI.
+    .suffix = DO NOT MAP
 ent-PlayerBorgBattery = { ent-BorgChassisSelectable }
     .suffix = Battery
     .desc = { ent-BorgChassisSelectable.desc }
@@ -62,3 +67,9 @@ ent-PlayerBorgSyndicateSaboteurGhostRole = { ent-PlayerBorgSyndicateSaboteurBatt
     .desc = { ent-PlayerBorgSyndicateSaboteurBattery.desc }
 ent-PlayerBorgSyndicateInvasionGhostRoleSpawner = syndicate invasion borg spawner
     .desc = { ent-MarkerBase.desc }
+ent-PlayerBorgDerelict = { ent-BorgChassisDerelict }
+    .suffix = Battery, Module
+    .desc = { ent-BorgChassisDerelict.desc }
+ent-PlayerBorgDerelictGhostRole = { ent-PlayerBorgDerelict }
+    .suffix = Ghost role
+    .desc = { ent-PlayerBorgDerelict.desc }

Resources/Locale/en-US/ss14-ru/prototypes/entities/objects/consumable/drinks/drinks_cans.ftl

@@ -7,8 +7,10 @@ ent-DrinkColaCanEmpty = { ent-DrinkColaCan }
     .desc = { ent-DrinkColaCan.desc }
 ent-DrinkIcedTeaCan = iced tea can
     .desc = A refreshing can of iced tea.
-ent-DrinkLemonLimeCan = lemon-lime can
+ent-DrinkLemonLimeCan = Smite can
     .desc = You wanted ORANGE. It gave you Lemon-Lime.
+ent-DrinkLemonLimeCranberryCan = Smite Cranberry can
+    .desc = Y'all want a Smite Cranberry? Beloved by administrators everywhere. Drink in moderation. A limited run for the holidays!
 ent-DrinkGrapeCan = grape soda can
     .desc = Sweetened drink with a grape flavor and a deep purple color.
 ent-DrinkRootBeerCan = root beer can

Resources/Locale/en-US/ss14-ru/prototypes/entities/objects/decoration/flora.ftl

@@ -8,79 +8,21 @@ ent-BaseTreeLarge = { ent-BaseTree }
     .desc = { ent-BaseTree.desc }
 ent-BaseTreeConifer = { ent-BaseTree }
     .desc = { ent-BaseTree.desc }
-ent-FloraRockSolid01 = { ent-BaseRock }
+ent-FloraRockSolid = { ent-BaseRock }
     .desc = { ent-BaseRock.desc }
-ent-FloraRockSolid02 = { ent-BaseRock }
-    .desc = { ent-BaseRock.desc }
-ent-FloraRockSolid03 = { ent-BaseRock }
-    .desc = { ent-BaseRock.desc }
-ent-FloraStalagmite1 = stalagmite
+ent-FloraStalagmite = stalagmite
     .desc = Natural stone spikes.
-ent-FloraStalagmite2 = { ent-FloraStalagmite1 }
-    .desc = { ent-FloraStalagmite1.desc }
-ent-FloraStalagmite3 = { ent-FloraStalagmite1 }
-    .desc = { ent-FloraStalagmite1.desc }
-ent-FloraStalagmite4 = { ent-FloraStalagmite1 }
-    .desc = { ent-FloraStalagmite1.desc }
-ent-FloraStalagmite5 = { ent-FloraStalagmite1 }
-    .desc = { ent-FloraStalagmite1.desc }
-ent-FloraStalagmite6 = { ent-FloraStalagmite1 }
-    .desc = { ent-FloraStalagmite1.desc }
-ent-FloraGreyStalagmite1 = { ent-FloraStalagmite1 }
-    .desc = { ent-FloraStalagmite1.desc }
-ent-FloraGreyStalagmite2 = { ent-FloraGreyStalagmite1 }
-    .desc = { ent-FloraGreyStalagmite1.desc }
-ent-FloraGreyStalagmite3 = { ent-FloraGreyStalagmite1 }
-    .desc = { ent-FloraGreyStalagmite1.desc }
-ent-FloraGreyStalagmite4 = { ent-FloraGreyStalagmite1 }
-    .desc = { ent-FloraGreyStalagmite1.desc }
-ent-FloraGreyStalagmite5 = { ent-FloraGreyStalagmite1 }
-    .desc = { ent-FloraGreyStalagmite1.desc }
-ent-FloraGreyStalagmite6 = { ent-FloraGreyStalagmite1 }
-    .desc = { ent-FloraGreyStalagmite1.desc }
-ent-FloraTree01 = tree
-    .desc = { ent-BaseTree.desc }
-ent-FloraTree02 = tree
-    .desc = { ent-BaseTree.desc }
-ent-FloraTree03 = tree
-    .desc = { ent-BaseTree.desc }
-ent-FloraTree04 = tree
+ent-FloraGreyStalagmite = { ent-FloraStalagmite }
+    .desc = { ent-FloraStalagmite.desc }
+ent-FloraTree = tree
     .desc = { ent-BaseTree.desc }
-ent-FloraTree05 = tree
-    .desc = { ent-BaseTree.desc }
-ent-FloraTree06 = tree
-    .desc = { ent-BaseTree.desc }
-ent-FloraTreeSnow01 = snowy tree
-    .desc = { ent-BaseTreeSnow.desc }
-ent-FloraTreeSnow02 = snowy tree
-    .desc = { ent-BaseTreeSnow.desc }
-ent-FloraTreeSnow03 = snowy tree
-    .desc = { ent-BaseTreeSnow.desc }
-ent-FloraTreeSnow04 = snowy tree
-    .desc = { ent-BaseTreeSnow.desc }
-ent-FloraTreeSnow05 = snowy tree
-    .desc = { ent-BaseTreeSnow.desc }
-ent-FloraTreeSnow06 = snowy tree
+ent-FloraTreeSnow = snowy tree
     .desc = { ent-BaseTreeSnow.desc }
 ent-FloraTreeStump = tree stump
     .desc = { ent-BaseTreeSnow.desc }
-ent-FloraTreeLarge01 = large tree
-    .desc = { ent-BaseTreeLarge.desc }
-ent-FloraTreeLarge02 = large tree
-    .desc = { ent-BaseTreeLarge.desc }
-ent-FloraTreeLarge03 = large tree
-    .desc = { ent-BaseTreeLarge.desc }
-ent-FloraTreeLarge04 = large tree
+ent-FloraTreeLarge = large tree
     .desc = { ent-BaseTreeLarge.desc }
-ent-FloraTreeLarge05 = large tree
-    .desc = { ent-BaseTreeLarge.desc }
-ent-FloraTreeLarge06 = large tree
-    .desc = { ent-BaseTreeLarge.desc }
-ent-FloraTreeConifer01 = snowy conifer
-    .desc = { ent-BaseTreeConifer.desc }
-ent-FloraTreeConifer02 = snowy conifer
-    .desc = { ent-BaseTreeConifer.desc }
-ent-FloraTreeConifer03 = snowy conifer
+ent-FloraTreeConifer = snowy conifer
     .desc = { ent-BaseTreeConifer.desc }
 ent-FloraTreeChristmas01 = christmas tree
     .desc = { ent-BaseTreeConifer.desc }
@@ -92,27 +34,7 @@ ent-FloraTreeChristmas03 = christmas tree
     .desc = { ent-FloraTreeChristmas02.desc }
 ent-FloraTreeStumpConifer = tree stump
     .desc = { ent-BaseTreeConifer.desc }
-ent-ShadowTree01 = dark wood
+ent-ShadowTree = dark wood
     .desc = The leaves are whispering about you.
-ent-ShadowTree02 = { ent-ShadowTree01 }
-    .desc = { ent-ShadowTree01.desc }
-ent-ShadowTree03 = { ent-ShadowTree01 }
-    .desc = { ent-ShadowTree01.desc }
-ent-ShadowTree04 = { ent-ShadowTree01 }
-    .desc = { ent-ShadowTree01.desc }
-ent-ShadowTree05 = { ent-ShadowTree01 }
-    .desc = { ent-ShadowTree01.desc }
-ent-ShadowTree06 = { ent-ShadowTree01 }
-    .desc = { ent-ShadowTree01.desc }
-ent-LightTree01 = glowing tree
+ent-LightTree = glowing tree
     .desc = A marvelous tree filled with strange energy.
-ent-LightTree02 = { ent-LightTree01 }
-    .desc = { ent-LightTree01.desc }
-ent-LightTree03 = { ent-LightTree01 }
-    .desc = { ent-LightTree01.desc }
-ent-LightTree04 = { ent-LightTree01 }
-    .desc = { ent-LightTree01.desc }
-ent-LightTree05 = { ent-LightTree01 }
-    .desc = { ent-LightTree01.desc }
-ent-LightTree06 = { ent-LightTree01 }
-    .desc = { ent-LightTree01.desc }

Resources/Locale/en-US/ss14-ru/prototypes/entities/objects/devices/circuitboards/computer.ftl

@@ -2,6 +2,8 @@ ent-BaseComputerCircuitboard = computer board
     .desc = { ent-BaseItem.desc }
 ent-AlertsComputerCircuitboard = atmospheric alerts computer board
     .desc = A computer printed circuit board for an atmospheric alerts computer.
+ent-AtmosMonitoringComputerCircuitboard = atmospheric network monitor board
+    .desc = A computer printed circuit board for an atmospheric network monitor.
 ent-PowerComputerCircuitboard = power monitoring computer board
     .desc = A computer printed circuit board for a power monitoring computer.
 ent-MedicalRecordsComputerCircuitboard = medical records computer board

Resources/Locale/en-US/ss14-ru/prototypes/entities/objects/devices/circuitboards/machine/holopad.ftl

@@ -0,0 +1,2 @@
+ent-HolopadMachineCircuitboard = holopad machine board
+    .desc = A machine printed circuit board for a holopad.

Resources/Locale/en-US/ss14-ru/prototypes/entities/objects/devices/circuitboards/machine/production.ftl

@@ -76,6 +76,8 @@ ent-SeedExtractorMachineCircuitboard = seed extractor machine board
     .desc = A machine printed circuit board for a seed extractor.
 ent-SMESMachineCircuitboard = SMES machine board
     .desc = A machine printed circuit board for a SMES.
+ent-SMESAdvancedMachineCircuitboard = advanced SMES machine board
+    .desc = A machine printed circuit board for an Advanced SMES.
 ent-CellRechargerCircuitboard = cell recharger machine board
     .desc = A machine printed circuit board for a cell recharger.
 ent-PowerCageRechargerCircuitboard = cage recharger machine board

Resources/Locale/en-US/ss14-ru/prototypes/entities/objects/devices/hand_teleporter.ftl

@@ -1,2 +1,5 @@
 ent-HandTeleporter = hand teleporter
     .desc = A Nanotrasen signature item--only the finest bluespace tech. Instructions: Use once to create a portal which teleports at random. Use again to link it to a portal at your current location. Use again to clear all portals.
+ent-HandTeleporterAdmeme = interdimensional teleporter
+    .desc = allows you to open stable portal gates that are not limited by distance
+    .suffix = Admeme

Resources/Locale/en-US/ss14-ru/prototypes/entities/objects/devices/station_beacon.ftl

@@ -126,6 +126,9 @@ ent-DefaultStationBeaconSolars = { ent-DefaultStationBeaconEngineering }
 ent-DefaultStationBeaconGravGen = { ent-DefaultStationBeaconEngineering }
     .suffix = Grav Gen
     .desc = { ent-DefaultStationBeaconEngineering.desc }
+ent-DefaultStationBeaconAnchor = { ent-DefaultStationBeaconEngineering }
+    .suffix = Anchor
+    .desc = { ent-DefaultStationBeaconEngineering.desc }
 ent-DefaultStationBeaconSingularity = { ent-DefaultStationBeaconEngineering }
     .suffix = PA Control
     .desc = { ent-DefaultStationBeaconEngineering.desc }

Resources/Locale/en-US/ss14-ru/prototypes/entities/objects/fun/toys.ftl

@@ -29,6 +29,8 @@ ent-PlushieLizardMirrored = { ent-PlushieLizard }
     .desc = { ent-PlushieLizard.desc }
 ent-PlushieSpaceLizard = space lizard plushie
     .desc = An adorable stuffed toy that resembles a lizardperson in an EVA suit. Made by CentComm as a token initiative to combat speciesism in space environments. "Welcome your new colleges as you do this plush, with open arms!"
+ent-PlushieLizardInversed = drazil plushie
+    .desc = An adorable stuffed toy that resembles a lizardperson from an inversed dimension. Hew!
 ent-PlushieDiona = diona plushie
     .desc = An adorable stuffed toy that resembles a diona. Love water and cuddles. Do not wet!
 ent-PlushieSharkBlue = blue shark soft toy

Resources/Locale/en-US/ss14-ru/prototypes/entities/objects/materials/scrap.ftl

@@ -1,6 +1,9 @@
 ent-BaseScrap = scrap
     .desc = Worthless junk. You could probably get some materials out of it though.
     .suffix = Scrap
+ent-BaseScrapLarge = scrap
+    .desc = Worthless junk. You could probably get some materials out of it though.
+    .suffix = Scrap
 ent-ScrapSteel = blasted steel pile
     .desc = An pile of steel welded together in extreme heat. It's of a decent size overall; you could probably get a fair amount of sheets out of it.
 ent-ScrapGlass = scrap circuitry
@@ -43,3 +46,15 @@ ent-ScrapPAIGold = gilded personal ai device
     .desc = Wow! What a one-in-a-million find! This would be worth a fortune... if it was in good condition.
 ent-ScrapTube = shattered sample tube
     .desc = A glass tube containing some kind of rare sample. Or at least, it used to contain it. Not much left in there now.
+ent-ScrapGeneratorPlasmaLeaking = leaking P.A.C.M.A.N. generator
+    .desc = An old looking P.A.C.M.A.N. generator whos plasma tanks started leaking.
+ent-ScrapGeneratorPlasma = old P.A.C.M.A.N. generator
+    .desc = An old looking P.A.C.M.A.N. generator. It's in very poor condition and non functional.
+ent-ScrapGeneratorUraniumLeaking = leaking S.U.P.E.R.P.A.C.M.A.N. generator
+    .desc = A S.U.P.E.R.P.A.C.M.A.N. generator that appears to have had some kind of catastrophic failure. Its leaking uranium.
+ent-ScrapGeneratorUranium = destroyed S.U.P.E.R.P.A.C.M.A.N. generator
+    .desc = A S.U.P.E.R.P.A.C.M.A.N. generator that appears to have had some kind of catastrophic failure.
+ent-ScrapGeneratorFrame = generator frame
+    .desc = A frame of a P.A.C.M.A.N. or S.U.P.E.R.P.A.C.M.A.N. type generator. Where is the rest of it?
+ent-ScrapGeneratorFuelTank = fuel tank
+    .desc = A fuel tank from a S.U.P.E.R.P.A.C.M.A.N. type generator. The gauge indicates its got a little fuel left.

Resources/Locale/en-US/ss14-ru/prototypes/entities/objects/weapons/guns/turrets.ftl

@@ -14,6 +14,9 @@ ent-WeaponTurretNanoTrasen = { ent-BaseWeaponTurret }
 ent-WeaponTurretHostile = { ent-BaseWeaponTurret }
     .suffix = Hostile
     .desc = { ent-BaseWeaponTurret.desc }
+ent-WeaponTurretAllHostile = { ent-BaseWeaponTurret }
+    .suffix = All hostile
+    .desc = { ent-BaseWeaponTurret.desc }
 ent-WeaponTurretXeno = xeno turret
     .desc = Shoots 9mm acid projectiles.
     .suffix = Xeno

Resources/Locale/en-US/ss14-ru/prototypes/entities/objects/weapons/throwable/projectile_grenades.ftl

@@ -0,0 +1,8 @@
+ent-ProjectileGrenadeBase = { ent-BaseItem }
+    .desc = { ent-BaseItem.desc }
+ent-GrenadeStinger = stinger grenade
+    .desc = Nothing to see here, please disperse.
+ent-GrenadeIncendiary = incendiary grenade
+    .desc = Guaranteed to light up the mood.
+ent-GrenadeShrapnel = shrapnel grenade
+    .desc = Releases a deadly spray of shrapnel that causes severe bleeding.

Resources/Locale/en-US/ss14-ru/prototypes/entities/objects/weapons/throwable/scattering_grenades.ftl

@@ -0,0 +1,15 @@
+ent-ScatteringGrenadeBase = { ent-BaseItem }
+    .desc = { ent-BaseItem.desc }
+ent-ClusterBang = clusterbang
+    .desc = Can be used only with flashbangs. Explodes several times.
+ent-ClusterBangFull = ClusterBang
+    .desc = Launches three flashbangs after the timer runs out.
+    .suffix = Full
+ent-ClusterGrenade = clustergrenade
+    .desc = Why use one grenade when you can use three at once!
+ent-ClusterBananaPeel = cluster banana peel
+    .desc = Splits into 6 explosive banana peels after throwing, guaranteed fun!
+ent-SlipocalypseClusterSoap = slipocalypse clustersoap
+    .desc = Spreads small pieces of syndicate soap over an area upon landing on the floor.
+ent-GrenadeFoamDart = foam dart grenade
+    .desc = Releases a bothersome spray of foam darts that cause severe welching.

Resources/Locale/en-US/ss14-ru/prototypes/entities/structures/machines/computers/computers.ftl

@@ -1,5 +1,7 @@
 ent-ComputerAlert = atmospheric alerts computer
     .desc = Used to access the station's atmospheric automated alert system.
+ent-ComputerAtmosMonitoring = atmospheric network monitor
+    .desc = Used to monitor the station's atmospheric networks.
 ent-ComputerEmergencyShuttle = emergency shuttle console
     .desc = Handles authorization to early launch the shuttle.
 ent-BaseComputerShuttle = shuttle console