Merge pull request #463 from Rxup/upstream-sync

Upstream sync

Resources/Changelog/Changelog.yml

@@ -1,11 +1,4 @@
 Entries:
-- author: EmoGarbage404
-  changes:
-  - message: Added the RCD and RCD ammo crates to cargo.
-    type: Add
-  id: 5418
-  time: '2023-12-19T02:40:55.0000000+00:00'
-  url: null
 - author: ElectroJr
   changes:
   - message: The fireaxe can now fight fires (melee hits reduce fire stacks).
@@ -3874,3 +3867,10 @@
   id: 5917
   time: '2024-02-11T06:38:55.0000000+00:00'
   url: https://github.com/space-wizards/space-station-14/pull/24625
+- author: Emisse
+  changes:
+  - message: Ambuzol now requires zombie blood
+    type: Tweak
+  id: 5918
+  time: '2024-02-11T20:47:58.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/25119

Resources/Credits/GitHub.txt

@@ -1 +1 @@
-08A, 0x6273, 2013HORSEMEATSCANDAL, 20kdc, 21Melkuu, 4dplanner, 612git, 778b, Ablankmann, Acruid, actioninja, adamsong, Admiral-Obvious-001, Adrian16199, Aerocrux, Aexxie, africalimedrop, Agoichi, Ahion, AJCM-git, AjexRose, Alekshhh, AlexMorgan3817, AlmondFlour, AlphaQwerty, Altoids1, amylizzle, ancientpower, areitpog, Arendian, arimah, artak10t, Arteben, AruMoon, as334, AsikKEsel, asperger-sind, astriloqua, avghdev, AzzyIsNotHere, BananaFlambe, BasedUser, BGare, bhespiritu, BingoJohnson-zz, BismarckShuffle, Bixkitts, Blackern5000, Blazeror, Boaz1111, BobdaBiscuit, brainfood1183, Brandon-Huu, Bright0, brndd, BubblegumBlue, BYONDFuckery, c0rigin, c4llv07e, CakeQ, CaptainSqrBeard, Carbonhell, casperr04, CatTheSystem, Centronias, chairbender, Charlese2, Cheackraze, cheesePizza2, Chief-Engineer, chromiumboy, Chronophylos, civilCornball, clement-or, Clyybber, ColdAutumnRain, collinlunn, ComicIronic, coolmankid12345, corentt, crazybrain23, creadth, CrigCrag, Crotalus, CrudeWax, CrzyPotato, Cyberboss, d34d10cc, Daemon, daerSeebaer, dahnte, dakamakat, DamianX, DangerRevolution, daniel-cr, Darkenson, DawBla, dch-GH, Deahaka, DEATHB4DEFEAT, DeathCamel58, deathride58, DebugOk, Decappi, degradka, Delete69, deltanedas, DerbyX, DmitriyMX, DoctorBeard, DogZeroX, dontbetank, Doru991, DoubleRiceEddiedd, DrMelon, drongood12, DrSmugleaf, drteaspoon420, DTanxxx, DubiousDoggo, Duddino, Dutch-VanDerLinde, Easypoller, eclips_e, EEASAS, Efruit, efzapa, ElectroSR, elthundercloud, Emisse, emmafornash, EmoGarbage404, Endecc, enumerate0, eoineoineoin, ERORR404V1, Errant-4, estacaoespacialpirata, exp111, Fahasor, FairlySadPanda, ficcialfaint, FillerVK, Fishfish458, Flareguy, FluffiestFloof, FluidRock, FoLoKe, fooberticus, forthbridge, Fortune117, freeman2651, Fromoriss, FungiFellow, GalacticChimp, gbasood, Geekyhobo, Genkail, Git-Nivrak, github-actions[bot], gituhabu, GNF54, GoodWheatley, Gotimanga, graevy, GreyMario, gusxyz, h3half, Hanzdegloker, Hardly3D, harikattar, Hebiman, Henry12116, HerCoyote23, Hmeister-real, HoofedEar, hord-brayden, hubismal, Hugal31, Hyenh, iacore, IamVelcroboy, icekot8, iczero, igorsaux, ike709, illersaver, Illiux, Ilya246, IlyaElDunaev, Injazz, Insineer, IntegerTempest, Interrobang01, IProduceWidgets, ItsMeThom, j-giebel, Jackal298, Jackrost, jamessimo, janekvap, JerryImMouse, Jessetriesagain, jessicamaybe, Jezithyr, jicksaw, JiimBob, JoeHammad1844, joelhed, JohnGinnane, johnku1, joshepvodka, jproads, Jrpl, juliangiebel, JustCone14, JustinTether, JustinTrotter, Kadeo64, KaiShibaa, kalane15, kalanosh, KEEYNy, Keikiru, Kelrak, kerisargit, keronshb, KIBORG04, KingFroozy, kira-er, Kit0vras, KittenColony, Kmc2000, komunre, koteq, Krunklehorn, kxvvv, Lamrr, LankLTE, laok233, lapatison, Leander-0, LetterN, Level10Cybermancer, lever1209, LightVillet, liltenhead, LittleBuilderJane, Lomcastar, LordCarve, LordEclipse, luckyshotpictures, LudwigVonChesterfield, Lukasz825700516, lunarcomets, luringens, lvvova1, lzimann, lzk228, M3739, MACMAN2003, Macoron, MagnusCrowe, ManelNavola, matthst, Matz05, MehimoNemo, MeltedPixel, MemeProof, Menshin, Mervill, metalgearsloth, mhamsterr, MilenVolf, Minty642, Mirino97, mirrorcult, MishaUnity, MisterMecky, Mith-randalf, ModeratelyAware, Moneyl, Moomoobeef, moony, Morb0, Mr0maks, Myakot, Myctai, N3X15, Nails-n-Tape, Nairodian, Naive817, namespace-Memory, NickPowers43, nikthechampiongr, Nimfar11, Nirnael, nmajask, nok-ko, Nopey, notafet, notquitehadouken, noudoit, noverd, nuke-haus, NULL882, Nylux, OctoRocket, OldDanceJacket, OliverOtter, onoira, Owai-Seek, pali6, Pangogie, patrikturi, PaulRitter, Peptide90, peptron1, Phantom-Lily, Phill101, PixelTheKermit, PJB3005, pofitlo, pointer-to-null, PoorMansDreams, potato1234x, ProfanedBane, ProPandaBear, PrPleGoo, Psychpsyo, psykzz, PuroSlavKing, PursuitInAshes, Putnam3145, quatre, QuietlyWhisper, qwerltaz, Radosvik, Radrark, Rainbeon, Rainfey, Rane, Ranger6012, ravage123321, rbertoche, Redict, RedlineTriad, RednoWCirabrab, RemberBM, RemieRichards, RemTim, rene-descartes2021, renodubois, RiceMar1244, RieBi, RIKELOLDABOSS, Rinkashikachi, Rockdtben, rolfero, Saakra, SadAways, Samsterious, SamV522, SaphireLattice, ScalyChimp, scrato, Scribbles0, ScumbagDog, Serkket, SethLafuente, ShadowCommander, Shadowtheprotogen546, SignalWalker, Simyon264, SirDragooon, Sirionaut, siyengar04, Skarletto, Skrauz, Skyedra, SlamBamActionman, Slava0135, Snowni, snowsignal, SonicHDC, SoulSloth, SpaceManiac, SpeltIncorrectyl, spoogemonster, ssdaniel24, Stanislav4ix, Stealthbomber16, StrawberryMoses, Subversionary, SweptWasTaken, Szunti, TaralGit, Tayrtahn, tday93, TekuNut, TemporalOroboros, tentekal, tgrkzus, thatrandomcanadianguy, TheArturZh, theashtronaut, thedraccx, themias, Theomund, theOperand, TheShuEd, ThunderBear2006, timothyteakettle, TimrodDX, Titian3, TK-A369, tkdrg, tmtmtl30, tom-leys, tomasalves8, Tomeno, tosatur, Tryded, TsjipTsjip, Tunguso4ka, TurboTrackerss14, Tyler-IN, Tyzemol, UbaserB, UKNOWH, Uriende, UristMcDorf, Vaaankas, Varen, VasilisThePikachu, veliebm, Veritius, Verslebas, VigersRay, Visne, Volotomite, volundr-, Vordenburg, vulppine, Warentan, waylon531, weaversam8, Willhelm53, wixoaGit, WlarusFromDaSpace, wrexbe, WTCWR68, xRiriq, yathxyz, Ygg01, YotaXP, youarereadingthis, YuriyKiss, zach-hill, Zandario, Zap527, ZelteHonor, zerorulez, ZeWaka, zionnBE, zlodo, ZNixian, ZoldorfTheWizard, Zth--, Zumorica, Zymem
+08A, 0x6273, 2013HORSEMEATSCANDAL, 20kdc, 21Melkuu, 4dplanner, 612git, 778b, Ablankmann, Acruid, actioninja, ada-please, adamsong, Admiral-Obvious-001, Adrian16199, Aerocrux, Aexxie, africalimedrop, Agoichi, Ahion, AJCM-git, AjexRose, Alekshhh, AlexMorgan3817, AlmondFlour, AlphaQwerty, Altoids1, amylizzle, ancientpower, areitpog, Arendian, arimah, artak10t, Arteben, AruMoon, as334, AsikKEsel, asperger-sind, astriloqua, avghdev, AzzyIsNotHere, BananaFlambe, BasedUser, BGare, bhespiritu, BingoJohnson-zz, BismarckShuffle, Bixkitts, Blackern5000, Blazeror, Boaz1111, BobdaBiscuit, brainfood1183, Brandon-Huu, Bright0, brndd, BubblegumBlue, BYONDFuckery, c0rigin, c4llv07e, CakeQ, CaptainSqrBeard, Carbonhell, casperr04, CatTheSystem, Centronias, chairbender, Charlese2, Cheackraze, cheesePizza2, Chief-Engineer, chromiumboy, Chronophylos, civilCornball, clement-or, Clyybber, ColdAutumnRain, collinlunn, ComicIronic, coolmankid12345, corentt, crazybrain23, creadth, CrigCrag, Crotalus, CrudeWax, CrzyPotato, Cyberboss, d34d10cc, Daemon, daerSeebaer, dahnte, dakamakat, DamianX, DangerRevolution, daniel-cr, Darkenson, DawBla, dch-GH, Deahaka, DEATHB4DEFEAT, DeathCamel58, deathride58, DebugOk, Decappi, degradka, Delete69, deltanedas, DerbyX, DmitriyMX, DoctorBeard, DogZeroX, dontbetank, Doru991, DoubleRiceEddiedd, DrMelon, drongood12, DrSmugleaf, drteaspoon420, DTanxxx, DubiousDoggo, Duddino, Dutch-VanDerLinde, Easypoller, eclips_e, EdenTheLiznerd, EEASAS, Efruit, efzapa, ElectroSR, elthundercloud, Emisse, emmafornash, EmoGarbage404, Endecc, enumerate0, eoineoineoin, ERORR404V1, Errant-4, estacaoespacialpirata, exp111, Fahasor, FairlySadPanda, ficcialfaint, FillerVK, Fishfish458, Flareguy, FluffiestFloof, FluidRock, FoLoKe, fooberticus, forthbridge, Fortune117, freeman2651, Fromoriss, FungiFellow, GalacticChimp, gbasood, Geekyhobo, Genkail, Git-Nivrak, github-actions[bot], gituhabu, GNF54, GoodWheatley, Gotimanga, graevy, GreyMario, gusxyz, h3half, Hanzdegloker, Hardly3D, harikattar, Hebiman, Henry12116, HerCoyote23, Hmeister-real, HoofedEar, hord-brayden, hubismal, Hugal31, Hyenh, iacore, IamVelcroboy, icekot8, igorsaux, ike709, Illiux, Ilya246, IlyaElDunaev, Injazz, Insineer, IntegerTempest, Interrobang01, IProduceWidgets, ItsMeThom, j-giebel, Jackal298, Jackrost, jamessimo, janekvap, JerryImMouse, Jessetriesagain, jessicamaybe, Jezithyr, jicksaw, JiimBob, JoeHammad1844, joelhed, JohnGinnane, johnku1, joshepvodka, jproads, Jrpl, juliangiebel, JustCone14, JustinTether, JustinTrotter, Kadeo64, KaiShibaa, kalane15, kalanosh, KEEYNy, Keikiru, Kelrak, kerisargit, keronshb, KIBORG04, KingFroozy, kira-er, Kit0vras, KittenColony, Kmc2000, komunre, koteq, Krunklehorn, kxvvv, Lamrr, LankLTE, laok233, lapatison, Leander-0, LetterN, Level10Cybermancer, lever1209, LightVillet, liltenhead, LittleBuilderJane, Lomcastar, LordCarve, LordEclipse, luckyshotpictures, LudwigVonChesterfield, Lukasz825700516, lunarcomets, luringens, lvvova1, lzimann, lzk228, M3739, MACMAN2003, Macoron, MagnusCrowe, ManelNavola, Mangohydra, matthst, Matz05, MehimoNemo, MeltedPixel, MemeProof, Menshin, Mervill, metalgearsloth, mhamsterr, MilenVolf, Minty642, Mirino97, mirrorcult, MishaUnity, MisterMecky, Mith-randalf, ModeratelyAware, Moneyl, Moomoobeef, moony, Morb0, Mr0maks, Myakot, Myctai, N3X15, Nails-n-Tape, Nairodian, Naive817, namespace-Memory, NickPowers43, nikthechampiongr, Nimfar11, Nirnael, nmajask, nok-ko, Nopey, notafet, notquitehadouken, noudoit, noverd, nuke-haus, NULL882, Nylux, OctoRocket, OldDanceJacket, OliverOtter, onoira, Owai-Seek, pali6, Pangogie, patrikturi, PaulRitter, Peptide90, peptron1, Phantom-Lily, Phill101, PixelTheKermit, PJB3005, pofitlo, pointer-to-null, PoorMansDreams, potato1234x, ProfanedBane, ProPandaBear, PrPleGoo, Psychpsyo, psykzz, PuroSlavKing, PursuitInAshes, Putnam3145, quatre, QuietlyWhisper, qwerltaz, Radosvik, Radrark, Rainbeon, Rainfey, Rane, Ranger6012, ravage123321, rbertoche, Redict, RedlineTriad, RednoWCirabrab, RemberBM, RemieRichards, RemTim, rene-descartes2021, renodubois, RiceMar1244, RieBi, RIKELOLDABOSS, Rinkashikachi, Rockdtben, rolfero, Saakra, SadAways, Samsterious, SamV522, SaphireLattice, ScalyChimp, scrato, Scribbles0, ScumbagDog, Serkket, SethLafuente, ShadowCommander, Shadowtheprotogen546, SignalWalker, Simyon264, SirDragooon, Sirionaut, siyengar04, Skarletto, Skrauz, Skyedra, SlamBamActionman, Slava0135, snebl, Snowni, snowsignal, SonicHDC, SoulSloth, SpaceManiac, SpeltIncorrectyl, spoogemonster, ssdaniel24, Stanislav4ix, Stealthbomber16, StrawberryMoses, Subversionary, SweptWasTaken, Szunti, TaralGit, Tayrtahn, tday93, TekuNut, TemporalOroboros, tentekal, tgrkzus, thatrandomcanadianguy, TheArturZh, theashtronaut, thedraccx, themias, Theomund, theOperand, TheShuEd, ThunderBear2006, timothyteakettle, TimrodDX, Titian3, TK-A369, tkdrg, tmtmtl30, tom-leys, tomasalves8, Tomeno, tosatur, Tryded, TsjipTsjip, Tunguso4ka, TurboTrackerss14, Tyler-IN, Tyzemol, UbaserB, UKNOWH, Uriende, UristMcDorf, Vaaankas, Varen, VasilisThePikachu, veliebm, Veritius, Verslebas, VigersRay, Visne, Volotomite, volundr-, Vordenburg, vulppine, Warentan, waylon531, weaversam8, Willhelm53, wixoaGit, WlarusFromDaSpace, wrexbe, WTCWR68, xRiriq, yathxyz, Ygg01, YotaXP, youarereadingthis, YuriyKiss, zach-hill, Zandario, Zap527, ZelteHonor, zerorulez, ZeWaka, zionnBE, zlodo, ZNixian, ZoldorfTheWizard, Zth--, Zumorica, Zymem

