diff --git a/Content.Server/Chat/Managers/ChatManager.RateLimit.cs b/Content.Server/Chat/Managers/ChatManager.RateLimit.cs index ccb38166a6d..86bd3619e5e 100644 --- a/Content.Server/Chat/Managers/ChatManager.RateLimit.cs +++ b/Content.Server/Chat/Managers/ChatManager.RateLimit.cs @@ -28,7 +28,7 @@ private void RateLimitPlayerLimited(ICommonSession player) private void RateLimitAlertAdmins(ICommonSession player) { - SendAdminAlert(Loc.GetString("chat-manager-rate-limit-admin-announcement", ("player", player.Name))); + // SendAdminAlert(Loc.GetString("chat-manager-rate-limit-admin-announcement", ("player", player.Name))); // DeltaV - I DON'T CARE } public RateLimitStatus HandleRateLimit(ICommonSession player) diff --git a/Content.Shared/CCVar/CCVars.cs b/Content.Shared/CCVar/CCVars.cs index 9b8cd896813..66c3bc6cd0e 100644 --- a/Content.Shared/CCVar/CCVars.cs +++ b/Content.Shared/CCVar/CCVars.cs @@ -2120,7 +2120,7 @@ public static readonly CVarDef /// The time you must spend reading the rules, before the "Request" button is enabled /// public static readonly CVarDef GhostRoleTime = - CVarDef.Create("ghost.role_time", 8f, CVar.REPLICATED | CVar.SERVER); + CVarDef.Create("ghost.role_time", 3f, CVar.REPLICATED | CVar.SERVER); /// /// If ghost role lotteries should be made near-instanteous. diff --git a/Resources/Audio/_RMC14/Voice/Xeno/alien_talk1.ogg b/Resources/Audio/_RMC14/Voice/Xeno/alien_talk1.ogg new file mode 100644 index 00000000000..a6cd1d901b6 Binary files /dev/null and b/Resources/Audio/_RMC14/Voice/Xeno/alien_talk1.ogg differ diff --git a/Resources/Audio/_RMC14/Voice/Xeno/alien_talk2.ogg b/Resources/Audio/_RMC14/Voice/Xeno/alien_talk2.ogg new file mode 100644 index 00000000000..8766ef4c887 Binary files /dev/null and b/Resources/Audio/_RMC14/Voice/Xeno/alien_talk2.ogg differ diff --git a/Resources/Audio/_RMC14/Voice/Xeno/alien_talk3.ogg b/Resources/Audio/_RMC14/Voice/Xeno/alien_talk3.ogg new file mode 100644 index 00000000000..d2b4a14ce7d Binary files /dev/null and b/Resources/Audio/_RMC14/Voice/Xeno/alien_talk3.ogg differ diff --git a/Resources/Audio/_RMC14/Voice/Xeno/attributions.yml b/Resources/Audio/_RMC14/Voice/Xeno/attributions.yml new file mode 100644 index 00000000000..b98d9d09eb5 --- /dev/null +++ b/Resources/Audio/_RMC14/Voice/Xeno/attributions.yml @@ -0,0 +1,14 @@ +- files: ["alien_talk1.ogg"] + license: "CC-BY-SA-3.0" + copyright: "Taken from cmss13" + source: "https://github.com/cmss13-devs/cmss13/blob/master/sound/voice/alien_talk.ogg" + +- files: ["alien_talk2.ogg"] + license: "CC-BY-SA-3.0" + copyright: "Taken from cmss13" + source: "https://github.com/cmss13-devs/cmss13/blob/master/sound/voice/alien_talk2.ogg" + +- files: ["alien_talk3.ogg"] + license: "CC-BY-SA-3.0" + copyright: "Taken from cmss13" + source: "https://github.com/cmss13-devs/cmss13/blob/master/sound/voice/alien_talk3.ogg" diff --git a/Resources/Changelog/DeltaVChangelog.yml b/Resources/Changelog/DeltaVChangelog.yml index 474cc6567cf..da51e7964ed 100644 --- a/Resources/Changelog/DeltaVChangelog.yml +++ b/Resources/Changelog/DeltaVChangelog.yml @@ -1,41 +1,4 @@ Entries: -- author: DebugOk - changes: - - message: The 10 reserved whitelist slots have been removed until further notice. - type: Tweak - id: 111 - time: '2023-10-29T03:10:27.0000000+00:00' -- author: Colin-Tel - changes: - - message: Altered the rules. Read the latest changes to them at the top of the - rules list! - type: Tweak - id: 112 - time: '2023-10-29T17:36:46.0000000+00:00' -- author: VMSolidus - changes: - - message: Cargo can now order medical scrub crates - type: Add - id: 113 - time: '2023-10-29T17:38:19.0000000+00:00' -- author: FluffiestFloof - changes: - - message: Removed the clown hardsuit from being craftable. - type: Remove - id: 114 - time: '2023-10-30T13:17:07.0000000+00:00' -- author: Colin-Tel - changes: - - message: Asterisk station has been added to the game. - type: Add - id: 115 - time: '2023-11-01T16:32:48.0000000+00:00' -- author: leonardo-dabepis - changes: - - message: Switched logos around - type: Tweak - id: 116 - time: '2023-11-01T22:45:55.0000000+00:00' - author: TJohnson changes: - message: Security has received new models of hardsuit! @@ -3675,3 +3638,45 @@ id: 610 time: '2024-10-14T23:43:17.0000000+00:00' url: https://github.com/DeltaV-Station/Delta-v/pull/1980 +- author: Radezolid + changes: + - message: The tracking implants crate is now more expensive. + type: Tweak + id: 611 + time: '2024-10-15T23:01:23.0000000+00:00' + url: https://github.com/DeltaV-Station/Delta-v/pull/2011 +- author: Unkn0wnGh0st333 + changes: + - message: Chemistry and Hydroponics doors have been readded + type: Tweak + id: 612 + time: '2024-10-18T00:31:47.0000000+00:00' + url: https://github.com/DeltaV-Station/Delta-v/pull/1995 +- author: BlitzTheSquishy + changes: + - message: Readded the Sec Sticker! + type: Add + id: 613 + time: '2024-10-20T00:01:18.0000000+00:00' + url: https://github.com/DeltaV-Station/Delta-v/pull/2022 +- author: ThataKat + changes: + - message: Small doses of theobromine no longer cause vomiting in animal species. + type: Tweak + id: 614 + time: '2024-10-20T05:22:44.0000000+00:00' + url: https://github.com/DeltaV-Station/Delta-v/pull/2024 +- author: deltanedas + changes: + - message: Ghost role waiting time is down to 3 seconds, from 8. + type: Tweak + id: 615 + time: '2024-10-20T16:02:51.0000000+00:00' + url: https://github.com/DeltaV-Station/Delta-v/pull/2026 +- author: deltanedas + changes: + - message: Removed salt ore in favour of coal. Give the chemists carbon! + type: Remove + id: 616 + time: '2024-10-20T17:30:04.0000000+00:00' + url: https://github.com/DeltaV-Station/Delta-v/pull/2027 diff --git a/Resources/Credits/GitHub.txt b/Resources/Credits/GitHub.txt index 5f330e6bc38..165c4e3c26b 100644 --- a/Resources/Credits/GitHub.txt +++ b/Resources/Credits/GitHub.txt @@ -1 +1 @@ -0x6273, 12rabbits, 13spacemen, 2013HORSEMEATSCANDAL, 20kdc, 21Melkuu, 2digitman, 3nderall, 4310v343k, 4dplanner, 612git, 778b, Ablankmann, abregado, Absolute-Potato, Acruid, actioninja, actually-reb, ada-please, adamsong, Adeinitas, Admiral-Obvious-001, adrian, Adrian16199, Ady4ik, Aerocrux, Aeshus, Aexolott, Aexxie, africalimedrop, afrokada, Agoichi, Ahion, aiden, Aikakakah, aitorlogedo, AJCM-git, AjexRose, Alekshhh, alexkar598, AlexMorgan3817, alexumandxgabriel08x, Alithsko, ALMv1, Alpha-Two, AlphaQwerty, Altoids1, amylizzle, ancientpower, Andre19926, AndrewEyeke, AndreyCamper, angelofallars, Anzarot121, Appiah, ar4ill, ArchPigeon, ArchRBX, areitpog, Arendian, arimah, Arkanic, ArkiveDev, armoks, Arteben, ArthurMousatov, ArtisticRoomba, artur, AruMoon, ArZarLordOfMango, as334, AsikKEsel, AsnDen, asperger-sind, aspiringLich, astriloqua, august-sun, AutoOtter, Avalon-Proto, avghdev, Awlod, azzy, AzzyIsNotHere, BackeTako, BananaFlambe, Baptr0b0t, BasedPugilist, BasedUser, Batuh1n, beck-thompson, BellwetherLogic, benev0, benjamin-burges, BGare, bhespiritu, BIGZi0348, bingojohnson, BismarckShuffle, Bixkitts, Blackern5000, Blazeror, blitzthesquishy, bloodrizer, Bloody2372, blueDev2, Boaz1111, BobdaBiscuit, BobTheSleder, boiled-water-tsar, BombasterDS, botanySupremist, brainfood1183, BramvanZijp, Brandon-Huu, Bribrooo, Bright0, brndd, bryce0110, BubblegumBlue, buletsponge, buntobaggins, bvelliquette, byondfuckery, c0rigin, c4llv07e, CaasGit, Caconym27, Calecute, Callmore, capnsockless, CaptainSqrBeard, Carbonhell, Carolyn3114, Carou02, carteblanche4me, CatTheSystem, Centronias, chairbender, Charlese2, charlie, ChaseFlorom, chavonadelal, Cheackraze, cheesePizza2, cheeseplated, Chief-Engineer, chillyconmor, christhirtle, chromiumboy, Chronophylos, Chubbygummibear, Ciac32, civilCornball, Clement-O, clyf, Clyybber, CMDR-Piboy314, CodedCrow, cohanna, Cohnway, Cojoke-dot, ColdAutumnRain, Colin-Tel, collinlunn, ComicIronic, CookieMasterT, coolboy911, coolmankid12345, Coolsurf6, corentt, CormosLemming, crazybrain23, creadth, CrigCrag, croilbird, Crotalus, CrudeWax, CrzyPotato, cutemoongod, Cyberboss, d34d10cc, dabigoose, DadeKuma, Daemon, daerSeebaer, dahnte, dakamakat, dakimasu, DamianX, DangerRevolution, daniel-cr, DanSAussieITS, Daracke, DarkenedSynergy, Darkenson, DawBla, Daxxi3, dch-GH, de0rix, Deahaka, dean, DEATHB4DEFEAT, DeathCamel58, Deatherd, deathride58, DebugOk, Decappi, Decortex, Deeeeja, deepdarkdepths, DefinitelyNotFurryXD, degradka, Delete69, deltanedas, DeltaV-Bot, DenisShvalov, DerbyX, derek, dersheppard, Deserty0, Detintinto, DevilishMilk, dexlerxd, dffdff2423, dge21, DieselMohawk, digitalic, Dimastra, DinoWattz, DisposableCrewmember42, DjfjdfofdjfjD, doc-michael, docnite, Doctor-Cpu, DoctorBeard, DogZeroX, dolgovmi, dontbetank, Doomsdrayk, dootythefrooty, Dorragon, Doru991, DoubleRiceEddiedd, DoutorWhite, dragonryan06, drakewill-CRL, Drayff, dreamlyjack, DrEnzyme, dribblydrone, DrMelon, drongood12, DrSingh, DrSmugleaf, drteaspoon420, DTanxxx, DubiousDoggo, Duddino, dukevanity, duskyjay, Dutch-VanDerLinde, dvir001, Dynexust, Easypoller, eclips_e, eden077, EEASAS, Efruit, efzapa, ElectroSR, elsie, elthundercloud, Elysium206, Emisse, emmafornash, EmoGarbage404, Endecc, eoineoineoin, eris, erohrs2, ERORR404V1, Errant-4, esguard, estacaoespacialpirata, eugene, exincore, exp111, f0x-n3rd, FacePluslll, Fahasor, FairlySadPanda, FATFSAAM2, Feluk6174, ficcialfaint, Fiftyllama, Fildrance, FillerVK, FinnishPaladin, FirinMaLazors, Fishfish458, FL-OZ, Flareguy, flashgnash, FluffiestFloof, FluidRock, flyingkarii, foboscheshir, FoLoKe, fooberticus, ForestNoises, forgotmyotheraccount, forkeyboards, forthbridge, Fortune117, Fouin, foxhorn, freeman2651, freeze2222, Froffy025, Fromoriss, froozigiusz, FrostMando, FryOfDestiny, FungiFellow, FunTust, Futuristic-OK, GalacticChimp, Gaxeer, gbasood, Geekyhobo, genderGeometries, GeneralGaws, Genkail, geraeumig, Ghagliiarghii, Git-Nivrak, githubuser508, gituhabu, GlassEclipse, GNF54, godisdeadLOL, goet, Goldminermac, Golinth, GoodWheatley, Gorox221, graevy, GraniteSidewalk, GreaseMonk, greenrock64, greggthefather, GreyMario, GTRsound, Guess-My-Name, gusxyz, Gyrandola, h3half, Haltell, Hanzdegloker, HappyRoach, Hardly3D, harikattar, he1acdvv, Hebi, Henry, HerCoyote23, hitomishirichan, hiucko, Hmeister-fake, Hmeister-real, hobnob, HoidC, Holinka4ever, holyssss, HoofedEar, Hoolny, hord-brayden, Hreno, htmlsystem, hubismal, Hugal31, Huxellberger, Hyenh, i-justuser-i, iacore, IamVelcroboy, Ian321, icekot8, icesickleone, iczero, iglov, IgorAnt028, igorsaux, ike709, illersaver, Illiux, Ilushkins33, Ilya246, IlyaElDunaev, imrenq, imweax, indeano, Injazz, Insineer, IntegerTempest, Interrobang01, IProduceWidgets, itsmethom, Itzbenz, iztokbajcar, Jackal298, Jackrost, jacksonzck, Jackw2As, jacob, jamessimo, janekvap, Jark255, Jaskanbe, JasperJRoth, jerryimmouse, JerryImMouse, Jessetriesagain, jessicamaybe, Jezithyr, jicksaw, JiimBob, JimGamemaster, jimmy12or, JIPDawg, jjtParadox, jmcb, JoeHammad1844, JohnGinnane, johnku1, Jophire, joshepvodka, jproads, Jrpl, juliangiebel, JustArt1m, JustCone14, justdie12, justin, justintether, JustinTrotter, justtne, K-Dynamic, k3yw, Kadeo64, Kaga-404, KaiShibaa, kalane15, kalanosh, Kanashi-Panda, katzenminer, kbailey-git, Keelin, Keer-Sar, KEEYNy, keikiru, Kelrak, kerisargit, keronshb, KIBORG04, Killerqu00, Kimpes, KingFroozy, kira-er, Kirillcas, Kirus59, Kistras, Kit0vras, KittenColony, klaypexx, Kmc2000, Ko4ergaPunk, kognise, kokoc9n, komunre, KonstantinAngelov, kosticia, koteq, KrasnoshchekovPavel, Krunklehorn, Kupie, Kurzaen, kxvvv, kyupolaris, kzhanik, lajolico, Lamrr, LankLTE, laok233, lapatison, larryrussian, lawdog4817, Lazzi0706, leander-0, leonardo-dabepis, leonsfriedrich, lettern, LetterN, Level10Cybermancer, LEVELcat, lever1209, Lgibb18, lgruthes, LightVillet, liltenhead, LinkUyx, LittleBuilderJane, lizelive, lleftTheDragon, localcc, lokachop, Lomcastar, LordCarve, LordEclipse, lucas, LucasTheDrgn, luckyshotpictures, LudwigVonChesterfield, luizwritescode, Lukasz825700516, luminight, lunarcomets, luringens, lvvova1, Lyndomen, lyroth001, lzimann, lzk228, M3739, mac6na6na, MACMAN2003, Macoron, magicalus, magmodius, MagnusCrowe, malchanceux, MaloTV, ManelNavola, manelnavola, Mangohydra, marboww, Markek1, Matz05, max, MaxNox7, maylokana, MehimoNemo, MeltedPixel, MemeProof, memoblob, MendaxxDev, Menshin, Mephisto72, MerrytheManokit, Mervill, metalgearsloth, MetalSage, MFMessage, mhamsterr, michaelcu, micheel665, MilenVolf, milon, MilonPL, Minty642, Mirino97, mirrorcult, misandrie, MishaUnity, MissKay1994, MisterMecky, Mith-randalf, MjrLandWhale, mkanke-real, MLGTASTICa, mnemotechnician, moderatelyaware, modern-nm, mokiros, Moneyl, Monotheonist, Moomoobeef, moony, Morb0, mr-bo-jangles, Mr0maks, MrFippik, mrrobdemo, MureixloI, musicmanvr, MWKane, Myakot, Myctai, N3X15, nails-n-tape, Nairodian, Naive817, NakataRin, namespace-Memory, Nannek, NazrinNya, neutrino-laser, NickPowers43, nikthechampiongr, Nimfar11, Nirnael, NIXC, NkoKirkto, nmajask, noctyrnal, nok-ko, NonchalantNoob, NoobyLegion, Nopey, not-gavnaed, notafet, notquitehadouken, notsodana, noudoit, noverd, NuclearWinter, nukashimika, nuke-haus, NULL882, nullarmo, NullWanderer, nyeogmi, Nylux, Nyranu, och-och, ocotheomega, OctoRocket, OldDanceJacket, onoira, OnyxTheBrave, OrangeMoronage9622, osjarw, Ostaf, othymer, OttoMaticode, Owai-Seek, packmore, paigemaeforrest, pali6, Pangogie, panzer-iv1, partyaddict, patrikturi, PaulRitter, peccneck, Peptide90, peptron1, PeterFuto, PetMudstone, pewter-wiz, Pgriha, Phantom-Lily, PHCodes, Phill101, phunnyguy, PilgrimViis, Pill-U, Pireax, pissdemon, PixeltheAertistContrib, PixelTheKermit, PJB3005, Plasmaguy, plinyvic, Plykiya, pofitlo, pointer-to-null, pok27, PolterTzi, PoorMansDreams, PopGamer45, portfiend, potato1234x, PotentiallyTom, ProfanedBane, ProPandaBear, PrPleGoo, ps3moira, Pspritechologist, Psychpsyo, psykzz, PuceTint, PuroSlavKing, PursuitInAshes, Putnam3145, quatre, QueerNB, QuietlyWhisper, qwerltaz, Radezolid, RadioMull, Radosvik, Radrark, Rainbeon, Rainfey, Raitononai, Ramlik, randy10122, Rane, Ranger6012, Rapidgame7, ravage123321, rbertoche, Redfire1331, Redict, RedlineTriad, redmushie, RednoWCirabrab, RemberBM, RemieRichards, RemTim, Remuchi, rene-descartes2021, Renlou, retequizzle, RiceMar1244, rich-dunne, RieBi, riggleprime, RIKELOLDABOSS, rinary1, Rinkashikachi, riolume, RobbyTheFish, Rockdtben, Rohesie, rok-povsic, rolfero, RomanNovo, rosieposieeee, Roudenn, router, RumiTiger, S1rFl0, S1ss3l, Saakra, Sadie-silly, saga3152, saintmuntzer, Salex08, sam, samgithubaccount, Samsterious, SaphireLattice, SapphicOverload, sarahon, SaveliyM360, sBasalto, ScalyChimp, ScarKy0, scrato, Scribbles0, scruq445, scuffedjays, ScumbagDog, Segonist, sephtasm, Serkket, sewerpig, sh18rw, ShadeAware, ShadowCommander, Shadowtheprotogen546, shadowwailker, shaeone, shampunj, shariathotpatrol, ShatteredSwords, SignalWalker, siigiil, SimpleStation14, Simyon264, sirdragooon, Sirionaut, Sk1tch, SkaldetSkaeg, Skarletto, Skrauz, Skyedra, SlamBamActionman, slarticodefast, Slava0135, Slyfox333, snebl, sniperchance, Snowni, snowsignal, solaris7518, SonicHDC, SoulFN, SoulSloth, Soundwavesghost, Soydium, SpaceLizardSky, SpaceManiac, SpaceyLady, spartak, SpartanKadence, SpeltIncorrectyl, Spessmann, SphiraI, SplinterGP, spoogemonster, sporekto, Squishy77, SsalamethVersaach, ssdaniel24, stalengd, stanberytrask, Stanislav4ix, StanTheCarpenter, Stealthbomber16, stellar-novas, Stop-Signs, stopbreaking, stopka-html, StrawberryMoses, Stray-Pyramid, strO0pwafel, Strol20, StStevens, Subversionary, sunbear-dev, superjj18, Supernorn, SweptWasTaken, Sybil, SYNCHRONIC, Szunti, TadJohnson00, Tainakov, takemysoult, TaralGit, Taran, taurie, Tayrtahn, tday93, TekuNut, telyonok, TemporalOroboros, tentekal, terezi4real, Terraspark4941, texcruize, TGRCdev, tgrkzus, ThatOneGoblin25, thatrandomcanadianguy, TheArturZh, theashtronaut, thecopbennet, TheCze, TheDarkElites, thedraccx, TheEmber, TheIntoxicatedCat, thekilk, themias, Theomund, TheOneWhoIsManyFrame, theOperand, TherapyGoth, therealDLondon, TheShuEd, thetolbean, thevinter, TheWaffleJesus, Thinbug0, ThunderBear2006, Timemaster99, timothyteakettle, TimrodDX, timurjavid, tin-man-tim, Titian3, tk-a369, tkdrg, tmtmtl30, toasterpm87, TokenStyle, Tollhouse, Toly65, tom-leys, tomasalves8, Tomeno, Tonydatguy, topy, Tornado-Technology, tosatur, TotallyLemon, tropicalhibi, truepaintgit, Truoizys, Tryded, TsjipTsjip, Tunguso4ka, TurboTrackerss14, tyashley, Tyler-IN, Tyzemol, UbaserB, ubis1, UBlueberry, UKNOWH, UltimateJester, Unbelievable-Salmon, underscorex5, UnicornOnLSD, Unisol, Unkn0wnGh0st333, unusualcrow, Uriende, UristMcDorf, user424242420, Vaaankas, valentfingerov, Varen, Vasilis, VasilisThePikachu, Velcroboy, veliebm, VelonacepsCalyxEggs, venn, veprolet, veritable-calamity, Veritius, Vermidia, vero5123, Verslebas, VigersRay, violet754, Visne, vitalvitriol, VMSolidus, voidnull000, volotomite, volundr-, Voomra, Vordenburg, vorkathbruh, vulppine, wafehling, Warentan, WarMechanic, Watermelon914, weaversam8, wertanchik, whateverusername0, Willhelm53, WilliamECrew, willicassi, Winkarst-cpu, wirdal, wixoaGit, WlarusFromDaSpace, wrexbe, wtcwr68, xkreksx, xprospero, xRiriq, YanehCheck, yathxyz, Ygg01, YotaXP, youarereadingthis, Yousifb26, youtissoum, yunii, yuriykiss, YuriyKiss, zach-hill, Zadeon, zamp, Zandario, Zap527, Zealith-Gamer, ZelteHonor, zero, ZeroDiamond, ZeWaka, zionnBE, ZNixian, ZoldorfTheWizard, zonespace27, Zumorica, ZweiHawke, Zylofan, Zymem, zzylex +0x6273, 12rabbits, 13spacemen, 2013HORSEMEATSCANDAL, 20kdc, 21Melkuu, 2digitman, 3nderall, 4310v343k, 4dplanner, 612git, 778b, Ablankmann, abregado, Absolute-Potato, Acruid, actioninja, actually-reb, ada-please, adamsong, Adeinitas, Admiral-Obvious-001, adrian, Adrian16199, Ady4ik, Aerocrux, Aeshus, Aexolott, Aexxie, africalimedrop, afrokada, Agoichi, Ahion, aiden, Aikakakah, aitorlogedo, AJCM-git, AjexRose, Alekshhh, alexkar598, AlexMorgan3817, alexumandxgabriel08x, Alithsko, ALMv1, Alpha-Two, AlphaQwerty, Altoids1, amylizzle, ancientpower, Andre19926, AndrewEyeke, AndreyCamper, angelofallars, Anzarot121, Appiah, ar4ill, ArchPigeon, ArchRBX, areitpog, Arendian, arimah, Arkanic, ArkiveDev, armoks, Arteben, ArthurMousatov, ArtisticRoomba, artur, AruMoon, ArZarLordOfMango, as334, AsikKEsel, AsnDen, asperger-sind, aspiringLich, astriloqua, august-sun, AutoOtter, Avalon-Proto, avghdev, Awlod, azzy, AzzyIsNotHere, BackeTako, BananaFlambe, Baptr0b0t, BasedPugilist, BasedUser, Batuh1n, beck-thompson, BellwetherLogic, benev0, benjamin-burges, BGare, bhespiritu, BIGZi0348, bingojohnson, BismarckShuffle, Bixkitts, Blackern5000, Blazeror, BlitzTheSquishy, bloodrizer, Bloody2372, blueDev2, Boaz1111, BobdaBiscuit, BobTheSleder, boiled-water-tsar, BombasterDS, botanySupremist, brainfood1183, BramvanZijp, Brandon-Huu, Bribrooo, Bright0, brndd, bryce0110, BubblegumBlue, buletsponge, buntobaggins, bvelliquette, byondfuckery, c0rigin, c4llv07e, CaasGit, Caconym27, Calecute, Callmore, capnsockless, CaptainSqrBeard, Carbonhell, Carolyn3114, Carou02, carteblanche4me, CatTheSystem, Centronias, chairbender, Charlese2, charlie, ChaseFlorom, chavonadelal, Cheackraze, cheesePizza2, cheeseplated, Chief-Engineer, chillyconmor, christhirtle, chromiumboy, Chronophylos, Chubbygummibear, Ciac32, civilCornball, Clement-O, clyf, Clyybber, CMDR-Piboy314, CodedCrow, cohanna, Cohnway, Cojoke-dot, ColdAutumnRain, Colin-Tel, collinlunn, ComicIronic, CookieMasterT, coolboy911, coolmankid12345, Coolsurf6, corentt, CormosLemming, crazybrain23, creadth, CrigCrag, croilbird, Crotalus, CrudeWax, CrzyPotato, cutemoongod, Cyberboss, d34d10cc, dabigoose, DadeKuma, Daemon, daerSeebaer, dahnte, dakamakat, dakimasu, DamianX, DangerRevolution, daniel-cr, DanSAussieITS, Daracke, DarkenedSynergy, Darkenson, DawBla, Daxxi3, dch-GH, de0rix, Deahaka, dean, DEATHB4DEFEAT, DeathCamel58, Deatherd, deathride58, DebugOk, Decappi, Decortex, Deeeeja, deepdarkdepths, DefinitelyNotFurryXD, degradka, Delete69, deltanedas, DeltaV-Bot, DenisShvalov, DerbyX, derek, dersheppard, Deserty0, Detintinto, DevilishMilk, dexlerxd, dffdff2423, dge21, DieselMohawk, digitalic, Dimastra, DinoWattz, DisposableCrewmember42, DjfjdfofdjfjD, doc-michael, docnite, Doctor-Cpu, DoctorBeard, DogZeroX, dolgovmi, dontbetank, Doomsdrayk, dootythefrooty, Dorragon, Doru991, DoubleRiceEddiedd, DoutorWhite, dragonryan06, drakewill-CRL, Drayff, dreamlyjack, DrEnzyme, dribblydrone, DrMelon, drongood12, DrSingh, DrSmugleaf, drteaspoon420, DTanxxx, DubiousDoggo, Duddino, dukevanity, duskyjay, Dutch-VanDerLinde, dvir001, Dynexust, Easypoller, eclips_e, eden077, EEASAS, Efruit, efzapa, ElectroSR, elsie, elthundercloud, Elysium206, Emisse, emmafornash, EmoGarbage404, Endecc, eoineoineoin, eris, erohrs2, ERORR404V1, Errant-4, esguard, estacaoespacialpirata, eugene, exincore, exp111, f0x-n3rd, FacePluslll, Fahasor, FairlySadPanda, FATFSAAM2, Feluk6174, ficcialfaint, Fiftyllama, Fildrance, FillerVK, FinnishPaladin, FirinMaLazors, Fishfish458, FL-OZ, Flareguy, flashgnash, FluffiestFloof, FluffMe, FluidRock, flyingkarii, foboscheshir, FoLoKe, fooberticus, ForestNoises, forgotmyotheraccount, forkeyboards, forthbridge, Fortune117, Fouin, foxhorn, freeman2651, freeze2222, Froffy025, Fromoriss, froozigiusz, FrostMando, FryOfDestiny, FungiFellow, FunTust, Futuristic-OK, GalacticChimp, Gaxeer, gbasood, Geekyhobo, genderGeometries, GeneralGaws, Genkail, geraeumig, Ghagliiarghii, Git-Nivrak, githubuser508, gituhabu, GlassEclipse, GNF54, godisdeadLOL, goet, Goldminermac, Golinth, GoodWheatley, Gorox221, gradientvera, graevy, GraniteSidewalk, GreaseMonk, greenrock64, greggthefather, GreyMario, GTRsound, Guess-My-Name, gusxyz, Gyrandola, h3half, Haltell, Hanzdegloker, HappyRoach, Hardly3D, harikattar, he1acdvv, Hebi, Henry, HerCoyote23, hitomishirichan, hiucko, Hmeister-fake, Hmeister-real, hobnob, HoidC, Holinka4ever, holyssss, HoofedEar, Hoolny, hord-brayden, Hreno, htmlsystem, hubismal, Hugal31, Huxellberger, Hyenh, i-justuser-i, iacore, IamVelcroboy, ian, icekot8, icesickleone, iczero, iglov, IgorAnt028, igorsaux, ike709, illersaver, Illiux, Ilushkins33, Ilya246, IlyaElDunaev, imrenq, imweax, indeano, Injazz, Insineer, IntegerTempest, Interrobang01, IProduceWidgets, itsmethom, Itzbenz, iztokbajcar, Jackal298, Jackrost, jacksonzck, Jackw2As, jacob, jamessimo, janekvap, Jark255, Jaskanbe, JasperJRoth, jerryimmouse, JerryImMouse, Jessetriesagain, jessicamaybe, Jezithyr, jicksaw, JiimBob, JimGamemaster, jimmy12or, JIPDawg, jjtParadox, jmcb, JoeHammad1844, JohnGinnane, johnku1, Jophire, joshepvodka, Jrpl, juliangiebel, JustArt1m, JustCone14, justdie12, justin, justintether, JustinTrotter, justtne, K-Dynamic, k3yw, Kadeo64, Kaga-404, KaiShibaa, kalane15, kalanosh, Kanashi-Panda, katzenminer, kbailey-git, Keelin, Keer-Sar, KEEYNy, keikiru, Kelrak, kerisargit, keronshb, KIBORG04, Killerqu00, Kimpes, KingFroozy, kira-er, Kirillcas, Kirus59, Kistras, Kit0vras, KittenColony, klaypexx, Kmc2000, Ko4ergaPunk, kognise, kokoc9n, komunre, KonstantinAngelov, kosticia, koteq, KrasnoshchekovPavel, Krunklehorn, Kupie, Kurzaen, kxvvv, kyupolaris, kzhanik, lajolico, Lamrr, LankLTE, laok233, lapatison, larryrussian, lawdog4817, Lazzi0706, leander-0, leonardo-dabepis, leonsfriedrich, LetterN, lettern, Level10Cybermancer, LEVELcat, lever1209, Lgibb18, lgruthes, LightVillet, liltenhead, LinkUyx, LittleBuilderJane, lizelive, lleftTheDragon, localcc, lokachop, Lomcastar, LordCarve, LordEclipse, lucas, LucasTheDrgn, luckyshotpictures, LudwigVonChesterfield, luizwritescode, Lukasz825700516, luminight, lunarcomets, luringens, lvvova1, Lyndomen, lyroth001, lzimann, lzk228, M3739, mac6na6na, MACMAN2003, Macoron, magicalus, magmodius, MagnusCrowe, malchanceux, MaloTV, ManelNavola, manelnavola, Mangohydra, marboww, Markek1, Matz05, max, MaxNox7, maylokana, MehimoNemo, MeltedPixel, MemeProof, memoblob, MendaxxDev, Menshin, Mephisto72, MerrytheManokit, Mervill, metalgearsloth, MetalSage, MFMessage, mhamsterr, michaelcu, micheel665, MilenVolf, milon, MilonPL, Minty642, Mirino97, mirrorcult, misandrie, MishaUnity, MissKay1994, MisterMecky, Mith-randalf, MjrLandWhale, mkanke-real, MLGTASTICa, mnemotechnician, moderatelyaware, modern-nm, mokiros, Moneyl, Monotheonist, Moomoobeef, moony, Morb0, mr-bo-jangles, Mr0maks, MrFippik, mrrobdemo, MureixloI, musicmanvr, MWKane, Myakot, Myctai, N3X15, nails-n-tape, Nairodian, Naive817, NakataRin, namespace-Memory, Nannek, NazrinNya, neutrino-laser, NickPowers43, nikthechampiongr, Nimfar11, Nirnael, NIXC, NkoKirkto, nmajask, noctyrnal, nok-ko, NonchalantNoob, NoobyLegion, Nopey, not-gavnaed, notafet, notquitehadouken, notsodana, noudoit, noverd, NuclearWinter, nukashimika, nuke-haus, NULL882, nullarmo, NullWanderer, nyeogmi, Nylux, Nyranu, och-och, ocotheomega, OctoRocket, OldDanceJacket, onoira, OnyxTheBrave, OrangeMoronage9622, osjarw, Ostaf, othymer, OttoMaticode, Owai-Seek, packmore, paigemaeforrest, pali6, Pangogie, panzer-iv1, paolordls, partyaddict, patrikturi, PaulRitter, peccneck, Peptide90, peptron1, PeterFuto, PetMudstone, pewter-wiz, Pgriha, Phantom-Lily, PHCodes, Phill101, phunnyguy, PilgrimViis, Pill-U, Pireax, pissdemon, PixeltheAertistContrib, PixelTheKermit, PJB3005, Plasmaguy, plinyvic, Plykiya, pofitlo, pointer-to-null, pok27, PolterTzi, PoorMansDreams, PopGamer45, portfiend, potato1234x, PotentiallyTom, ProfanedBane, ProPandaBear, PrPleGoo, ps3moira, Pspritechologist, Psychpsyo, psykzz, PuceTint, PuroSlavKing, PursuitInAshes, Putnam3145, quatre, QueerNB, QuietlyWhisper, qwerltaz, Radezolid, RadioMull, Radosvik, Radrark, Rainbeon, Rainfey, Raitononai, Ramlik, randy10122, Rane, Ranger6012, Rapidgame7, ravage123321, rbertoche, Redfire1331, Redict, RedlineTriad, redmushie, RednoWCirabrab, RemberBM, RemieRichards, RemTim, Remuchi, rene-descartes2021, Renlou, retequizzle, RiceMar1244, rich-dunne, RieBi, riggleprime, RIKELOLDABOSS, rinary1, Rinkashikachi, riolume, RobbyTheFish, Rockdtben, Rohesie, rok-povsic, rolfero, RomanNovo, rosieposieeee, Roudenn, router, RumiTiger, S1rFl0, S1ss3l, Saakra, Sadie-silly, saga3152, saintmuntzer, Salex08, sam, samgithubaccount, Samsterious, SaphireLattice, SapphicOverload, sarahon, SaveliyM360, sBasalto, ScalyChimp, ScarKy0, scrato, Scribbles0, scruq445, scuffedjays, ScumbagDog, Segonist, sephtasm, Serkket, sewerpig, sh18rw, ShadeAware, ShadowCommander, Shadowtheprotogen546, shadowwailker, shaeone, shampunj, shariathotpatrol, ShatteredSwords, SignalWalker, siigiil, SimpleStation14, Simyon264, sirdragooon, Sirionaut, Sk1tch, SkaldetSkaeg, Skarletto, Skrauz, Skyedra, SlamBamActionman, slarticodefast, Slava0135, Slyfox333, snebl, sniperchance, Snowni, snowsignal, solaris7518, SonicHDC, SoulFN, SoulSloth, Soundwavesghost, Soydium, SpaceLizardSky, SpaceManiac, SpaceyLady, spartak, SpartanKadence, SpeltIncorrectyl, Spessmann, SphiraI, SplinterGP, spoogemonster, sporekto, Squishy77, SsalamethVersaach, ssdaniel24, stalengd, stanberytrask, Stanislav4ix, StanTheCarpenter, Stealthbomber16, stellar-novas, Stop-Signs, stopbreaking, stopka-html, StrawberryMoses, Stray-Pyramid, strO0pwafel, Strol20, StStevens, Subversionary, sunbear-dev, superjj18, Supernorn, SweptWasTaken, Sybil, SYNCHRONIC, Szunti, TadJohnson00, Tainakov, takemysoult, TaralGit, Taran, taurie, Tayrtahn, tday93, TekuNut, telyonok, TemporalOroboros, tentekal, terezi4real, Terraspark4941, texcruize, TGRCdev, tgrkzus, ThatOneGoblin25, thatrandomcanadianguy, TheArturZh, theashtronaut, thecopbennet, TheCze, TheDarkElites, thedraccx, TheEmber, TheIntoxicatedCat, thekilk, themias, theomund, TheOneWhoIsManyFrame, theOperand, TherapyGoth, therealDLondon, TheShuEd, thetolbean, thevinter, TheWaffleJesus, Thinbug0, ThunderBear2006, Timemaster99, timothyteakettle, TimrodDX, timurjavid, tin-man-tim, Titian3, tk-a369, tkdrg, tmtmtl30, toasterpm87, TokenStyle, Tollhouse, Toly65, tom-leys, tomasalves8, Tomeno, Tonydatguy, topy, Tornado-Technology, tosatur, TotallyLemon, tropicalhibi, truepaintgit, Truoizys, Tryded, TsjipTsjip, Tunguso4ka, TurboTrackerss14, tyashley, Tyler-IN, Tyzemol, UbaserB, ubis1, UBlueberry, UKNOWH, UltimateJester, Unbelievable-Salmon, underscorex5, UnicornOnLSD, Unisol, Unkn0wnGh0st333, unusualcrow, Uriende, UristMcDorf, user424242420, Vaaankas, valentfingerov, Varen, Vasilis, VasilisThePikachu, Velcroboy, veliebm, VelonacepsCalyxEggs, venn, veprolet, veritable-calamity, Veritius, Vermidia, vero5123, Verslebas, VigersRay, violet754, Visne, vitalvitriol, VMSolidus, voidnull000, volotomite, volundr-, Voomra, Vordenburg, vorkathbruh, vulppine, wafehling, Warentan, WarMechanic, Watermelon914, weaversam8, wertanchik, whateverusername0, Willhelm53, WilliamECrew, willicassi, Winkarst-cpu, wirdal, wixoaGit, WlarusFromDaSpace, wrexbe, wtcwr68, xkreksx, xprospero, xRiriq, YanehCheck, yathxyz, Ygg01, YotaXP, youarereadingthis, Yousifb26, youtissoum, yunii, yuriykiss, YuriyKiss, zach-hill, Zadeon, zamp, Zandario, Zap527, Zealith-Gamer, ZelteHonor, zero, ZeroDiamond, ZeWaka, zionnBE, ZNixian, ZoldorfTheWizard, zonespace27, ZweiHawke, Zylofan, Zymem, zzylex diff --git a/Resources/Locale/en-US/deltav/preferences/loadout-groups.ftl b/Resources/Locale/en-US/deltav/preferences/loadout-groups.ftl index a81350ed0f0..e2833be68f9 100644 --- a/Resources/Locale/en-US/deltav/preferences/loadout-groups.ftl +++ b/Resources/Locale/en-US/deltav/preferences/loadout-groups.ftl @@ -67,7 +67,6 @@ loadout-group-scarfs = Scarf # Epistemics loadout-group-mantis-head = Mantis head loadout-group-mantis-jumpsuit = Mantis jumpsuit -loadout-group-mantis-backpack = Mantis backpack loadout-group-mantis-outerclothing = Mantis outer clothing loadout-group-mantis-shoes = Mantis shoes loadout-group-mantis-gloves = Mantis gloves diff --git a/Resources/Maps/Shuttles/DeltaV/helix.yml b/Resources/Maps/Shuttles/DeltaV/helix.yml index 6b1a7a09809..c381211d118 100644 --- a/Resources/Maps/Shuttles/DeltaV/helix.yml +++ b/Resources/Maps/Shuttles/DeltaV/helix.yml @@ -366,7 +366,6 @@ entities: - type: RadiationGridResistance - type: SpreaderGrid - type: GravityShake - nextShake: 0 shakeTimes: 10 - proto: AirCanister entities: @@ -499,14 +498,14 @@ entities: - uid: 205 components: - type: MetaData - name: Treatment APC + name: Treatment / West docks APC - type: Transform pos: -3.5,7.5 parent: 1 - uid: 448 components: - type: MetaData - name: Cryo APC + name: Cryo / East docks APC - type: Transform pos: 10.5,8.5 parent: 1 @@ -559,7 +558,7 @@ entities: - uid: 28 components: - type: Transform - pos: 10.5,7.5 + pos: -3.5,5.5 parent: 1 - uid: 29 components: @@ -951,6 +950,31 @@ entities: - type: Transform pos: 2.5,3.5 parent: 1 + - uid: 478 + components: + - type: Transform + pos: -3.5,6.5 + parent: 1 + - uid: 479 + components: + - type: Transform + pos: -3.5,7.5 + parent: 1 + - uid: 480 + components: + - type: Transform + pos: 10.5,5.5 + parent: 1 + - uid: 481 + components: + - type: Transform + pos: 10.5,6.5 + parent: 1 + - uid: 482 + components: + - type: Transform + pos: 10.5,7.5 + parent: 1 - proto: CableHV entities: - uid: 107 @@ -1223,13 +1247,6 @@ entities: rot: 3.141592653589793 rad pos: 5.5,11.5 parent: 1 -- proto: chem_master - entities: - - uid: 140 - components: - - type: Transform - pos: 4.5,3.5 - parent: 1 - proto: ChemDispenser entities: - uid: 141 @@ -1244,6 +1261,13 @@ entities: - type: Transform pos: 3.5,1.5 parent: 1 +- proto: ChemMaster + entities: + - uid: 140 + components: + - type: Transform + pos: 4.5,3.5 + parent: 1 - proto: ClosetWallEmergencyFilledRandom entities: - uid: 445 diff --git a/Resources/Prototypes/Catalog/Cargo/cargo_armory.yml b/Resources/Prototypes/Catalog/Cargo/cargo_armory.yml index 6341042bf89..1682f56199d 100644 --- a/Resources/Prototypes/Catalog/Cargo/cargo_armory.yml +++ b/Resources/Prototypes/Catalog/Cargo/cargo_armory.yml @@ -24,7 +24,7 @@ sprite: Objects/Specific/Medical/implanter.rsi state: implanter0 product: CrateTrackingImplants - cost: 1000 + cost: 4000 # DeltaV - was 1000 category: cargoproduct-category-name-armory group: market diff --git a/Resources/Prototypes/DeltaV/Entities/Structures/Doors/Airlocks/assembly.yml b/Resources/Prototypes/DeltaV/Entities/Structures/Doors/Airlocks/assembly.yml new file mode 100644 index 00000000000..67004211317 --- /dev/null +++ b/Resources/Prototypes/DeltaV/Entities/Structures/Doors/Airlocks/assembly.yml @@ -0,0 +1,19 @@ + +#Chemistry +- type: entity + parent: AirlockAssembly + id: AirlockAssemblyChemistry + suffix: Chemistry + components: + - type: Sprite + sprite: DeltaV/Structures/Doors/Airlocks/Standard/chemistry.rsi #Delta V - Resprite Doors + state: "assembly" + +- type: entity + parent: AirlockAssembly + id: AirlockAssemblyChemistryGlass + suffix: Chemistry, Glass + components: + - type: Sprite + sprite: DeltaV/Structures/Doors/Airlocks/Glass/chemistry.rsi #Delta V - Resprite Doors + state: "assembly" diff --git a/Resources/Prototypes/DeltaV/Entities/Structures/Doors/airlock_groups.yml b/Resources/Prototypes/DeltaV/Entities/Structures/Doors/airlock_groups.yml index 5b82b3bb519..9c14c3046b3 100644 --- a/Resources/Prototypes/DeltaV/Entities/Structures/Doors/airlock_groups.yml +++ b/Resources/Prototypes/DeltaV/Entities/Structures/Doors/airlock_groups.yml @@ -6,11 +6,11 @@ atmospherics: DeltaV/Structures/Doors/Airlocks/Standard/atmospherics.rsi basic: DeltaV/Structures/Doors/Airlocks/Standard/basic.rsi cargo: DeltaV/Structures/Doors/Airlocks/Standard/cargo.rsi - chemistry: DeltaV/Structures/Doors/Airlocks/Standard/medical.rsi # TODO: resprite chemistry + chemistry: DeltaV/Structures/Doors/Airlocks/Standard/chemistry.rsi command: DeltaV/Structures/Doors/Airlocks/Standard/command.rsi engineering: DeltaV/Structures/Doors/Airlocks/Standard/engineering.rsi freezer: DeltaV/Structures/Doors/Airlocks/Standard/freezer.rsi - hydroponics: DeltaV/Structures/Doors/Airlocks/Standard/basic.rsi # TODO: resprite hydroponics + hydroponics: DeltaV/Structures/Doors/Airlocks/Standard/hydroponics.rsi maintenance: DeltaV/Structures/Doors/Airlocks/Standard/maint.rsi science: DeltaV/Structures/Doors/Airlocks/Standard/science.rsi security: DeltaV/Structures/Doors/Airlocks/Standard/security.rsi @@ -23,16 +23,16 @@ stylePaths: atmospherics: DeltaV/Structures/Doors/Airlocks/Glass/atmospherics.rsi basic: DeltaV/Structures/Doors/Airlocks/Glass/basic.rsi - chemistry: DeltaV/Structures/Doors/Airlocks/Glass/medical.rsi # TODO: resprite chemistry + chemistry: DeltaV/Structures/Doors/Airlocks/Glass/chemistry.rsi command: DeltaV/Structures/Doors/Airlocks/Glass/command.rsi science: DeltaV/Structures/Doors/Airlocks/Glass/science.rsi cargo: DeltaV/Structures/Doors/Airlocks/Glass/cargo.rsi engineering: DeltaV/Structures/Doors/Airlocks/Glass/engineering.rsi glass: DeltaV/Structures/Doors/Airlocks/Glass/glass.rsi - hydroponics: DeltaV/Structures/Doors/Airlocks/Glass/basic.rsi + hydroponics: DeltaV/Structures/Doors/Airlocks/Glass/hydroponics.rsi maintenance: DeltaV/Structures/Doors/Airlocks/Glass/maint.rsi medical: DeltaV/Structures/Doors/Airlocks/Glass/medical.rsi security: DeltaV/Structures/Doors/Airlocks/Glass/security.rsi virology: DeltaV/Structures/Doors/Airlocks/Glass/virology.rsi justice: DeltaV/Structures/Doors/Airlocks/Glass/justice.rsi # Add Justice Dept - # TODO: hydroponics sprite + diff --git a/Resources/Prototypes/Entities/Mobs/NPCs/xeno.yml b/Resources/Prototypes/Entities/Mobs/NPCs/xeno.yml index 503089a0c24..dc2011b804b 100644 --- a/Resources/Prototypes/Entities/Mobs/NPCs/xeno.yml +++ b/Resources/Prototypes/Entities/Mobs/NPCs/xeno.yml @@ -119,6 +119,7 @@ molsPerSecondPerUnitMass: 0.0005 - type: Speech speechVerb: LargeMob + speechSounds: Xenonid # DeltaV: Use RMC's speech sounds for sentient xenos - type: PotentialPsionic #Nyano - Summary: makes potentially psionic. chance: -2 - type: Psionic #Nyano - Summary: makes psionic by default. diff --git a/Resources/Prototypes/Entities/Structures/Doors/Airlocks/airlocks.yml b/Resources/Prototypes/Entities/Structures/Doors/Airlocks/airlocks.yml index d33b1d501ff..168720eaef3 100644 --- a/Resources/Prototypes/Entities/Structures/Doors/Airlocks/airlocks.yml +++ b/Resources/Prototypes/Entities/Structures/Doors/Airlocks/airlocks.yml @@ -46,7 +46,7 @@ suffix: Hydroponics components: - type: Sprite - sprite: DeltaV/Structures/Doors/Airlocks/Standard/basic.rsi # DeltaV: temporary sprite until hydroponics is resprited + sprite: DeltaV/Structures/Doors/Airlocks/Standard/hydroponics.rsi # DeltaV - Resprite Doors - type: Wires layoutId: AirlockService @@ -76,7 +76,7 @@ suffix: Chemistry components: - type: Sprite - sprite: DeltaV/Structures/Doors/Airlocks/Standard/medical.rsi # DeltaV: using medical sprite until chemistry gets resprited + sprite: DeltaV/Structures/Doors/Airlocks/Standard/chemistry.rsi # DeltaV - Reprite Doors - type: entity parent: Airlock @@ -210,10 +210,10 @@ - type: entity parent: AirlockGlass id: AirlockHydroponicsGlass - suffix: Hydroponics, DO NOT MAP # DeltaV: DNM as its not resprited yet + suffix: Hydroponics components: - type: Sprite - sprite: DeltaV/Structures/Doors/Airlocks/Glass/basic.rsi # DeltaV: temporary sprite until hydroponics is resprited + sprite: DeltaV/Structures/Doors/Airlocks/Glass/hydroponics.rsi # DeltaV - Resprite Doors - type: Wires layoutId: AirlockService @@ -235,7 +235,8 @@ suffix: Chemistry components: - type: Sprite - sprite: DeltaV/Structures/Doors/Airlocks/Glass/medical.rsi # DeltaV: using medical sprite until chemistry gets resprited + sprite: DeltaV/Structures/Doors/Airlocks/Glass/chemistry.rsi # DeltaV - Resprite Doors + - type: entity parent: AirlockMedicalGlass diff --git a/Resources/Prototypes/Entities/Structures/Doors/Airlocks/assembly.yml b/Resources/Prototypes/Entities/Structures/Doors/Airlocks/assembly.yml index 9c06b33d3a0..4a9c4472efa 100644 --- a/Resources/Prototypes/Entities/Structures/Doors/Airlocks/assembly.yml +++ b/Resources/Prototypes/Entities/Structures/Doors/Airlocks/assembly.yml @@ -145,7 +145,7 @@ suffix: Hydroponics components: - type: Sprite - sprite: Structures/Doors/Airlocks/Standard/hydroponics.rsi + sprite: DeltaV/Structures/Doors/Airlocks/Standard/hydroponics.rsi #Delta V - Resprite Doors state: "assembly" - type: entity @@ -154,7 +154,7 @@ suffix: Hydroponics, Glass components: - type: Sprite - sprite: Structures/Doors/Airlocks/Glass/hydroponics.rsi + sprite: DeltaV/Structures/Doors/Airlocks/Glass/hydroponics.rsi #Delta V - Resprite Doors state: "assembly" #Maintenance diff --git a/Resources/Prototypes/Entities/Structures/Storage/Crates/crates.yml b/Resources/Prototypes/Entities/Structures/Storage/Crates/crates.yml index 7976476743b..107e8f94d50 100644 --- a/Resources/Prototypes/Entities/Structures/Storage/Crates/crates.yml +++ b/Resources/Prototypes/Entities/Structures/Storage/Crates/crates.yml @@ -456,7 +456,7 @@ parent: CratePirate id: CrateToyBox name: toy box - suffix: Empty + #suffix: Empty # Delta V - Commented out simply for clarity at spawn menu on other uses besides the filled toy box. description: A box overflowing with fun. components: - type: Sprite diff --git a/Resources/Prototypes/Loadouts/loadout_groups.yml b/Resources/Prototypes/Loadouts/loadout_groups.yml index 36ffaaa138d..e29a7abd9c0 100644 --- a/Resources/Prototypes/Loadouts/loadout_groups.yml +++ b/Resources/Prototypes/Loadouts/loadout_groups.yml @@ -1288,12 +1288,12 @@ - EmergencyOxygenSecurity - LoadoutSpeciesVoxNitrogen -#- type: loadoutGroup # DeltaV - removed for incongruence -# id: SecurityStar -# name: loadout-group-security-star -# minLimit: 0 -# loadouts: -# - SecStar +- type: loadoutGroup + id: SecurityStar + name: loadout-group-security-star + minLimit: 0 + loadouts: + - SecStar # Medical - type: loadoutGroup diff --git a/Resources/Prototypes/Loadouts/role_loadouts.yml b/Resources/Prototypes/Loadouts/role_loadouts.yml index 7f6b5a81b1f..e23906e6ccd 100644 --- a/Resources/Prototypes/Loadouts/role_loadouts.yml +++ b/Resources/Prototypes/Loadouts/role_loadouts.yml @@ -368,7 +368,7 @@ - HeadofSecurityShoes # DeltaV - winter boots - SurvivalSecurity - Trinkets -# - SecurityStar # DeltaV - removed for incongruence + - SecurityStar - GroupSpeciesBreathToolSecurity - type: roleLoadout @@ -383,7 +383,7 @@ - SecurityShoes - SurvivalSecurity - Trinkets -# - SecurityStar # DeltaV - removed for incongruence + - SecurityStar - GroupSpeciesBreathToolSecurity - type: roleLoadout @@ -399,7 +399,7 @@ - SecurityBelt - SurvivalSecurity - Trinkets -# - SecurityStar # DeltaV - removed for incongruence + - SecurityStar - GroupSpeciesBreathToolSecurity - type: roleLoadout @@ -414,7 +414,7 @@ - SecurityShoes - SurvivalSecurity - Trinkets -# - SecurityStar # DeltaV - removed for incongruence + - SecurityStar - GroupSpeciesBreathToolSecurity - type: roleLoadout diff --git a/Resources/Prototypes/Nyanotrasen/Catalog/Fills/Backpacks/StarterGear/backpack.yml b/Resources/Prototypes/Nyanotrasen/Catalog/Fills/Backpacks/StarterGear/backpack.yml deleted file mode 100644 index 66b1854dafb..00000000000 --- a/Resources/Prototypes/Nyanotrasen/Catalog/Fills/Backpacks/StarterGear/backpack.yml +++ /dev/null @@ -1,13 +0,0 @@ -- type: entity - categories: [ HideSpawnMenu ] - parent: ClothingBackpackScience - id: ClothingBackpackMantisFilled - components: - - type: StorageFill - contents: - - id: BoxSurvival - # - id: BoxForensicPad # DeltaV - Mantis is no longer a Detective - - id: HandLabeler - - id: PillMindbreakerToxin - - id: BoxFolderGrey - - id: RubberStampMantis diff --git a/Resources/Prototypes/Nyanotrasen/Catalog/Fills/Backpacks/StarterGear/duffelbag.yml b/Resources/Prototypes/Nyanotrasen/Catalog/Fills/Backpacks/StarterGear/duffelbag.yml deleted file mode 100644 index 49ca0460aa5..00000000000 --- a/Resources/Prototypes/Nyanotrasen/Catalog/Fills/Backpacks/StarterGear/duffelbag.yml +++ /dev/null @@ -1,13 +0,0 @@ -- type: entity - categories: [ HideSpawnMenu ] - parent: ClothingBackpackDuffelScience - id: ClothingBackpackDuffelMantisFilled - components: - - type: StorageFill - contents: - - id: BoxSurvival - # - id: BoxForensicPad # DeltaV - Mantis is no longer a Detective - - id: HandLabeler - - id: PillMindbreakerToxin - - id: BoxFolderGrey - - id: RubberStampMantis diff --git a/Resources/Prototypes/Nyanotrasen/Catalog/Fills/Backpacks/StarterGear/satchel.yml b/Resources/Prototypes/Nyanotrasen/Catalog/Fills/Backpacks/StarterGear/satchel.yml deleted file mode 100644 index 9a33ad34685..00000000000 --- a/Resources/Prototypes/Nyanotrasen/Catalog/Fills/Backpacks/StarterGear/satchel.yml +++ /dev/null @@ -1,13 +0,0 @@ -- type: entity - categories: [ HideSpawnMenu ] - parent: ClothingBackpackSatchelScience - id: ClothingBackpackSatchelMantisFilled - components: - - type: StorageFill - contents: - - id: BoxSurvival - # - id: BoxForensicPad # DeltaV - Mantis is no longer a Detective - - id: HandLabeler - - id: PillMindbreakerToxin - - id: BoxFolderGrey - - id: RubberStampMantis diff --git a/Resources/Prototypes/Nyanotrasen/Loadouts/Jobs/Epistemics/forensicmantis.yml b/Resources/Prototypes/Nyanotrasen/Loadouts/Jobs/Epistemics/forensicmantis.yml index c6df3e71ca3..33224a158a2 100644 --- a/Resources/Prototypes/Nyanotrasen/Loadouts/Jobs/Epistemics/forensicmantis.yml +++ b/Resources/Prototypes/Nyanotrasen/Loadouts/Jobs/Epistemics/forensicmantis.yml @@ -15,22 +15,6 @@ equipment: jumpsuit: ClothingUniformSkirtMantis -# Back -- type: loadout - id: MantisBackpack - equipment: - back: ClothingBackpackMantisFilled - -- type: loadout - id: MantisSatchel - equipment: - back: ClothingBackpackSatchelMantisFilled - -- type: loadout - id: MantisDuffel - equipment: - back: ClothingBackpackDuffelMantisFilled - # OuterClothing - type: loadout id: MantisCoat diff --git a/Resources/Prototypes/Nyanotrasen/Loadouts/loadout_groups.yml b/Resources/Prototypes/Nyanotrasen/Loadouts/loadout_groups.yml index 2ffcbd25368..740d034967f 100644 --- a/Resources/Prototypes/Nyanotrasen/Loadouts/loadout_groups.yml +++ b/Resources/Prototypes/Nyanotrasen/Loadouts/loadout_groups.yml @@ -37,14 +37,6 @@ - MantisJumpsuit - MantisJumpskirt -- type: loadoutGroup - id: MantisBackpack - name: loadout-group-mantis-backpack - loadouts: - - MantisBackpack - - MantisSatchel - - MantisDuffel - - type: loadoutGroup id: MantisOuterClothing name: loadout-group-mantis-outerclothing diff --git a/Resources/Prototypes/Nyanotrasen/Loadouts/role_loadouts.yml b/Resources/Prototypes/Nyanotrasen/Loadouts/role_loadouts.yml index 0ef279f75cc..5a7f6576a80 100644 --- a/Resources/Prototypes/Nyanotrasen/Loadouts/role_loadouts.yml +++ b/Resources/Prototypes/Nyanotrasen/Loadouts/role_loadouts.yml @@ -18,7 +18,7 @@ - GroupTankHarness - MantisHead - MantisJumpsuit - - MantisBackpack + - ScientistBackpack - MantisOuterClothing - MantisShoes - MantisGloves diff --git a/Resources/Prototypes/Nyanotrasen/Roles/Jobs/Epistemics/forensicmantis.yml b/Resources/Prototypes/Nyanotrasen/Roles/Jobs/Epistemics/forensicmantis.yml index f4d511f6a87..b31b6ec1b0b 100644 --- a/Resources/Prototypes/Nyanotrasen/Roles/Jobs/Epistemics/forensicmantis.yml +++ b/Resources/Prototypes/Nyanotrasen/Roles/Jobs/Epistemics/forensicmantis.yml @@ -32,3 +32,9 @@ eyes: ClothingEyesGlassesSunglasses ears: ClothingHeadsetScience # DeltaV - Mantis is part of Epistemics belt: ClothingBeltMantis + storage: + back: + - HandLabeler + - PillMindbreakerToxin + - BoxFolderGrey + - RubberStampMantis diff --git a/Resources/Prototypes/Procedural/Magnet/asteroid_ore_gens.yml b/Resources/Prototypes/Procedural/Magnet/asteroid_ore_gens.yml index 661350f6de6..de70e2d5ecd 100644 --- a/Resources/Prototypes/Procedural/Magnet/asteroid_ore_gens.yml +++ b/Resources/Prototypes/Procedural/Magnet/asteroid_ore_gens.yml @@ -3,8 +3,8 @@ weights: OreIron: 1.0 OreQuartz: 1.0 - OreCoal: 0.33 - OreSalt: 0.25 + OreCoal: 0.58 # DeltaV: was 0.33, added 0.25 from salt + #OreSalt: 0.25 # DeltaV: removed salt, added weight to coal OreGold: 0.25 OreSilver: 0.25 OrePlasma: 0.20 diff --git a/Resources/Prototypes/Procedural/salvage_loot.yml b/Resources/Prototypes/Procedural/salvage_loot.yml index 68bfcd89573..c29cc2ef158 100644 --- a/Resources/Prototypes/Procedural/salvage_loot.yml +++ b/Resources/Prototypes/Procedural/salvage_loot.yml @@ -139,7 +139,7 @@ guaranteed: true loots: - !type:BiomeMarkerLoot - proto: OreSalt + proto: OreCoal # DeltaV: replace salt with coal # - Medium value - type: salvageLoot diff --git a/Resources/Prototypes/Reagents/Consumable/Food/ingredients.yml b/Resources/Prototypes/Reagents/Consumable/Food/ingredients.yml index 34cafe50983..76362684037 100644 --- a/Resources/Prototypes/Reagents/Consumable/Food/ingredients.yml +++ b/Resources/Prototypes/Reagents/Consumable/Food/ingredients.yml @@ -234,6 +234,9 @@ reagent: Nutriment min: 0.1 factor: 1 + - !type:AdjustReagent # DeltaV - Make cocoa powder actually toxic to animal organs + reagent: Theobromine + amount: 0.2 plantMetabolism: - !type:PlantAdjustNutrition amount: 0.1 diff --git a/Resources/Prototypes/Reagents/toxins.yml b/Resources/Prototypes/Reagents/toxins.yml index 12b05f9b232..24bdf7b6596 100644 --- a/Resources/Prototypes/Reagents/toxins.yml +++ b/Resources/Prototypes/Reagents/toxins.yml @@ -403,7 +403,7 @@ boilingPoint: 554 # I'm not a chemist, but it boils at 295, lower than melting point, idk how it works so I gave it higher value metabolisms: Poison: - metabolismRate: 0.05 + metabolismRate: 0.04 # DeltaV - Slowed to allow coffee/etc to build up theobromine effects: - !type:HealthChange conditions: @@ -411,12 +411,15 @@ type: Animal # Applying damage to the mobs with lower metabolism capabilities damage: types: - Poison: 0.4 + Poison: 0.3 # DeltaV - slightly reduced to account for slowed metabolism rate - !type:ChemVomit - probability: 0.04 #Scaled for time, not metabolismrate. + probability: 0.1 #Scaled for time, not metabolismrate. # DeltaV - Increased from .04 Vomit more when there is a lot of it conditions: - !type:OrganType type: Animal + - !type:ReagentThreshold #DeltaV - Readded this. No longer causes vomitting at the lightest whiff of coffee + reagent: Theobromine + min: 0.5 - type: reagent id: Amatoxin diff --git a/Resources/Prototypes/_RMC14/SoundCollections/xeno_speech.yml b/Resources/Prototypes/_RMC14/SoundCollections/xeno_speech.yml new file mode 100644 index 00000000000..82e03453ce8 --- /dev/null +++ b/Resources/Prototypes/_RMC14/SoundCollections/xeno_speech.yml @@ -0,0 +1,6 @@ +- type: soundCollection + id: XenonidSpeech + files: + - /Audio/_RMC14/Voice/Xeno/alien_talk1.ogg + - /Audio/_RMC14/Voice/Xeno/alien_talk2.ogg + - /Audio/_RMC14/Voice/Xeno/alien_talk3.ogg diff --git a/Resources/Prototypes/_RMC14/Voice/speech_sounds.yml b/Resources/Prototypes/_RMC14/Voice/speech_sounds.yml new file mode 100644 index 00000000000..98c4f643e8c --- /dev/null +++ b/Resources/Prototypes/_RMC14/Voice/speech_sounds.yml @@ -0,0 +1,8 @@ +- type: speechSounds + id: Xenonid + saySound: + collection: XenonidSpeech + askSound: + collection: XenonidSpeech + exclaimSound: + collection: XenonidSpeech diff --git a/Resources/Prototypes/ore.yml b/Resources/Prototypes/ore.yml index 5beda7a2098..3fa2507392c 100644 --- a/Resources/Prototypes/ore.yml +++ b/Resources/Prototypes/ore.yml @@ -90,7 +90,7 @@ id: RandomOreDistributionStandard weights: OreSteel: 10 - OreCoal: 10 + OreCoal: 12 # DeltaV: increased slightly from 10 so there is a surplus to give to chem OreSpaceQuartz: 8 OreGold: 2 OrePlasma: 4 @@ -98,7 +98,6 @@ OreUranium: 1 OreBananium: 0.5 OreArtifactFragment: 0.5 - OreSalt: 5 #Delta V - Adds so our rocks can spawn salt - type: weightedRandomOre id: OreCrab diff --git a/Resources/Textures/DeltaV/Structures/Doors/Airlocks/Glass/chemistry.rsi/assembly.png b/Resources/Textures/DeltaV/Structures/Doors/Airlocks/Glass/chemistry.rsi/assembly.png new file mode 100644 index 00000000000..f2ddfc23c9b Binary files /dev/null and b/Resources/Textures/DeltaV/Structures/Doors/Airlocks/Glass/chemistry.rsi/assembly.png differ diff --git a/Resources/Textures/DeltaV/Structures/Doors/Airlocks/Glass/chemistry.rsi/bolted_unlit.png b/Resources/Textures/DeltaV/Structures/Doors/Airlocks/Glass/chemistry.rsi/bolted_unlit.png new file mode 100644 index 00000000000..653846c3022 Binary files /dev/null and b/Resources/Textures/DeltaV/Structures/Doors/Airlocks/Glass/chemistry.rsi/bolted_unlit.png differ diff --git a/Resources/Textures/DeltaV/Structures/Doors/Airlocks/Glass/chemistry.rsi/closed.png b/Resources/Textures/DeltaV/Structures/Doors/Airlocks/Glass/chemistry.rsi/closed.png new file mode 100644 index 00000000000..6de0c21baca Binary files /dev/null and b/Resources/Textures/DeltaV/Structures/Doors/Airlocks/Glass/chemistry.rsi/closed.png differ diff --git a/Resources/Textures/DeltaV/Structures/Doors/Airlocks/Glass/chemistry.rsi/closed_unlit.png b/Resources/Textures/DeltaV/Structures/Doors/Airlocks/Glass/chemistry.rsi/closed_unlit.png new file mode 100644 index 00000000000..cc185dfdb5a Binary files /dev/null and b/Resources/Textures/DeltaV/Structures/Doors/Airlocks/Glass/chemistry.rsi/closed_unlit.png differ diff --git a/Resources/Textures/DeltaV/Structures/Doors/Airlocks/Glass/chemistry.rsi/closing.png b/Resources/Textures/DeltaV/Structures/Doors/Airlocks/Glass/chemistry.rsi/closing.png new file mode 100644 index 00000000000..dfed7d80548 Binary files /dev/null and b/Resources/Textures/DeltaV/Structures/Doors/Airlocks/Glass/chemistry.rsi/closing.png differ diff --git a/Resources/Textures/DeltaV/Structures/Doors/Airlocks/Glass/chemistry.rsi/closing_unlit.png b/Resources/Textures/DeltaV/Structures/Doors/Airlocks/Glass/chemistry.rsi/closing_unlit.png new file mode 100644 index 00000000000..7498990a390 Binary files /dev/null and b/Resources/Textures/DeltaV/Structures/Doors/Airlocks/Glass/chemistry.rsi/closing_unlit.png differ diff --git a/Resources/Textures/DeltaV/Structures/Doors/Airlocks/Glass/chemistry.rsi/deny_unlit.png b/Resources/Textures/DeltaV/Structures/Doors/Airlocks/Glass/chemistry.rsi/deny_unlit.png new file mode 100644 index 00000000000..8c381d4c61e Binary files /dev/null and b/Resources/Textures/DeltaV/Structures/Doors/Airlocks/Glass/chemistry.rsi/deny_unlit.png differ diff --git a/Resources/Textures/DeltaV/Structures/Doors/Airlocks/Glass/chemistry.rsi/emergency_unlit.png b/Resources/Textures/DeltaV/Structures/Doors/Airlocks/Glass/chemistry.rsi/emergency_unlit.png new file mode 100644 index 00000000000..f210ecf123e Binary files /dev/null and b/Resources/Textures/DeltaV/Structures/Doors/Airlocks/Glass/chemistry.rsi/emergency_unlit.png differ diff --git a/Resources/Textures/DeltaV/Structures/Doors/Airlocks/Glass/chemistry.rsi/meta.json b/Resources/Textures/DeltaV/Structures/Doors/Airlocks/Glass/chemistry.rsi/meta.json new file mode 100644 index 00000000000..9229d5ffd0a --- /dev/null +++ b/Resources/Textures/DeltaV/Structures/Doors/Airlocks/Glass/chemistry.rsi/meta.json @@ -0,0 +1,195 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Redrawn assets https://github.com/ParadiseSS13/Paradise/, redrawing done by Unkn0wn_Gh0st333 on github", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "assembly" + }, + { + "name": "bolted_unlit" + }, + { + "name": "closed" + }, + { + "name": "closed_unlit" + }, + { + "name": "closing", + "delays": [ + [ + 0.1, + 0.1, + 0.07, + 0.07, + 0.07, + 0.2 + ] + ] + }, + { + "name": "closing_unlit", + "delays": [ + [ + 0.1, + 0.1, + 0.07, + 0.07, + 0.07, + 0.2 + ] + ] + }, + { + "name": "deny_unlit", + "delays": [ + [ + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1 + ] + ] + }, + { + "name": "open", + "delays": [ + [ + 1 + ] + ] + }, + { + "name": "opening", + "delays": [ + [ + 0.1, + 0.1, + 0.07, + 0.07, + 0.07, + 0.2 + ] + ] + }, + { + "name": "opening_unlit", + "delays": [ + [ + 0.1, + 0.1, + 0.07, + 0.07, + 0.07, + 0.2 + ] + ] + }, + { + "name": "panel_closing", + "delays": [ + [ + 0.1, + 0.1, + 0.07, + 0.07, + 0.07, + 0.2 + ] + ] + }, + { + "name": "panel_open", + "delays": [ + [ + 1 + ] + ] + }, + { + "name": "panel_opening", + "delays": [ + [ + 0.1, + 0.1, + 0.07, + 0.07, + 0.07, + 0.2 + ] + ] + }, + { + "name": "sparks", + "delays": [ + [ + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1 + ] + ] + }, + { + "name": "sparks_broken", + "delays": [ + [ + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1 + ] + ] + }, + { + "name": "sparks_damaged", + "delays": [ + [ + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 1.7 + ] + ] + }, + { + "name": "sparks_open", + "delays": [ + [ + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1 + ] + ] + }, + { + "name": "welded" + }, + { + "name": "emergency_unlit", + "delays": [ + [ + 0.4, + 0.4 + ] + ] + } + ] +} diff --git a/Resources/Textures/DeltaV/Structures/Doors/Airlocks/Glass/chemistry.rsi/open.png b/Resources/Textures/DeltaV/Structures/Doors/Airlocks/Glass/chemistry.rsi/open.png new file mode 100644 index 00000000000..d8485a48e74 Binary files /dev/null and b/Resources/Textures/DeltaV/Structures/Doors/Airlocks/Glass/chemistry.rsi/open.png differ diff --git a/Resources/Textures/DeltaV/Structures/Doors/Airlocks/Glass/chemistry.rsi/opening.png b/Resources/Textures/DeltaV/Structures/Doors/Airlocks/Glass/chemistry.rsi/opening.png new file mode 100644 index 00000000000..3ea40202f1c Binary files /dev/null and b/Resources/Textures/DeltaV/Structures/Doors/Airlocks/Glass/chemistry.rsi/opening.png differ diff --git a/Resources/Textures/DeltaV/Structures/Doors/Airlocks/Glass/chemistry.rsi/opening_unlit.png b/Resources/Textures/DeltaV/Structures/Doors/Airlocks/Glass/chemistry.rsi/opening_unlit.png new file mode 100644 index 00000000000..2e109950a4e Binary files /dev/null and b/Resources/Textures/DeltaV/Structures/Doors/Airlocks/Glass/chemistry.rsi/opening_unlit.png differ diff --git a/Resources/Textures/DeltaV/Structures/Doors/Airlocks/Glass/chemistry.rsi/panel_closing.png b/Resources/Textures/DeltaV/Structures/Doors/Airlocks/Glass/chemistry.rsi/panel_closing.png new file mode 100644 index 00000000000..4a0d28b65b4 Binary files /dev/null and b/Resources/Textures/DeltaV/Structures/Doors/Airlocks/Glass/chemistry.rsi/panel_closing.png differ diff --git a/Resources/Textures/DeltaV/Structures/Doors/Airlocks/Glass/chemistry.rsi/panel_open.png b/Resources/Textures/DeltaV/Structures/Doors/Airlocks/Glass/chemistry.rsi/panel_open.png new file mode 100644 index 00000000000..2e348983fef Binary files /dev/null and b/Resources/Textures/DeltaV/Structures/Doors/Airlocks/Glass/chemistry.rsi/panel_open.png differ diff --git a/Resources/Textures/DeltaV/Structures/Doors/Airlocks/Glass/chemistry.rsi/panel_opening.png b/Resources/Textures/DeltaV/Structures/Doors/Airlocks/Glass/chemistry.rsi/panel_opening.png new file mode 100644 index 00000000000..899651c3044 Binary files /dev/null and b/Resources/Textures/DeltaV/Structures/Doors/Airlocks/Glass/chemistry.rsi/panel_opening.png differ diff --git a/Resources/Textures/DeltaV/Structures/Doors/Airlocks/Glass/chemistry.rsi/sparks.png b/Resources/Textures/DeltaV/Structures/Doors/Airlocks/Glass/chemistry.rsi/sparks.png new file mode 100644 index 00000000000..dd67e88a315 Binary files /dev/null and b/Resources/Textures/DeltaV/Structures/Doors/Airlocks/Glass/chemistry.rsi/sparks.png differ diff --git a/Resources/Textures/DeltaV/Structures/Doors/Airlocks/Glass/chemistry.rsi/sparks_broken.png b/Resources/Textures/DeltaV/Structures/Doors/Airlocks/Glass/chemistry.rsi/sparks_broken.png new file mode 100644 index 00000000000..fb5d774588a Binary files /dev/null and b/Resources/Textures/DeltaV/Structures/Doors/Airlocks/Glass/chemistry.rsi/sparks_broken.png differ diff --git a/Resources/Textures/DeltaV/Structures/Doors/Airlocks/Glass/chemistry.rsi/sparks_damaged.png b/Resources/Textures/DeltaV/Structures/Doors/Airlocks/Glass/chemistry.rsi/sparks_damaged.png new file mode 100644 index 00000000000..f16a028dee5 Binary files /dev/null and b/Resources/Textures/DeltaV/Structures/Doors/Airlocks/Glass/chemistry.rsi/sparks_damaged.png differ diff --git a/Resources/Textures/DeltaV/Structures/Doors/Airlocks/Glass/chemistry.rsi/sparks_open.png b/Resources/Textures/DeltaV/Structures/Doors/Airlocks/Glass/chemistry.rsi/sparks_open.png new file mode 100644 index 00000000000..630eabb976e Binary files /dev/null and b/Resources/Textures/DeltaV/Structures/Doors/Airlocks/Glass/chemistry.rsi/sparks_open.png differ diff --git a/Resources/Textures/DeltaV/Structures/Doors/Airlocks/Glass/chemistry.rsi/welded.png b/Resources/Textures/DeltaV/Structures/Doors/Airlocks/Glass/chemistry.rsi/welded.png new file mode 100644 index 00000000000..cd44689455c Binary files /dev/null and b/Resources/Textures/DeltaV/Structures/Doors/Airlocks/Glass/chemistry.rsi/welded.png differ diff --git a/Resources/Textures/DeltaV/Structures/Doors/Airlocks/Glass/hydroponics.rsi/assembly.png b/Resources/Textures/DeltaV/Structures/Doors/Airlocks/Glass/hydroponics.rsi/assembly.png new file mode 100644 index 00000000000..7ee614586b6 Binary files /dev/null and b/Resources/Textures/DeltaV/Structures/Doors/Airlocks/Glass/hydroponics.rsi/assembly.png differ diff --git a/Resources/Textures/DeltaV/Structures/Doors/Airlocks/Glass/hydroponics.rsi/bolted_unlit.png b/Resources/Textures/DeltaV/Structures/Doors/Airlocks/Glass/hydroponics.rsi/bolted_unlit.png new file mode 100644 index 00000000000..653846c3022 Binary files /dev/null and b/Resources/Textures/DeltaV/Structures/Doors/Airlocks/Glass/hydroponics.rsi/bolted_unlit.png differ diff --git a/Resources/Textures/DeltaV/Structures/Doors/Airlocks/Glass/hydroponics.rsi/closed.png b/Resources/Textures/DeltaV/Structures/Doors/Airlocks/Glass/hydroponics.rsi/closed.png new file mode 100644 index 00000000000..b3800c1537a Binary files /dev/null and b/Resources/Textures/DeltaV/Structures/Doors/Airlocks/Glass/hydroponics.rsi/closed.png differ diff --git a/Resources/Textures/DeltaV/Structures/Doors/Airlocks/Glass/hydroponics.rsi/closed_unlit.png b/Resources/Textures/DeltaV/Structures/Doors/Airlocks/Glass/hydroponics.rsi/closed_unlit.png new file mode 100644 index 00000000000..cc185dfdb5a Binary files /dev/null and b/Resources/Textures/DeltaV/Structures/Doors/Airlocks/Glass/hydroponics.rsi/closed_unlit.png differ diff --git a/Resources/Textures/DeltaV/Structures/Doors/Airlocks/Glass/hydroponics.rsi/closing.png b/Resources/Textures/DeltaV/Structures/Doors/Airlocks/Glass/hydroponics.rsi/closing.png new file mode 100644 index 00000000000..023dc733285 Binary files /dev/null and b/Resources/Textures/DeltaV/Structures/Doors/Airlocks/Glass/hydroponics.rsi/closing.png differ diff --git a/Resources/Textures/DeltaV/Structures/Doors/Airlocks/Glass/hydroponics.rsi/closing_unlit.png b/Resources/Textures/DeltaV/Structures/Doors/Airlocks/Glass/hydroponics.rsi/closing_unlit.png new file mode 100644 index 00000000000..7498990a390 Binary files /dev/null and b/Resources/Textures/DeltaV/Structures/Doors/Airlocks/Glass/hydroponics.rsi/closing_unlit.png differ diff --git a/Resources/Textures/DeltaV/Structures/Doors/Airlocks/Glass/hydroponics.rsi/deny_unlit.png b/Resources/Textures/DeltaV/Structures/Doors/Airlocks/Glass/hydroponics.rsi/deny_unlit.png new file mode 100644 index 00000000000..8c381d4c61e Binary files /dev/null and b/Resources/Textures/DeltaV/Structures/Doors/Airlocks/Glass/hydroponics.rsi/deny_unlit.png differ diff --git a/Resources/Textures/DeltaV/Structures/Doors/Airlocks/Glass/hydroponics.rsi/emergency_unlit.png b/Resources/Textures/DeltaV/Structures/Doors/Airlocks/Glass/hydroponics.rsi/emergency_unlit.png new file mode 100644 index 00000000000..f210ecf123e Binary files /dev/null and b/Resources/Textures/DeltaV/Structures/Doors/Airlocks/Glass/hydroponics.rsi/emergency_unlit.png differ diff --git a/Resources/Textures/DeltaV/Structures/Doors/Airlocks/Glass/hydroponics.rsi/meta.json b/Resources/Textures/DeltaV/Structures/Doors/Airlocks/Glass/hydroponics.rsi/meta.json new file mode 100644 index 00000000000..9229d5ffd0a --- /dev/null +++ b/Resources/Textures/DeltaV/Structures/Doors/Airlocks/Glass/hydroponics.rsi/meta.json @@ -0,0 +1,195 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Redrawn assets https://github.com/ParadiseSS13/Paradise/, redrawing done by Unkn0wn_Gh0st333 on github", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "assembly" + }, + { + "name": "bolted_unlit" + }, + { + "name": "closed" + }, + { + "name": "closed_unlit" + }, + { + "name": "closing", + "delays": [ + [ + 0.1, + 0.1, + 0.07, + 0.07, + 0.07, + 0.2 + ] + ] + }, + { + "name": "closing_unlit", + "delays": [ + [ + 0.1, + 0.1, + 0.07, + 0.07, + 0.07, + 0.2 + ] + ] + }, + { + "name": "deny_unlit", + "delays": [ + [ + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1 + ] + ] + }, + { + "name": "open", + "delays": [ + [ + 1 + ] + ] + }, + { + "name": "opening", + "delays": [ + [ + 0.1, + 0.1, + 0.07, + 0.07, + 0.07, + 0.2 + ] + ] + }, + { + "name": "opening_unlit", + "delays": [ + [ + 0.1, + 0.1, + 0.07, + 0.07, + 0.07, + 0.2 + ] + ] + }, + { + "name": "panel_closing", + "delays": [ + [ + 0.1, + 0.1, + 0.07, + 0.07, + 0.07, + 0.2 + ] + ] + }, + { + "name": "panel_open", + "delays": [ + [ + 1 + ] + ] + }, + { + "name": "panel_opening", + "delays": [ + [ + 0.1, + 0.1, + 0.07, + 0.07, + 0.07, + 0.2 + ] + ] + }, + { + "name": "sparks", + "delays": [ + [ + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1 + ] + ] + }, + { + "name": "sparks_broken", + "delays": [ + [ + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1 + ] + ] + }, + { + "name": "sparks_damaged", + "delays": [ + [ + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 1.7 + ] + ] + }, + { + "name": "sparks_open", + "delays": [ + [ + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1 + ] + ] + }, + { + "name": "welded" + }, + { + "name": "emergency_unlit", + "delays": [ + [ + 0.4, + 0.4 + ] + ] + } + ] +} diff --git a/Resources/Textures/DeltaV/Structures/Doors/Airlocks/Glass/hydroponics.rsi/open.png b/Resources/Textures/DeltaV/Structures/Doors/Airlocks/Glass/hydroponics.rsi/open.png new file mode 100644 index 00000000000..caec4c3ed67 Binary files /dev/null and b/Resources/Textures/DeltaV/Structures/Doors/Airlocks/Glass/hydroponics.rsi/open.png differ diff --git a/Resources/Textures/DeltaV/Structures/Doors/Airlocks/Glass/hydroponics.rsi/opening.png b/Resources/Textures/DeltaV/Structures/Doors/Airlocks/Glass/hydroponics.rsi/opening.png new file mode 100644 index 00000000000..a8bb2a8171c Binary files /dev/null and b/Resources/Textures/DeltaV/Structures/Doors/Airlocks/Glass/hydroponics.rsi/opening.png differ diff --git a/Resources/Textures/DeltaV/Structures/Doors/Airlocks/Glass/hydroponics.rsi/opening_unlit.png b/Resources/Textures/DeltaV/Structures/Doors/Airlocks/Glass/hydroponics.rsi/opening_unlit.png new file mode 100644 index 00000000000..2e109950a4e Binary files /dev/null and b/Resources/Textures/DeltaV/Structures/Doors/Airlocks/Glass/hydroponics.rsi/opening_unlit.png differ diff --git a/Resources/Textures/DeltaV/Structures/Doors/Airlocks/Glass/hydroponics.rsi/panel_closing.png b/Resources/Textures/DeltaV/Structures/Doors/Airlocks/Glass/hydroponics.rsi/panel_closing.png new file mode 100644 index 00000000000..4a0d28b65b4 Binary files /dev/null and b/Resources/Textures/DeltaV/Structures/Doors/Airlocks/Glass/hydroponics.rsi/panel_closing.png differ diff --git a/Resources/Textures/DeltaV/Structures/Doors/Airlocks/Glass/hydroponics.rsi/panel_open.png b/Resources/Textures/DeltaV/Structures/Doors/Airlocks/Glass/hydroponics.rsi/panel_open.png new file mode 100644 index 00000000000..2e348983fef Binary files /dev/null and b/Resources/Textures/DeltaV/Structures/Doors/Airlocks/Glass/hydroponics.rsi/panel_open.png differ diff --git a/Resources/Textures/DeltaV/Structures/Doors/Airlocks/Glass/hydroponics.rsi/panel_opening.png b/Resources/Textures/DeltaV/Structures/Doors/Airlocks/Glass/hydroponics.rsi/panel_opening.png new file mode 100644 index 00000000000..899651c3044 Binary files /dev/null and b/Resources/Textures/DeltaV/Structures/Doors/Airlocks/Glass/hydroponics.rsi/panel_opening.png differ diff --git a/Resources/Textures/DeltaV/Structures/Doors/Airlocks/Glass/hydroponics.rsi/sparks.png b/Resources/Textures/DeltaV/Structures/Doors/Airlocks/Glass/hydroponics.rsi/sparks.png new file mode 100644 index 00000000000..dd67e88a315 Binary files /dev/null and b/Resources/Textures/DeltaV/Structures/Doors/Airlocks/Glass/hydroponics.rsi/sparks.png differ diff --git a/Resources/Textures/DeltaV/Structures/Doors/Airlocks/Glass/hydroponics.rsi/sparks_broken.png b/Resources/Textures/DeltaV/Structures/Doors/Airlocks/Glass/hydroponics.rsi/sparks_broken.png new file mode 100644 index 00000000000..fb5d774588a Binary files /dev/null and b/Resources/Textures/DeltaV/Structures/Doors/Airlocks/Glass/hydroponics.rsi/sparks_broken.png differ diff --git a/Resources/Textures/DeltaV/Structures/Doors/Airlocks/Glass/hydroponics.rsi/sparks_damaged.png b/Resources/Textures/DeltaV/Structures/Doors/Airlocks/Glass/hydroponics.rsi/sparks_damaged.png new file mode 100644 index 00000000000..f16a028dee5 Binary files /dev/null and b/Resources/Textures/DeltaV/Structures/Doors/Airlocks/Glass/hydroponics.rsi/sparks_damaged.png differ diff --git a/Resources/Textures/DeltaV/Structures/Doors/Airlocks/Glass/hydroponics.rsi/sparks_open.png b/Resources/Textures/DeltaV/Structures/Doors/Airlocks/Glass/hydroponics.rsi/sparks_open.png new file mode 100644 index 00000000000..630eabb976e Binary files /dev/null and b/Resources/Textures/DeltaV/Structures/Doors/Airlocks/Glass/hydroponics.rsi/sparks_open.png differ diff --git a/Resources/Textures/DeltaV/Structures/Doors/Airlocks/Glass/hydroponics.rsi/welded.png b/Resources/Textures/DeltaV/Structures/Doors/Airlocks/Glass/hydroponics.rsi/welded.png new file mode 100644 index 00000000000..cd44689455c Binary files /dev/null and b/Resources/Textures/DeltaV/Structures/Doors/Airlocks/Glass/hydroponics.rsi/welded.png differ diff --git a/Resources/Textures/DeltaV/Structures/Doors/Airlocks/Standard/chemistry.rsi/assembly.png b/Resources/Textures/DeltaV/Structures/Doors/Airlocks/Standard/chemistry.rsi/assembly.png new file mode 100644 index 00000000000..7ca79b67e9f Binary files /dev/null and b/Resources/Textures/DeltaV/Structures/Doors/Airlocks/Standard/chemistry.rsi/assembly.png differ diff --git a/Resources/Textures/DeltaV/Structures/Doors/Airlocks/Standard/chemistry.rsi/bolted_unlit.png b/Resources/Textures/DeltaV/Structures/Doors/Airlocks/Standard/chemistry.rsi/bolted_unlit.png new file mode 100644 index 00000000000..653846c3022 Binary files /dev/null and b/Resources/Textures/DeltaV/Structures/Doors/Airlocks/Standard/chemistry.rsi/bolted_unlit.png differ diff --git a/Resources/Textures/DeltaV/Structures/Doors/Airlocks/Standard/chemistry.rsi/closed.png b/Resources/Textures/DeltaV/Structures/Doors/Airlocks/Standard/chemistry.rsi/closed.png new file mode 100644 index 00000000000..49741d65a86 Binary files /dev/null and b/Resources/Textures/DeltaV/Structures/Doors/Airlocks/Standard/chemistry.rsi/closed.png differ diff --git a/Resources/Textures/DeltaV/Structures/Doors/Airlocks/Standard/chemistry.rsi/closed_unlit.png b/Resources/Textures/DeltaV/Structures/Doors/Airlocks/Standard/chemistry.rsi/closed_unlit.png new file mode 100644 index 00000000000..cc185dfdb5a Binary files /dev/null and b/Resources/Textures/DeltaV/Structures/Doors/Airlocks/Standard/chemistry.rsi/closed_unlit.png differ diff --git a/Resources/Textures/DeltaV/Structures/Doors/Airlocks/Standard/chemistry.rsi/closing.png b/Resources/Textures/DeltaV/Structures/Doors/Airlocks/Standard/chemistry.rsi/closing.png new file mode 100644 index 00000000000..798f613e9ff Binary files /dev/null and b/Resources/Textures/DeltaV/Structures/Doors/Airlocks/Standard/chemistry.rsi/closing.png differ diff --git a/Resources/Textures/DeltaV/Structures/Doors/Airlocks/Standard/chemistry.rsi/closing_unlit.png b/Resources/Textures/DeltaV/Structures/Doors/Airlocks/Standard/chemistry.rsi/closing_unlit.png new file mode 100644 index 00000000000..7498990a390 Binary files /dev/null and b/Resources/Textures/DeltaV/Structures/Doors/Airlocks/Standard/chemistry.rsi/closing_unlit.png differ diff --git a/Resources/Textures/DeltaV/Structures/Doors/Airlocks/Standard/chemistry.rsi/deny_unlit.png b/Resources/Textures/DeltaV/Structures/Doors/Airlocks/Standard/chemistry.rsi/deny_unlit.png new file mode 100644 index 00000000000..8c381d4c61e Binary files /dev/null and b/Resources/Textures/DeltaV/Structures/Doors/Airlocks/Standard/chemistry.rsi/deny_unlit.png differ diff --git a/Resources/Textures/DeltaV/Structures/Doors/Airlocks/Standard/chemistry.rsi/emergency_unlit.png b/Resources/Textures/DeltaV/Structures/Doors/Airlocks/Standard/chemistry.rsi/emergency_unlit.png new file mode 100644 index 00000000000..f210ecf123e Binary files /dev/null and b/Resources/Textures/DeltaV/Structures/Doors/Airlocks/Standard/chemistry.rsi/emergency_unlit.png differ diff --git a/Resources/Textures/DeltaV/Structures/Doors/Airlocks/Standard/chemistry.rsi/meta.json b/Resources/Textures/DeltaV/Structures/Doors/Airlocks/Standard/chemistry.rsi/meta.json new file mode 100644 index 00000000000..9229d5ffd0a --- /dev/null +++ b/Resources/Textures/DeltaV/Structures/Doors/Airlocks/Standard/chemistry.rsi/meta.json @@ -0,0 +1,195 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Redrawn assets https://github.com/ParadiseSS13/Paradise/, redrawing done by Unkn0wn_Gh0st333 on github", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "assembly" + }, + { + "name": "bolted_unlit" + }, + { + "name": "closed" + }, + { + "name": "closed_unlit" + }, + { + "name": "closing", + "delays": [ + [ + 0.1, + 0.1, + 0.07, + 0.07, + 0.07, + 0.2 + ] + ] + }, + { + "name": "closing_unlit", + "delays": [ + [ + 0.1, + 0.1, + 0.07, + 0.07, + 0.07, + 0.2 + ] + ] + }, + { + "name": "deny_unlit", + "delays": [ + [ + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1 + ] + ] + }, + { + "name": "open", + "delays": [ + [ + 1 + ] + ] + }, + { + "name": "opening", + "delays": [ + [ + 0.1, + 0.1, + 0.07, + 0.07, + 0.07, + 0.2 + ] + ] + }, + { + "name": "opening_unlit", + "delays": [ + [ + 0.1, + 0.1, + 0.07, + 0.07, + 0.07, + 0.2 + ] + ] + }, + { + "name": "panel_closing", + "delays": [ + [ + 0.1, + 0.1, + 0.07, + 0.07, + 0.07, + 0.2 + ] + ] + }, + { + "name": "panel_open", + "delays": [ + [ + 1 + ] + ] + }, + { + "name": "panel_opening", + "delays": [ + [ + 0.1, + 0.1, + 0.07, + 0.07, + 0.07, + 0.2 + ] + ] + }, + { + "name": "sparks", + "delays": [ + [ + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1 + ] + ] + }, + { + "name": "sparks_broken", + "delays": [ + [ + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1 + ] + ] + }, + { + "name": "sparks_damaged", + "delays": [ + [ + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 1.7 + ] + ] + }, + { + "name": "sparks_open", + "delays": [ + [ + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1 + ] + ] + }, + { + "name": "welded" + }, + { + "name": "emergency_unlit", + "delays": [ + [ + 0.4, + 0.4 + ] + ] + } + ] +} diff --git a/Resources/Textures/DeltaV/Structures/Doors/Airlocks/Standard/chemistry.rsi/open.png b/Resources/Textures/DeltaV/Structures/Doors/Airlocks/Standard/chemistry.rsi/open.png new file mode 100644 index 00000000000..bb1e22de6b8 Binary files /dev/null and b/Resources/Textures/DeltaV/Structures/Doors/Airlocks/Standard/chemistry.rsi/open.png differ diff --git a/Resources/Textures/DeltaV/Structures/Doors/Airlocks/Standard/chemistry.rsi/opening.png b/Resources/Textures/DeltaV/Structures/Doors/Airlocks/Standard/chemistry.rsi/opening.png new file mode 100644 index 00000000000..ae85cf6e2f8 Binary files /dev/null and b/Resources/Textures/DeltaV/Structures/Doors/Airlocks/Standard/chemistry.rsi/opening.png differ diff --git a/Resources/Textures/DeltaV/Structures/Doors/Airlocks/Standard/chemistry.rsi/opening_unlit.png b/Resources/Textures/DeltaV/Structures/Doors/Airlocks/Standard/chemistry.rsi/opening_unlit.png new file mode 100644 index 00000000000..2e109950a4e Binary files /dev/null and b/Resources/Textures/DeltaV/Structures/Doors/Airlocks/Standard/chemistry.rsi/opening_unlit.png differ diff --git a/Resources/Textures/DeltaV/Structures/Doors/Airlocks/Standard/chemistry.rsi/panel_closing.png b/Resources/Textures/DeltaV/Structures/Doors/Airlocks/Standard/chemistry.rsi/panel_closing.png new file mode 100644 index 00000000000..4a0d28b65b4 Binary files /dev/null and b/Resources/Textures/DeltaV/Structures/Doors/Airlocks/Standard/chemistry.rsi/panel_closing.png differ diff --git a/Resources/Textures/DeltaV/Structures/Doors/Airlocks/Standard/chemistry.rsi/panel_open.png b/Resources/Textures/DeltaV/Structures/Doors/Airlocks/Standard/chemistry.rsi/panel_open.png new file mode 100644 index 00000000000..2e348983fef Binary files /dev/null and b/Resources/Textures/DeltaV/Structures/Doors/Airlocks/Standard/chemistry.rsi/panel_open.png differ diff --git a/Resources/Textures/DeltaV/Structures/Doors/Airlocks/Standard/chemistry.rsi/panel_opening.png b/Resources/Textures/DeltaV/Structures/Doors/Airlocks/Standard/chemistry.rsi/panel_opening.png new file mode 100644 index 00000000000..899651c3044 Binary files /dev/null and b/Resources/Textures/DeltaV/Structures/Doors/Airlocks/Standard/chemistry.rsi/panel_opening.png differ diff --git a/Resources/Textures/DeltaV/Structures/Doors/Airlocks/Standard/chemistry.rsi/sparks.png b/Resources/Textures/DeltaV/Structures/Doors/Airlocks/Standard/chemistry.rsi/sparks.png new file mode 100644 index 00000000000..dd67e88a315 Binary files /dev/null and b/Resources/Textures/DeltaV/Structures/Doors/Airlocks/Standard/chemistry.rsi/sparks.png differ diff --git a/Resources/Textures/DeltaV/Structures/Doors/Airlocks/Standard/chemistry.rsi/sparks_broken.png b/Resources/Textures/DeltaV/Structures/Doors/Airlocks/Standard/chemistry.rsi/sparks_broken.png new file mode 100644 index 00000000000..fb5d774588a Binary files /dev/null and b/Resources/Textures/DeltaV/Structures/Doors/Airlocks/Standard/chemistry.rsi/sparks_broken.png differ diff --git a/Resources/Textures/DeltaV/Structures/Doors/Airlocks/Standard/chemistry.rsi/sparks_damaged.png b/Resources/Textures/DeltaV/Structures/Doors/Airlocks/Standard/chemistry.rsi/sparks_damaged.png new file mode 100644 index 00000000000..f16a028dee5 Binary files /dev/null and b/Resources/Textures/DeltaV/Structures/Doors/Airlocks/Standard/chemistry.rsi/sparks_damaged.png differ diff --git a/Resources/Textures/DeltaV/Structures/Doors/Airlocks/Standard/chemistry.rsi/sparks_open.png b/Resources/Textures/DeltaV/Structures/Doors/Airlocks/Standard/chemistry.rsi/sparks_open.png new file mode 100644 index 00000000000..630eabb976e Binary files /dev/null and b/Resources/Textures/DeltaV/Structures/Doors/Airlocks/Standard/chemistry.rsi/sparks_open.png differ diff --git a/Resources/Textures/DeltaV/Structures/Doors/Airlocks/Standard/chemistry.rsi/welded.png b/Resources/Textures/DeltaV/Structures/Doors/Airlocks/Standard/chemistry.rsi/welded.png new file mode 100644 index 00000000000..cd44689455c Binary files /dev/null and b/Resources/Textures/DeltaV/Structures/Doors/Airlocks/Standard/chemistry.rsi/welded.png differ diff --git a/Resources/Textures/DeltaV/Structures/Doors/Airlocks/Standard/hydroponics.rsi/assembly.png b/Resources/Textures/DeltaV/Structures/Doors/Airlocks/Standard/hydroponics.rsi/assembly.png new file mode 100644 index 00000000000..5cf053a10fc Binary files /dev/null and b/Resources/Textures/DeltaV/Structures/Doors/Airlocks/Standard/hydroponics.rsi/assembly.png differ diff --git a/Resources/Textures/DeltaV/Structures/Doors/Airlocks/Standard/hydroponics.rsi/bolted_unlit.png b/Resources/Textures/DeltaV/Structures/Doors/Airlocks/Standard/hydroponics.rsi/bolted_unlit.png new file mode 100644 index 00000000000..653846c3022 Binary files /dev/null and b/Resources/Textures/DeltaV/Structures/Doors/Airlocks/Standard/hydroponics.rsi/bolted_unlit.png differ diff --git a/Resources/Textures/DeltaV/Structures/Doors/Airlocks/Standard/hydroponics.rsi/closed.png b/Resources/Textures/DeltaV/Structures/Doors/Airlocks/Standard/hydroponics.rsi/closed.png new file mode 100644 index 00000000000..85f8f12a3b7 Binary files /dev/null and b/Resources/Textures/DeltaV/Structures/Doors/Airlocks/Standard/hydroponics.rsi/closed.png differ diff --git a/Resources/Textures/DeltaV/Structures/Doors/Airlocks/Standard/hydroponics.rsi/closed_unlit.png b/Resources/Textures/DeltaV/Structures/Doors/Airlocks/Standard/hydroponics.rsi/closed_unlit.png new file mode 100644 index 00000000000..cc185dfdb5a Binary files /dev/null and b/Resources/Textures/DeltaV/Structures/Doors/Airlocks/Standard/hydroponics.rsi/closed_unlit.png differ diff --git a/Resources/Textures/DeltaV/Structures/Doors/Airlocks/Standard/hydroponics.rsi/closing.png b/Resources/Textures/DeltaV/Structures/Doors/Airlocks/Standard/hydroponics.rsi/closing.png new file mode 100644 index 00000000000..15ed52a8498 Binary files /dev/null and b/Resources/Textures/DeltaV/Structures/Doors/Airlocks/Standard/hydroponics.rsi/closing.png differ diff --git a/Resources/Textures/DeltaV/Structures/Doors/Airlocks/Standard/hydroponics.rsi/closing_unlit.png b/Resources/Textures/DeltaV/Structures/Doors/Airlocks/Standard/hydroponics.rsi/closing_unlit.png new file mode 100644 index 00000000000..7498990a390 Binary files /dev/null and b/Resources/Textures/DeltaV/Structures/Doors/Airlocks/Standard/hydroponics.rsi/closing_unlit.png differ diff --git a/Resources/Textures/DeltaV/Structures/Doors/Airlocks/Standard/hydroponics.rsi/deny_unlit.png b/Resources/Textures/DeltaV/Structures/Doors/Airlocks/Standard/hydroponics.rsi/deny_unlit.png new file mode 100644 index 00000000000..8c381d4c61e Binary files /dev/null and b/Resources/Textures/DeltaV/Structures/Doors/Airlocks/Standard/hydroponics.rsi/deny_unlit.png differ diff --git a/Resources/Textures/DeltaV/Structures/Doors/Airlocks/Standard/hydroponics.rsi/emergency_unlit.png b/Resources/Textures/DeltaV/Structures/Doors/Airlocks/Standard/hydroponics.rsi/emergency_unlit.png new file mode 100644 index 00000000000..f210ecf123e Binary files /dev/null and b/Resources/Textures/DeltaV/Structures/Doors/Airlocks/Standard/hydroponics.rsi/emergency_unlit.png differ diff --git a/Resources/Textures/DeltaV/Structures/Doors/Airlocks/Standard/hydroponics.rsi/meta.json b/Resources/Textures/DeltaV/Structures/Doors/Airlocks/Standard/hydroponics.rsi/meta.json new file mode 100644 index 00000000000..9229d5ffd0a --- /dev/null +++ b/Resources/Textures/DeltaV/Structures/Doors/Airlocks/Standard/hydroponics.rsi/meta.json @@ -0,0 +1,195 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Redrawn assets https://github.com/ParadiseSS13/Paradise/, redrawing done by Unkn0wn_Gh0st333 on github", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "assembly" + }, + { + "name": "bolted_unlit" + }, + { + "name": "closed" + }, + { + "name": "closed_unlit" + }, + { + "name": "closing", + "delays": [ + [ + 0.1, + 0.1, + 0.07, + 0.07, + 0.07, + 0.2 + ] + ] + }, + { + "name": "closing_unlit", + "delays": [ + [ + 0.1, + 0.1, + 0.07, + 0.07, + 0.07, + 0.2 + ] + ] + }, + { + "name": "deny_unlit", + "delays": [ + [ + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1 + ] + ] + }, + { + "name": "open", + "delays": [ + [ + 1 + ] + ] + }, + { + "name": "opening", + "delays": [ + [ + 0.1, + 0.1, + 0.07, + 0.07, + 0.07, + 0.2 + ] + ] + }, + { + "name": "opening_unlit", + "delays": [ + [ + 0.1, + 0.1, + 0.07, + 0.07, + 0.07, + 0.2 + ] + ] + }, + { + "name": "panel_closing", + "delays": [ + [ + 0.1, + 0.1, + 0.07, + 0.07, + 0.07, + 0.2 + ] + ] + }, + { + "name": "panel_open", + "delays": [ + [ + 1 + ] + ] + }, + { + "name": "panel_opening", + "delays": [ + [ + 0.1, + 0.1, + 0.07, + 0.07, + 0.07, + 0.2 + ] + ] + }, + { + "name": "sparks", + "delays": [ + [ + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1 + ] + ] + }, + { + "name": "sparks_broken", + "delays": [ + [ + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1 + ] + ] + }, + { + "name": "sparks_damaged", + "delays": [ + [ + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 1.7 + ] + ] + }, + { + "name": "sparks_open", + "delays": [ + [ + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1 + ] + ] + }, + { + "name": "welded" + }, + { + "name": "emergency_unlit", + "delays": [ + [ + 0.4, + 0.4 + ] + ] + } + ] +} diff --git a/Resources/Textures/DeltaV/Structures/Doors/Airlocks/Standard/hydroponics.rsi/open.png b/Resources/Textures/DeltaV/Structures/Doors/Airlocks/Standard/hydroponics.rsi/open.png new file mode 100644 index 00000000000..9b0c28b3f9b Binary files /dev/null and b/Resources/Textures/DeltaV/Structures/Doors/Airlocks/Standard/hydroponics.rsi/open.png differ diff --git a/Resources/Textures/DeltaV/Structures/Doors/Airlocks/Standard/hydroponics.rsi/opening.png b/Resources/Textures/DeltaV/Structures/Doors/Airlocks/Standard/hydroponics.rsi/opening.png new file mode 100644 index 00000000000..9cbd551c278 Binary files /dev/null and b/Resources/Textures/DeltaV/Structures/Doors/Airlocks/Standard/hydroponics.rsi/opening.png differ diff --git a/Resources/Textures/DeltaV/Structures/Doors/Airlocks/Standard/hydroponics.rsi/opening_unlit.png b/Resources/Textures/DeltaV/Structures/Doors/Airlocks/Standard/hydroponics.rsi/opening_unlit.png new file mode 100644 index 00000000000..2e109950a4e Binary files /dev/null and b/Resources/Textures/DeltaV/Structures/Doors/Airlocks/Standard/hydroponics.rsi/opening_unlit.png differ diff --git a/Resources/Textures/DeltaV/Structures/Doors/Airlocks/Standard/hydroponics.rsi/panel_closing.png b/Resources/Textures/DeltaV/Structures/Doors/Airlocks/Standard/hydroponics.rsi/panel_closing.png new file mode 100644 index 00000000000..4a0d28b65b4 Binary files /dev/null and b/Resources/Textures/DeltaV/Structures/Doors/Airlocks/Standard/hydroponics.rsi/panel_closing.png differ diff --git a/Resources/Textures/DeltaV/Structures/Doors/Airlocks/Standard/hydroponics.rsi/panel_open.png b/Resources/Textures/DeltaV/Structures/Doors/Airlocks/Standard/hydroponics.rsi/panel_open.png new file mode 100644 index 00000000000..2e348983fef Binary files /dev/null and b/Resources/Textures/DeltaV/Structures/Doors/Airlocks/Standard/hydroponics.rsi/panel_open.png differ diff --git a/Resources/Textures/DeltaV/Structures/Doors/Airlocks/Standard/hydroponics.rsi/panel_opening.png b/Resources/Textures/DeltaV/Structures/Doors/Airlocks/Standard/hydroponics.rsi/panel_opening.png new file mode 100644 index 00000000000..899651c3044 Binary files /dev/null and b/Resources/Textures/DeltaV/Structures/Doors/Airlocks/Standard/hydroponics.rsi/panel_opening.png differ diff --git a/Resources/Textures/DeltaV/Structures/Doors/Airlocks/Standard/hydroponics.rsi/sparks.png b/Resources/Textures/DeltaV/Structures/Doors/Airlocks/Standard/hydroponics.rsi/sparks.png new file mode 100644 index 00000000000..dd67e88a315 Binary files /dev/null and b/Resources/Textures/DeltaV/Structures/Doors/Airlocks/Standard/hydroponics.rsi/sparks.png differ diff --git a/Resources/Textures/DeltaV/Structures/Doors/Airlocks/Standard/hydroponics.rsi/sparks_broken.png b/Resources/Textures/DeltaV/Structures/Doors/Airlocks/Standard/hydroponics.rsi/sparks_broken.png new file mode 100644 index 00000000000..fb5d774588a Binary files /dev/null and b/Resources/Textures/DeltaV/Structures/Doors/Airlocks/Standard/hydroponics.rsi/sparks_broken.png differ diff --git a/Resources/Textures/DeltaV/Structures/Doors/Airlocks/Standard/hydroponics.rsi/sparks_damaged.png b/Resources/Textures/DeltaV/Structures/Doors/Airlocks/Standard/hydroponics.rsi/sparks_damaged.png new file mode 100644 index 00000000000..f16a028dee5 Binary files /dev/null and b/Resources/Textures/DeltaV/Structures/Doors/Airlocks/Standard/hydroponics.rsi/sparks_damaged.png differ diff --git a/Resources/Textures/DeltaV/Structures/Doors/Airlocks/Standard/hydroponics.rsi/sparks_open.png b/Resources/Textures/DeltaV/Structures/Doors/Airlocks/Standard/hydroponics.rsi/sparks_open.png new file mode 100644 index 00000000000..630eabb976e Binary files /dev/null and b/Resources/Textures/DeltaV/Structures/Doors/Airlocks/Standard/hydroponics.rsi/sparks_open.png differ diff --git a/Resources/Textures/DeltaV/Structures/Doors/Airlocks/Standard/hydroponics.rsi/welded.png b/Resources/Textures/DeltaV/Structures/Doors/Airlocks/Standard/hydroponics.rsi/welded.png new file mode 100644 index 00000000000..cd44689455c Binary files /dev/null and b/Resources/Textures/DeltaV/Structures/Doors/Airlocks/Standard/hydroponics.rsi/welded.png differ