Resources/Locale/en-US/ss14-ru/prototypes/body/organs/animal/animal.ftl

@@ -1,5 +1,7 @@
-ent-BaseAnimalOrgan = { ent-BaseItem }
+ent-BaseAnimalOrganUnGibbable = { ent-BaseItem }
     .desc = { ent-BaseItem.desc }
+ent-BaseAnimalOrgan = { ent-BaseAnimalOrganUnGibbable }
+    .desc = { ent-BaseAnimalOrganUnGibbable.desc }
 ent-OrganAnimalLungs = lungs
     .desc = { ent-BaseAnimalOrgan.desc }
 ent-OrganAnimalStomach = stomach

Resources/Locale/en-US/ss14-ru/prototypes/body/organs/human.ftl

@@ -1,5 +1,7 @@
-ent-BaseHumanOrgan = { ent-BaseItem }
+ent-BaseHumanOrganUnGibbable = { ent-BaseItem }
     .desc = { ent-BaseItem.desc }
+ent-BaseHumanOrgan = { ent-BaseHumanOrganUnGibbable }
+    .desc = { ent-BaseHumanOrganUnGibbable.desc }
 ent-OrganHumanBrain = brain
     .desc = The source of incredible, unending intelligence. Honk.
 ent-OrganHumanEyes = eyes

Resources/Locale/en-US/ss14-ru/prototypes/catalog/fills/items/belt.ftl

@@ -16,9 +16,9 @@ ent-ClothingBeltJanitorFilled = { ent-ClothingBeltJanitor }
 ent-ClothingBeltMedicalFilled = { ent-ClothingBeltMedical }
     .suffix = Filled
     .desc = { ent-ClothingBeltMedical.desc }
-ent-ClothingBeltParamedicFilled = EMT belt
+ent-ClothingBeltMedicalEMTFilled = { ent-ClothingBeltMedicalEMT }
     .suffix = Paramedic,Filled
-    .desc = { ent-ClothingBeltMedical.desc }
+    .desc = { ent-ClothingBeltMedicalEMT.desc }
 ent-ClothingBeltPlantFilled = { ent-ClothingBeltPlant }
     .suffix = Filled
     .desc = { ent-ClothingBeltPlant.desc }

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

@@ -5,6 +5,9 @@ ent-LockerCaptainFilledHardsuit = { ent-LockerCaptain }
     .suffix = Filled, Hardsuit
     .desc = { ent-LockerCaptain.desc }
 ent-LockerCaptainFilled = { ent-LockerCaptain }
+    .suffix = Filled, AntiqueLaser
+    .desc = { ent-LockerCaptain.desc }
+ent-LockerCaptainFilledNoLaser = { ent-LockerCaptain }
     .suffix = Filled
     .desc = { ent-LockerCaptain.desc }
 ent-LockerHeadOfPersonnelFilled = { ent-LockerHeadOfPersonnel }

Resources/Locale/en-US/ss14-ru/prototypes/corvax/catalog/fills/paper/document.ftl

@@ -57,8 +57,7 @@ ent-PrintedDocumentRequestModernization = Request for modernization
 ent-PrintedDocumentComplaintViolationLaborRules = Complaint for violation of labor order
     .desc = { ent-PrintedDocument.desc }
 ent-PrintedDocumentComplaintOffense = Complaint about an offense
-
-  .desc = { ent-PrintedDocument.desc }
+    .desc = { ent-PrintedDocument.desc }
 ent-PrintedDocumentPermissionEquipment = Authorization to use equipment
     .desc = { ent-PrintedDocument.desc }
 ent-PrintedDocumentPermissionToTravelInCaseOfThreat = Permission to travel in case of threat

Resources/Locale/en-US/ss14-ru/prototypes/entities/clothing/belt/belts.ftl

@@ -8,6 +8,8 @@ ent-ClothingBeltJanitor = janibelt
     .desc = A belt used to hold most janitorial supplies.
 ent-ClothingBeltMedical = medical belt
     .desc = Can hold various medical equipment.
+ent-ClothingBeltMedicalEMT = EMT belt
+    .desc = Perfect for holding various equipment for medical emergencies.
 ent-ClothingBeltPlant = botanical belt
     .desc = A belt used to hold most hydroponics supplies. Suprisingly, not green.
 ent-ClothingBeltChef = chef belt

Resources/Locale/en-US/ss14-ru/prototypes/entities/clothing/head/bandanas.ftl

@@ -1,3 +1,5 @@
+ent-ClothingHeadBandBase = { ent-ClothingHeadBaseButcherable }
+  .desc = { ent-ClothingHeadBaseButcherable.desc }
 ent-ClothingHeadBandBlack = black bandana
     .desc = A black bandana to make you look cool.
 ent-ClothingHeadBandBlue = blue bandana

Resources/Locale/en-US/ss14-ru/prototypes/entities/clothing/head/hats.ftl

@@ -10,6 +10,8 @@ ent-ClothingHeadHatBeretRND = scientific beret
     .desc = A beret for real scientists.
 ent-ClothingHeadHatBeretEngineering = engineering beret
     .desc = A beret with the engineering insignia emblazoned on it. For engineers that are more inclined towards style than safety.
+ent-ClothingHeadHatBeretQM = quartermaster's beret
+    .desc = A beret with the cargo's insignia emblazoned on it. For quartermasters that are more inclined towards style.
 ent-ClothingHeadHatBeretHoS = head of security's beret
     .desc = A black beret with a commander's rank emblem. For officers that are more inclined towards style than safety.
 ent-ClothingHeadHatBeretWarden = warden's beret
@@ -150,3 +152,5 @@ ent-ClothingHeadHatCowboyWhite = white cowboy hat
     .desc = { ent-ClothingHeadHatCowboyBrown.desc }
 ent-ClothingHeadHatCowboyBountyHunter = bounty hunter cowboy hat
     .desc = { ent-ClothingHeadHatCowboyBrown.desc }
+ent-ClothingHeadHatStrawHat = straw hat
+    .desc = A fancy hat for hot days! Not recommended to wear near fires.