diff --git a/Content.Server/_DV/DeviceLinking/Components/DeadMansSignallerComponent.cs b/Content.Server/_DV/DeviceLinking/Components/DeadMansSignallerComponent.cs new file mode 100644 index 00000000000..1d887c205a2 --- /dev/null +++ b/Content.Server/_DV/DeviceLinking/Components/DeadMansSignallerComponent.cs @@ -0,0 +1,14 @@ +using Content.Shared.DeviceLinking; +using Robust.Shared.Prototypes; + +namespace Content.Server._DV.DeviceLinking.Components; + +[RegisterComponent] +public sealed partial class DeadMansSignallerComponent : Component +{ + /// + /// The port that gets signaled when the switch turns on. + /// + [DataField] + public ProtoId Port = "Pressed"; +} diff --git a/Content.Server/_DV/DeviceLinking/Systems/DeadMansSignallerSystem.cs b/Content.Server/_DV/DeviceLinking/Systems/DeadMansSignallerSystem.cs new file mode 100644 index 00000000000..6f18a12b69c --- /dev/null +++ b/Content.Server/_DV/DeviceLinking/Systems/DeadMansSignallerSystem.cs @@ -0,0 +1,27 @@ +using Content.Server._DV.DeviceLinking.Components; +using Content.Server.DeviceLinking.Systems; +using Content.Shared.Hands; +using Content.Shared.Item.ItemToggle; + +namespace Content.Server._DV.DeviceLinking.Systems; + +public sealed class DeadMansSignallerSystem : EntitySystem +{ + [Dependency] private readonly DeviceLinkSystem _link = default!; + [Dependency] private readonly ItemToggleSystem _toggle = default!; + + public override void Initialize() + { + base.Initialize(); + + SubscribeLocalEvent(DeadMans); + } + + private void DeadMans(Entity ent, ref GotUnequippedHandEvent args) + { + if (_toggle.IsActivated(ent.Owner)) + { + _link.InvokePort(ent.Owner, ent.Comp.Port); + } + } +} diff --git a/Content.Shared/Buckle/SharedBuckleSystem.Buckle.cs b/Content.Shared/Buckle/SharedBuckleSystem.Buckle.cs index 8d04c9dcacf..14fa3932722 100644 --- a/Content.Shared/Buckle/SharedBuckleSystem.Buckle.cs +++ b/Content.Shared/Buckle/SharedBuckleSystem.Buckle.cs @@ -362,7 +362,6 @@ private void Buckle(Entity buckle, Entity strap _audio.PlayPredicted(strap.Comp.BuckleSound, strap, user); - SetBuckledTo(buckle, strap!); Appearance.SetData(strap, StrapVisuals.State, true); Appearance.SetData(buckle, BuckleVisuals.Buckled, true); @@ -384,6 +383,8 @@ private void Buckle(Entity buckle, Entity strap break; } + SetBuckledTo(buckle, strap!); // DeltaV - Allow standing system to handle Down/Stand before buckling + var ev = new StrappedEvent(strap, buckle); RaiseLocalEvent(strap, ref ev); diff --git a/Resources/Changelog/DeltaVChangelog.yml b/Resources/Changelog/DeltaVChangelog.yml index 8f7b312f0c0..ae92f0813af 100644 --- a/Resources/Changelog/DeltaVChangelog.yml +++ b/Resources/Changelog/DeltaVChangelog.yml @@ -1,20 +1,4 @@ Entries: -- author: jimmy12or - changes: - - message: Adds Crystalthistle! A plant that produces Quartzite! - type: Add - - message: Adds Quartzite! A reagent that turns into glass when heated! - type: Add - id: 440 - time: '2024-07-22T04:28:46.0000000+00:00' - url: https://github.com/DeltaV-Station/Delta-v/pull/1462 -- author: NullWanderer - changes: - - message: The security resprite has been reverted after admin discussion - type: Remove - id: 441 - time: '2024-07-22T07:56:03.0000000+00:00' - url: https://github.com/DeltaV-Station/Delta-v/pull/1517 - author: DangerRevolution changes: - message: Security Cyborgs have been authorised for use aboard Delta-V class stations. @@ -3859,3 +3843,17 @@ id: 939 time: '2025-01-19T00:33:45.0000000+00:00' url: https://github.com/DeltaV-Station/Delta-v/pull/2744 +- author: BarryNorfolk + changes: + - message: Fix the up/down when entities are buckled. + type: Fix + id: 940 + time: '2025-01-19T12:38:44.0000000+00:00' + url: https://github.com/DeltaV-Station/Delta-v/pull/2769 +- author: deltanedas + changes: + - message: Added a nitrous oxide tank to surgeon lockers. + type: Add + id: 941 + time: '2025-01-19T18:56:46.0000000+00:00' + url: https://github.com/DeltaV-Station/Delta-v/pull/2773 diff --git a/Resources/Credits/GitHub.txt b/Resources/Credits/GitHub.txt index a2507a874c3..89ed3ccb7a2 100644 --- a/Resources/Credits/GitHub.txt +++ b/Resources/Credits/GitHub.txt @@ -1 +1 @@ -0tito, 0x6273, 12rabbits, 13spacemen, 2013HORSEMEATSCANDAL, 20kdc, 21Melkuu, 2digitman, 3nderall, 4310v343k, 4dplanner, 612git, 778b, Ablankmann, abregado, Absolute-Potato, Acruid, actioninja, ActiveMammmoth, actually-reb, ada-please, adamsong, Adeinitas, Admiral-Obvious-001, adrian, Adrian16199, Ady4ik, Aerocrux, Aeshus, Aexolott, Aexxie, africalimedrop, afrokada, Agoichi, Ahion, aiden, Aikakakah, aitorlogedo, ajcm, AJCM-git, AjexRose, Alekshhh, alexkar598, AlexMorgan3817, alexum418, alexumandxgabriel08x, Alithsko, ALMv1, Alpaccalypse, Alpha-Two, AlphaQwerty, Altoids1, amatwiedle, 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, aspiringLich, astriloqua, august-sun, AutoOtter, Avalon-Proto, AverageNotDoingAnythingEnjoyer, avghdev, Awlod, azzy, AzzyIsNotHere, baa14453, BackeTako, BananaFlambe, Baptr0b0t, BarryNorfolk, BasedPugilist, BasedUser, Batuh1n, beck-thompson, BellwetherLogic, ben, benev0, benjamin-burges, BGare, bhespiritu, BIGZi0348, bingojohnson, BismarckShuffle, Bixkitts, Blackern5000, Blazeror, BlitzTheSquishy, bloodrizer, Bloody2372, blueDev2, Boaz1111, BobdaBiscuit, BobTheSleder, boiled-water-tsar, Booblesnoot42, boogiebogus, Boolean-Buckeye, botanySupremist, brainfood1183, BramvanZijp, Brandon-Huu, Bribrooo, Bright0, brndd, bryce0110, BubblegumBlue, buletsponge, buntobaggins, bvelliquette, byondfuckery, c0rigin, c4llv07e, CaasGit, Caconym27, Calecute, Callmore, capnsockless, CaptainMaru, CaptainSqrBeard, Carbonhell, Carolyn3114, Carou02, carteblanche4me, Catofquestionableethics, CatTheSystem, Centronias, chairbender, Charlese2, charlie, ChaseFlorom, chavonadelal, Cheackraze, CheddaCheez, 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, CrafterKolyan, crazybrain23, creadth, CrigCrag, croilbird, Crotalus, CrudeWax, CrzyPotato, cutemoongod, Cyberboss, d34d10cc, dabigoose, DadeKuma, Daemon, daerSeebaer, dahnte, dakamakat, DamianX, DangerRevolution, daniel-cr, DanSAussieITS, Daracke, DarkenedSynergy, Darkenson, DawBla, Daxxi3, dch-GH, de0rix, Deahaka, dean, DEATHB4DEFEAT, 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, dotcatshark, DoubleRiceEddiedd, DoutorWhite, dragonryan06, drakewill-CRL, Drayff, dreamlyjack, DrEnzyme, dribblydrone, DrMelon, drongood12, DrSingh, DrSmugleaf, drteaspoon420, DTanxxx, DubiousDoggo, Duddino, dukevanity, duskyjay, Dutch-VanDerLinde, dvir001, dylanstrategie, Dynexust, Easypoller, echo, eclips_e, eden077, EEASAS, Efruit, efzapa, ElectroSR, elsie, elthundercloud, Elysium206, Emily9031, Emisse, emmafornash, EmoGarbage404, Endecc, eoineoineoin, eris, erohrs2, ERORR404V1, Errant-4, esguard, estacaoespacialpirata, Eternally-Confused, eugene, ewokswagger, exincore, exp111, f0x-n3rd, FacePluslll, Fahasor, FairlySadPanda, FATFSAAM2, Feluk6174, ficcialfaint, FieldCommand, Fiftyllama, Fildrance, FillerVK, FinnishPaladin, firenamefn, 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, gamer3107, gansulalan, Gaxeer, gbasood, gcoremans, Geekyhobo, genderGeometries, GeneralGaws, Genkail, geraeumig, Ghagliiarghii, Git-Nivrak, githubuser508, gituhabu, GlassEclipse, gluesniffler, 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, HawkeyeBlade, he1acdvv, Hebi, Henry, HerCoyote23, HighTechPuddle, hitomishirichan, hiucko, Hmeister-fake, Hmeister-real, hobnob, HoidC, Holinka4ever, holyssss, HoofedEar, Hoolny, hord-brayden, Hreno, htmlsystem, hubismal, Hugal31, Huxellberger, Hyenh, hyphenationc, i-justuser-i, iacore, iamnotgray, IamVelcroboy, ian, icekot8, icesickleone, iczero, iglov, IgorAnt028, igorsaux, ike709, illersaver, Illiux, Ilushkins33, Ilya246, IlyaElDunaev, imrenq, imweax, indeano, Injazz, Insineer, IntegerTempest, Interrobang01, Intoxicating-Innocence, 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, joe, JoeHammad1844, JohnGinnane, johnku1, Jophire, joshepvodka, Jrpl, jtbill123, juliangiebel, juniwoofs, JustArt1m, JustCone14, justdie12, justin, justintether, JustinTrotter, JustinWinningham, justtne, K-Dynamic, k3yw, Kadeo64, Kaga-404, KaiShibaa, kalane15, kalanosh, Kanashi-Panda, katzenminer, kbailey-git, Keelin, Keer-Sar, KEEYNy, keikiru, Kelrak, kerisargit, keronshb, KIBORG04, KieueCaprie, Killerqu00, Kimpes, KingFroozy, kira-er, Kirillcas, Kirus59, Kistras, Kit0vras, KittenColony, klaypexx, Kmc2000, Ko4ergaPunk, kognise, kokoc9n, komunre, KonstantinAngelov, kosticia, koteq, Kr8art, KrasnoshchekovPavel, Krunklehorn, Kupie, Kurzaen, kxvvv, kyupolaris, kzhanik, lajolico, Lamrr, LankLTE, laok233, lapatison, larryrussian, lawdog4817, Lazzi0706, leander-0, leonardo-dabepis, leonidussaks, leonsfriedrich, LetterN, lettern, Level10Cybermancer, LEVELcat, lever1209, LevitatingTree, Lgibb18, lgruthes, LightVillet, liltenhead, LinkUyx, LioValkyria, Litraxx, LittleBuilderJane, LittleNyanCat, 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, mazzie, MehimoNemo, MeltedPixel, MemeProof, memoblob, MendaxxDev, Menshin, Mephisto72, MerrytheManokit, Mervill, metalgearsloth, MetalSage, MFMessage, mhamsterr, michaelcu, micheel665, mifia, MilenVolf, MilonPL, Minemoder5000, Minty642, Mirino97, mirrorcult, misandrie, MishaUnity, MissKay1994, MisterMecky, Mith-randalf, MjrLandWhale, mkanke-real, MLGTASTICa, mnemotechnician, moderatelyaware, modern-nm, mokiros, Moneyl, Monotheonist, Moomoobeef, moony, Morb0, MossyGreySlope, mr-bo-jangles, Mr0maks, MrFippik, mrrobdemo, muburu, 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, noelkathegod, 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, onesch, OnyxTheBrave, OrangeMoronage9622, osjarw, Ostaf, othymer, OttoMaticode, Owai-Seek, packmore, paige404, paigemaeforrest, pali6, Pangogie, panzer-iv1, paolordls, partyaddict, patrikturi, PaulRitter, peccneck, Peptide90, peptron1, PeterFuto, PetMudstone, pewter-wiz, Pgriha, Phantom-Lily, PHCodes, pheenty, Phill101, phunnyguy, PilgrimViis, Pill-U, pinkbat5, Piras314, Pireax, pissdemon, PixeltheAertistContrib, PixelTheKermit, PJB3005, Plasmaguy, plinyvic, Plykiya, pofitlo, pointer-to-null, pok27, poklj, PolterTzi, pontaoski, PoorMansDreams, PopGamer45, portfiend, potato1234x, PotentiallyTom, PPooch, ProfanedBane, ProPandaBear, PrPleGoo, ps3moira, Pspritechologist, Psychpsyo, psykana, psykzz, PuceTint, PuroSlavKing, PursuitInAshes, Putnam3145, qrtDaniil, quatre, QueerNB, QuietlyWhisper, qwerltaz, Radezolid, RadioMull, Radosvik, Radrark, Rainbeon, Rainfey, Raitononai, Ramlik, randy10122, Rane, Ranger6012, Rapidgame7, ravage123321, rbertoche, RedBookcase, Redfire1331, Redict, RedlineTriad, redmushie, RednoWCirabrab, ReeZer2, RemberBM, RemieRichards, RemTim, Remuchi, rene-descartes2021, Renlou, retequizzle, 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, SaphireLattice, SapphicOverload, sarahon, sativaleanne, SaveliyM360, sBasalto, ScalyChimp, ScarKy0, schrodinger71, scrato, Scribbles0, scrivoy, scruq445, scuffedjays, ScumbagDog, Segonist, sephtasm, Serkket, sewerpig, sh18rw, Shaddap1, ShadeAware, ShadowCommander, shadowtheprotogen546, shadowwailker, shaeone, shampunj, shariathotpatrol, ShatteredSwords, SignalWalker, siigiil, SimpleStation14, Simyon264, sirdragooon, Sirionaut, SirSmith148, Sk1tch, SkaldetSkaeg, Skarletto, Skrauz, Skyedra, SlamBamActionman, slarticodefast, Slava0135, sleepyyapril, Slyfox333, Smugman, snebl, sniperchance, Snowni, snowsignal, solaris7518, SonicHDC, SoulFN, SoulSloth, Soundwavesghost, southbridge-fur, Soydium, spacelizard, SpaceLizardSky, SpaceManiac, SpaceRox1244, SpaceyLady, Spanky, spartak, SpartanKadence, SpeltIncorrectyl, Spessmann, SphiraI, SplinterGP, spoogemonster, sporekto, sporkyz, Squishy77, SsalamethVersaach, ssdaniel24, stalengd, stanberytrask, Stanislav4ix, StanTheCarpenter, Stealthbomber16, stellar-novas, stomf, Stop-Signs, stopbreaking, stopka-html, StrawberryMoses, Stray-Pyramid, strO0pwafel, Strol20, StStevens, Subversionary, sunbear-dev, superjj18, Supernorn, SweptWasTaken, Sybil, SYNCHRONIC, Szunti, TadJohnson00, Tainakov, takemysoult, tap, TaralGit, Taran, taurie, Tayrtahn, tday93, teamaki, TekuNut, telyonok, TemporalOroboros, tentekal, terezi4real, Terraspark4941, texcruize, TGRCdev, tgrkzus, ThataKat, ThatGuyUSA, ThatOneGoblin25, thatrandomcanadianguy, TheArturZh, theashtronaut, thecopbennet, TheCze, TheDarkElites, thedraccx, TheEmber, TheIntoxicatedCat, thekilk, themias, theomund, TheOneWhoIsManyFrame, 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, Tomce795, Tomeno, Tonydatguy, topy, Tornado-Technology, tosatur, TotallyLemon, Tr1bute, 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, Vexerot, VigersRay, violet754, Visne, vitalvitriol, vlados1408, VMSolidus, voidnull000, volotomite, volundr-, Voomra, Vordenburg, vorkathbruh, vulppine, wafehling, Warentan, WarMechanic, Watermelon914, weaversam8, wertanchik, whateverusername0, widgetbeck, 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, zHonys, zionnBE, ZNixian, ZoldorfTheWizard, zonespace27, ZweiHawke, Zylofan, Zymem, zzylex +0tito, 0x6273, 12rabbits, 13spacemen, 2013HORSEMEATSCANDAL, 20kdc, 21Melkuu, 2digitman, 3nderall, 4310v343k, 4dplanner, 612git, 778b, Ablankmann, abregado, Absolute-Potato, Acruid, actioninja, ActiveMammmoth, actually-reb, ada-please, adamsong, Adeinitas, Admiral-Obvious-001, adrian, Adrian16199, Ady4ik, Aerocrux, Aeshus, Aexolott, Aexxie, africalimedrop, afrokada, Agoichi, Ahion, aiden, Aikakakah, aitorlogedo, ajcm, AJCM-git, AjexRose, Alekshhh, alexkar598, AlexMorgan3817, alexum418, alexumandxgabriel08x, Alithsko, ALMv1, Alpaccalypse, Alpha-Two, AlphaQwerty, Altoids1, amatwiedle, amylizzle, ancientpower, Andre19926, AndrewEyeke, AndreyCamper, angelofallars, Anzarot121, Appiah, ar4ill, ArchPigeon, ArchRBX, areitpog, Arendian, arimah, Arkanic, ArkiveDev, armoks, Arteben, ArthurMousatov, ArtisticRoomba, artur, ArZarLordOfMango, as334, AsikKEsel, AsnDen, asperger-sind, aspiringlich, aspiringLich, astriloqua, august-sun, AutoOtter, Avalon-Proto, AverageNotDoingAnythingEnjoyer, avghdev, Awlod, azzy, azzyisnothere, AzzyIsNotHere, baa14453, BackeTako, BananaFlambe, Baptr0b0t, BarryNorfolk, BasedPugilist, BasedUser, Batuh1n, beck-thompson, BellwetherLogic, ben, benev0, benjamin-burges, BGare, bhespiritu, BIGZi0348, bingojohnson, BismarckShuffle, Bixkitts, Blackern5000, Blazeror, BlitzTheSquishy, bloodrizer, Bloody2372, blueDev2, Boaz1111, BobdaBiscuit, BobTheSleder, boiled-water-tsar, Booblesnoot42, boogiebogus, Boolean-Buckeye, botanySupremist, brainfood1183, BramvanZijp, Brandon-Huu, Bribrooo, Bright0, brndd, bryce0110, BubblegumBlue, buletsponge, buntobaggins, bvelliquette, byondfuckery, c0rigin, c4llv07e, CaasGit, Caconym27, Calecute, Callmore, capnsockless, CaptainMaru, CaptainSqrBeard, Carbonhell, Carolyn3114, Carou02, carteblanche4me, Catofquestionableethics, CatTheSystem, Centronias, chairbender, Charlese2, charlie, ChaseFlorom, chavonadelal, Cheackraze, CheddaCheez, 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, CrafterKolyan, crazybrain23, creadth, CrigCrag, croilbird, Crotalus, CrudeWax, CrzyPotato, cutemoongod, Cyberboss, d34d10cc, dabigoose, DadeKuma, Daemon, daerSeebaer, dahnte, dakamakat, DamianX, DangerRevolution, daniel-cr, DanSAussieITS, Daracke, DarkenedSynergy, Darkenson, DawBla, Daxxi3, dch-GH, de0rix, Deahaka, dean, DEATHB4DEFEAT, 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, Dirius77, DisposableCrewmember42, DjfjdfofdjfjD, doc-michael, docnite, Doctor-Cpu, DoctorBeard, DogZeroX, dolgovmi, dontbetank, Doomsdrayk, dootythefrooty, Dorragon, Doru991, dotcatshark, DoubleRiceEddiedd, DoutorWhite, dragonryan06, drakewill-CRL, Drayff, dreamlyjack, DrEnzyme, dribblydrone, DrMelon, drongood12, DrSingh, DrSmugleaf, drteaspoon420, DTanxxx, DubiousDoggo, Duddino, dukevanity, duskyjay, Dutch-VanDerLinde, dvir001, dylanstrategie, dylanwhittingham, Dynexust, Easypoller, echo, eclips_e, eden077, EEASAS, Efruit, efzapa, ElectroSR, elsie, elthundercloud, Elysium206, Emily9031, Emisse, emmafornash, EmoGarbage404, Endecc, eoineoineoin, eris, erohrs2, ERORR404V1, Errant-4, esguard, estacaoespacialpirata, Eternally-Confused, eugene, ewokswagger, exincore, exp111, f0x-n3rd, FacePluslll, Fahasor, FairlySadPanda, FATFSAAM2, Feluk6174, ficcialfaint, FieldCommand, Fiftyllama, Fildrance, FillerVK, FinnishPaladin, firenamefn, 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, gamer3107, gansulalan, Gaxeer, gbasood, gcoremans, Geekyhobo, genderGeometries, GeneralGaws, Genkail, geraeumig, Ghagliiarghii, Git-Nivrak, githubuser508, gituhabu, GlassEclipse, gluesniffler, 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, HawkeyeBlade, he1acdvv, Hebi, Henry, HerCoyote23, HighTechPuddle, hitomishirichan, hiucko, hivehum, Hmeister-fake, Hmeister-real, hobnob, HoidC, Holinka4ever, holyssss, HoofedEar, Hoolny, hord-brayden, Hreno, HTMLSystem, hubismal, Hugal31, Huxellberger, Hyenh, hyphenationc, i-justuser-i, iacore, iamnotgray, IamVelcroboy, ian, icekot8, icesickleone, iczero, iglov, IgorAnt028, igorsaux, ike709, illersaver, Illiux, Ilushkins33, Ilya246, IlyaElDunaev, imrenq, imweax, indeano, Injazz, Insineer, IntegerTempest, Interrobang01, Intoxicating-Innocence, 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, joe, JoeHammad1844, JohnGinnane, johnku1, Jophire, joshepvodka, Jrpl, jtbill123, juliangiebel, juniwoofs, JustArt1m, JustCone14, justdie12, justin, justintether, JustinTrotter, JustinWinningham, justtne, K-Dynamic, k3yw, Kadeo64, Kaga-404, KaiShibaa, kalane15, kalanosh, Kanashi-Panda, katzenminer, kbailey-git, Keelin, Keer-Sar, KEEYNy, keikiru, Kelrak, kerisargit, keronshb, KIBORG04, KieueCaprie, Killerqu00, Kimpes, KingFroozy, kira-er, Kirillcas, Kirus59, Kistras, Kit0vras, KittenColony, klaypexx, Kmc2000, Ko4ergaPunk, kognise, kokoc9n, komunre, KonstantinAngelov, kosticia, koteq, Kr8art, KrasnoshchekovPavel, Krunklehorn, Kupie, Kurzaen, kxvvv, kyupolaris, kzhanik, lajolico, Lamrr, LankLTE, laok233, lapatison, larryrussian, lawdog4817, Lazzi0706, leander-0, leonardo-dabepis, leonidussaks, leonsfriedrich, LetterN, lettern, Level10Cybermancer, LEVELcat, lever1209, LevitatingTree, Lgibb18, lgruthes, LightVillet, liltenhead, LinkUyx, LioValkyria, Litraxx, LittleBuilderJane, LittleNyanCat, 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, mazzie, MehimoNemo, MeltedPixel, MemeProof, memoblob, MendaxxDev, Menshin, Mephisto72, MerrytheManokit, Mervill, metalgearsloth, MetalSage, MFMessage, mhamsterr, michaelcu, micheel665, mifia, MilenVolf, MilonPL, Minemoder5000, Minty642, minus1over12, Mirino97, mirrorcult, misandrie, MishaUnity, MissKay1994, MisterMecky, Mith-randalf, MjrLandWhale, mkanke-real, MLGTASTICa, mnemotechnician, moderatelyaware, modern-nm, mokiros, Moneyl, Monotheonist, Moomoobeef, moony, Morb0, MossyGreySlope, mr-bo-jangles, Mr0maks, MrFippik, mrrobdemo, muburu, 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, noelkathegod, 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, onesch, OnyxTheBrave, OrangeMoronage9622, osjarw, Ostaf, othymer, OttoMaticode, Owai-Seek, packmore, paige404, paigemaeforrest, pali6, Pangogie, panzer-iv1, paolordls, partyaddict, patrikturi, PaulRitter, peccneck, Peptide90, peptron1, PeterFuto, PetMudstone, pewter-wiz, Pgriha, Phantom-Lily, PHCodes, pheenty, Phill101, phunnyguy, PilgrimViis, Pill-U, pinkbat5, Piras314, Pireax, pissdemon, PixeltheAertistContrib, PixelTheKermit, PJB3005, Plasmaguy, plinyvic, Plykiya, pofitlo, pointer-to-null, pok27, poklj, PolterTzi, PoorMansDreams, PopGamer45, portfiend, potato1234x, PotentiallyTom, PPooch, ProfanedBane, ProPandaBear, PrPleGoo, ps3moira, Pspritechologist, Psychpsyo, psykana, psykzz, PuceTint, PuroSlavKing, PursuitInAshes, Putnam3145, qrtDaniil, quatre, QueerNB, QuietlyWhisper, qwerltaz, Radezolid, RadioMull, Radosvik, Radrark, Rainbeon, Rainfey, Raitononai, Ramlik, randy10122, Rane, Ranger6012, Rapidgame7, ravage123321, rbertoche, RedBookcase, Redfire1331, Redict, RedlineTriad, redmushie, RednoWCirabrab, ReeZer2, RemberBM, RemieRichards, RemTim, Remuchi, rene-descartes2021, Renlou, retequizzle, 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, SaphireLattice, SapphicOverload, sarahon, sativaleanne, SaveliyM360, sBasalto, ScalyChimp, ScarKy0, schrodinger71, scrato, Scribbles0, scrivoy, scruq445, scuffedjays, ScumbagDog, Segonist, sephtasm, Serkket, sewerpig, sh18rw, Shaddap1, ShadeAware, ShadowCommander, shadowtheprotogen546, shadowwailker, shaeone, shampunj, shariathotpatrol, ShatteredSwords, SignalWalker, siigiil, SimpleStation14, Simyon264, sirdragooon, Sirionaut, SirSmith148, Sk1tch, SkaldetSkaeg, Skarletto, Skrauz, Skyedra, SlamBamActionman, slarticodefast, Slava0135, sleepyyapril, Slyfox333, Smugman, snebl, sniperchance, Snowni, snowsignal, solaris7518, SonicHDC, SoulFN, SoulSloth, Soundwavesghost, southbridge-fur, sowelipililimute, Soydium, spacelizard, SpaceLizardSky, SpaceManiac, SpaceRox1244, SpaceyLady, Spanky, spartak, SpartanKadence, SpeltIncorrectyl, Spessmann, SphiraI, SplinterGP, spoogemonster, sporekto, sporkyz, Squishy77, SsalamethVersaach, ssdaniel24, stalengd, stanberytrask, Stanislav4ix, StanTheCarpenter, Stealthbomber16, stellar-novas, stomf, Stop-Signs, stopbreaking, stopka-html, StrawberryMoses, Stray-Pyramid, strO0pwafel, Strol20, StStevens, Subversionary, sunbear-dev, superjj18, Supernorn, SweptWasTaken, Sybil, SYNCHRONIC, Szunti, TadJohnson00, Tainakov, takemysoult, tap, TaralGit, Taran, taurie, Tayrtahn, tday93, teamaki, TeenSarlacc, TekuNut, telyonok, TemporalOroboros, tentekal, terezi4real, Terraspark4941, texcruize, TGRCdev, tgrkzus, ThataKat, ThatGuyUSA, ThatOneGoblin25, thatrandomcanadianguy, TheArturZh, theashtronaut, thecopbennet, TheCze, TheDarkElites, thedraccx, TheEmber, TheIntoxicatedCat, thekilk, themias, theomund, TheOneWhoIsManyFrame, 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, Tomce795, Tomeno, Tonydatguy, topy, Tornado-Technology, tosatur, TotallyLemon, Tr1bute, 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, Vexerot, VigersRay, violet754, Visne, vitalvitriol, vlados1408, VMSolidus, voidnull000, volotomite, volundr-, Voomra, Vordenburg, vorkathbruh, vulppine, wafehling, Warentan, WarMechanic, Watermelon914, weaversam8, wertanchik, whateverusername0, widgetbeck, 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, zHonys, zionnBE, ZNixian, ZoldorfTheWizard, zonespace27, ZweiHawke, Zylofan, Zymem, zzylex diff --git a/Resources/Locale/en-US/_DV/store/uplink-catalog.ftl b/Resources/Locale/en-US/_DV/store/uplink-catalog.ftl index b1f20825d79..e3f6a7a81ad 100644 --- a/Resources/Locale/en-US/_DV/store/uplink-catalog.ftl +++ b/Resources/Locale/en-US/_DV/store/uplink-catalog.ftl @@ -35,4 +35,7 @@ uplink-storage-implanter-delta-desc = Hide goodies inside of yourself with new b uplink-hardsuit-syndieelite-delta-name = Syndicate Thermal Hardsuit uplink-objective-syndicate-board-name = Syndicate law board -uplink-objective-syndicate-board-desc = Its expensive, don't lose it! \ No newline at end of file +uplink-objective-syndicate-board-desc = Its expensive, don't lose it! + +uplink-dead-mans-signaller-name = Dead Man's Signaller +uplink-dead-mans-signaller-desc = A device that if armed, will send a signal to any linked devices (such as bombs) when it is dropped or put away. diff --git a/Resources/Prototypes/Entities/Mobs/Player/skeleton.yml b/Resources/Prototypes/Entities/Mobs/Player/skeleton.yml index 54374328fc8..d38abb96c07 100644 --- a/Resources/Prototypes/Entities/Mobs/Player/skeleton.yml +++ b/Resources/Prototypes/Entities/Mobs/Player/skeleton.yml @@ -56,7 +56,7 @@ description: ghost-role-information-closet-skeleton-description rules: ghost-role-information-closet-skeleton-rules # DeltaV - No longer free agent, now a non-antag (Some leeway given). mindRoles: - - MindRoleGhostRoleFreeAgent + - MindRoleGhostRoleNeutral # DeltaV - neutral ghost role instead of free agent raffle: settings: default requirements: # DeltaV diff --git a/Resources/Prototypes/Entities/Structures/Machines/lathe.yml b/Resources/Prototypes/Entities/Structures/Machines/lathe.yml index 69d74f956c0..6075671087c 100644 --- a/Resources/Prototypes/Entities/Structures/Machines/lathe.yml +++ b/Resources/Prototypes/Entities/Structures/Machines/lathe.yml @@ -376,6 +376,7 @@ - FultonBeacon - PowerCellHyper - FireExtinguisherBluespace + - SignallerDeadMans # End DeltaV additions - EnergyScalpel # Shitmed Change - EnergyCautery # Shitmed Change diff --git a/Resources/Prototypes/Nyanotrasen/Research/experimental.yml b/Resources/Prototypes/Nyanotrasen/Research/experimental.yml index 7c89c0f7d04..9d5be497e51 100644 --- a/Resources/Prototypes/Nyanotrasen/Research/experimental.yml +++ b/Resources/Prototypes/Nyanotrasen/Research/experimental.yml @@ -12,7 +12,8 @@ recipeUnlocks: - ClothingHeadHelmetInsulated - ClothingHeadCage - # - ShellSoulbreaker # DeltaV - Placing it under Exotic Ammunition because that's what it is. + - MagazineBoxSpecialMindbreaker + - BoxShellSoulbreaker - type: technology id: Metempsychosis diff --git a/Resources/Prototypes/Research/arsenal.yml b/Resources/Prototypes/Research/arsenal.yml index a8192a0284c..2333de04e66 100644 --- a/Resources/Prototypes/Research/arsenal.yml +++ b/Resources/Prototypes/Research/arsenal.yml @@ -1,26 +1,25 @@ # Tier 1 -- type: technology - id: DraconicMunitions - name: research-technology-draconic-munitions - icon: - sprite: Objects/Weapons/Guns/Ammunition/Boxes/pistol.rsi - state: incendiarydisplay - discipline: Arsenal - tier: 2 # DeltaV moved to t2 from t1 - cost: 10000 - recipeUnlocks: - - BoxShotgunIncendiary - - MagazineRifleIncendiary - - MagazinePistolIncendiary - - MagazineLightRifleIncendiary - - SpeedLoaderMagnumIncendiary - - MagazineShotgunIncendiary - - MagazineBoxPistolIncendiary - - MagazineBoxMagnumIncendiary - - MagazineBoxLightRifleIncendiary - - MagazineBoxRifleIncendiary - - MagazineBoxSpecialIncendiary # DeltaV +#- type: technology # DeltaV merged draconic and uranium munitions and moved to our namespace +# id: DraconicMunitions +# name: research-technology-draconic-muntions +# icon: +# sprite: Objects/Weapons/Guns/Ammunition/Boxes/pistol.rsi +# state: incendiarydisplay +# discipline: Arsenal +# tier: 1 +# cost: 10000 +# recipeUnlocks: +# - BoxShotgunIncendiary +# - MagazineRifleIncendiary +# - MagazinePistolIncendiary +# - MagazineLightRifleIncendiary +# - SpeedLoaderMagnumIncendiary +# - MagazineShotgunIncendiary +# - MagazineBoxPistolIncendiary +# - MagazineBoxMagnumIncendiary +# - MagazineBoxLightRifleIncendiary +# - MagazineBoxRifleIncendiary - type: technology id: WeaponizedLaserManipulation @@ -50,28 +49,28 @@ # - BoxBeanbag # - WeaponDisabler -- type: technology - id: UraniumMunitions - name: research-technology-uranium-munitions - icon: - sprite: Objects/Materials/Sheets/other.rsi - state: uranium - discipline: Arsenal - tier: 2 # DeltaV moved to t2 from t1 - cost: 7500 - recipeUnlocks: - - MagazineRifleUranium - - MagazinePistolUranium - - MagazineLightRifleUranium - - SpeedLoaderMagnumUranium - - MagazineBoxPistolUranium - - MagazineBoxMagnumUranium - - MagazineBoxLightRifleUranium - - MagazineBoxRifleUranium - - BoxShotgunUranium +#- type: technology # DeltaV merged draconic and uranium munitions and moved to our namespace +# id: UraniumMunitions +# name: research-technology-uranium-munitions +# icon: +# sprite: Objects/Materials/Sheets/other.rsi +# state: uranium +# discipline: Arsenal +# tier: 1 +# cost: 7500 +# recipeUnlocks: +# - MagazineRifleUranium +# - MagazinePistolUranium +# - MagazineLightRifleUranium +# - SpeedLoaderMagnumUranium +# - MagazineBoxPistolUranium +# - MagazineBoxMagnumUranium +# - MagazineBoxLightRifleUranium +# - MagazineBoxRifleUranium +# - BoxShotgunUranium # DeltaV - .38 special uranium ammo - Adds .38 special uranium ammo to the research tree - - SpeedLoaderSpecialUranium - - MagazineBoxSpecialUranium +# - SpeedLoaderSpecialUranium +# - MagazineBoxSpecialUranium # End of modified code - type: technology @@ -107,6 +106,7 @@ - FlashPayload - ExplosivePayload - ChemicalPayload + - SignallerDeadMans # DeltaV - Dead Man's Signaller - type: technology id: SpecialMeans diff --git a/Resources/Prototypes/StatusIcon/job.yml b/Resources/Prototypes/StatusIcon/job.yml index 4cecbc99e41..9299673b6c7 100644 --- a/Resources/Prototypes/StatusIcon/job.yml +++ b/Resources/Prototypes/StatusIcon/job.yml @@ -73,7 +73,7 @@ parent: JobIcon id: JobIconPrisoner icon: - sprite: /Textures/Interface/Misc/job_icons.rsi + sprite: /Textures/_DV/Interface/Misc/job_icons.rsi # DeltaV - resprite prisoner jobicon state: Prisoner jobName: job-name-prisoner diff --git a/Resources/Prototypes/_DV/Catalog/Fills/Lockers/medical.yml b/Resources/Prototypes/_DV/Catalog/Fills/Lockers/medical.yml index 357c0d71902..c3215d69c5f 100644 --- a/Resources/Prototypes/_DV/Catalog/Fills/Lockers/medical.yml +++ b/Resources/Prototypes/_DV/Catalog/Fills/Lockers/medical.yml @@ -100,6 +100,7 @@ - id: ClothingEyesHudMedical - id: ClothingBackpackDuffelSurgeryFilled - id: ClothingOuterVestTank + - id: NitrousOxideTankFilled - id: LunchboxMedicalFilledRandom prob: 0.3 - id: BoxSyringe diff --git a/Resources/Prototypes/_DV/Catalog/uplink_catalog.yml b/Resources/Prototypes/_DV/Catalog/uplink_catalog.yml index 8477f576060..f9ed7503158 100644 --- a/Resources/Prototypes/_DV/Catalog/uplink_catalog.yml +++ b/Resources/Prototypes/_DV/Catalog/uplink_catalog.yml @@ -166,3 +166,16 @@ blacklist: components: - SurplusBundle + +- type: listing + id: UplinkDeadMansSignaller + name: uplink-dead-mans-signaller-name + description: uplink-dead-mans-signaller-desc + productEntity: DeadMansSignaler + discountCategory: rareDiscounts + discountDownTo: + Telecrystal: 1 + cost: + Telecrystal: 2 + categories: + - UplinkDisruption diff --git a/Resources/Prototypes/_DV/Entities/Objects/Devices/Electronics/dead-mans-signaller.yml b/Resources/Prototypes/_DV/Entities/Objects/Devices/Electronics/dead-mans-signaller.yml new file mode 100644 index 00000000000..ae3222b9d19 --- /dev/null +++ b/Resources/Prototypes/_DV/Entities/Objects/Devices/Electronics/dead-mans-signaller.yml @@ -0,0 +1,25 @@ +#This signaller device will send a signal if it is dropped while activated + +- type: entity + parent: RemoteSignaller + id: DeadMansSignaler + name: dead man's signaler + description: A device that if armed will send signals to objects within 50 meters when dropped or put away. + components: + - type: DeadMansSignaller + - type: ItemToggle + - type: Sprite + drawdepth: Items + sprite: _DV/Objects/Devices/deadmanssignaller.rsi + layers: + - state: inactive + map: [ "enum.ToggleVisuals.Layer" ] + - type: Appearance + - type: GenericVisualizer + visuals: + enum.ToggleVisuals.Toggled: + enum.ToggleVisuals.Layer: + True: {state: active} + False: {state: inactive} + - type: WirelessNetworkConnection + range: 50 diff --git a/Resources/Prototypes/_DV/Recipes/Lathes/devices.yml b/Resources/Prototypes/_DV/Recipes/Lathes/devices.yml index 4e3c5f121e4..e389151464a 100644 --- a/Resources/Prototypes/_DV/Recipes/Lathes/devices.yml +++ b/Resources/Prototypes/_DV/Recipes/Lathes/devices.yml @@ -18,3 +18,12 @@ Silver: 750 Plasma: 500 Bluespace: 100 + +- type: latheRecipe + parent: BasePartRecipe + id: SignallerDeadMans + result: DeadMansSignaler + materials: + Steel: 100 + Plastic: 200 + Plasma: 100 diff --git a/Resources/Prototypes/_DV/Research/arsenal.yml b/Resources/Prototypes/_DV/Research/arsenal.yml index 33bb8cd88d7..87e0fb0c7c2 100644 --- a/Resources/Prototypes/_DV/Research/arsenal.yml +++ b/Resources/Prototypes/_DV/Research/arsenal.yml @@ -10,9 +10,28 @@ tier: 1 cost: 7500 recipeUnlocks: + - MagazineRifleUranium + - MagazinePistolUranium + - MagazineLightRifleUranium + - SpeedLoaderMagnumUranium + - MagazineBoxPistolUranium + - MagazineBoxMagnumUranium + - MagazineBoxLightRifleUranium + - MagazineBoxRifleUranium + - BoxShotgunUranium + - SpeedLoaderSpecialUranium + - MagazineBoxSpecialUranium + - BoxShotgunIncendiary + - MagazineRifleIncendiary + - MagazinePistolIncendiary + - MagazineLightRifleIncendiary + - SpeedLoaderMagnumIncendiary + - MagazineShotgunIncendiary + - MagazineBoxPistolIncendiary + - MagazineBoxMagnumIncendiary + - MagazineBoxLightRifleIncendiary + - MagazineBoxRifleIncendiary - MagazineBoxSpecialHoly - - MagazineBoxSpecialMindbreaker - - BoxShellSoulbreaker # Nyanotrasen - Soulbreaker shotgun ammo - type: technology id: EnergyGuns diff --git a/Resources/Textures/_DV/Interface/Misc/job_icons.rsi/Prisoner.png b/Resources/Textures/_DV/Interface/Misc/job_icons.rsi/Prisoner.png new file mode 100644 index 00000000000..cf2b09f4530 Binary files /dev/null and b/Resources/Textures/_DV/Interface/Misc/job_icons.rsi/Prisoner.png differ diff --git a/Resources/Textures/_DV/Interface/Misc/job_icons.rsi/SecurityOfficer.png b/Resources/Textures/_DV/Interface/Misc/job_icons.rsi/SecurityOfficer.png index 6f8ff128c4f..4f4ec66fbe7 100644 Binary files a/Resources/Textures/_DV/Interface/Misc/job_icons.rsi/SecurityOfficer.png and b/Resources/Textures/_DV/Interface/Misc/job_icons.rsi/SecurityOfficer.png differ diff --git a/Resources/Textures/_DV/Interface/Misc/job_icons.rsi/Warden.png b/Resources/Textures/_DV/Interface/Misc/job_icons.rsi/Warden.png index 1ed853d4e0f..f497ec0de7d 100644 Binary files a/Resources/Textures/_DV/Interface/Misc/job_icons.rsi/Warden.png and b/Resources/Textures/_DV/Interface/Misc/job_icons.rsi/Warden.png differ diff --git a/Resources/Textures/_DV/Interface/Misc/job_icons.rsi/meta.json b/Resources/Textures/_DV/Interface/Misc/job_icons.rsi/meta.json index 3780cba0394..ca21f0803d4 100644 --- a/Resources/Textures/_DV/Interface/Misc/job_icons.rsi/meta.json +++ b/Resources/Textures/_DV/Interface/Misc/job_icons.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/d917f4c2a088419d5c3aec7656b7ff8cebd1822e | nyanoPrisonGuard, nyanoMartialArtist, nyanoGladiator made by Floofers | ChiefJustice, Clerk by leonardo_dabepis (Discord), SecurityBorg recoloured from MedicalBorg by DangerRevolution(github), CargoAssistant recoloured from MedicalIntern by Radezolid, AdminAssistant made by noctyrnal (github), Surgeon by Janet Blackquill 2024. Security cards modified by TJohnson.", + "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/d917f4c2a088419d5c3aec7656b7ff8cebd1822e | SecurityOfficer, nyanoMartialArtist, nyanoGladiator made by Floofers | ChiefJustice, Clerk by leonardo_dabepis (Discord), SecurityBorg recoloured from MedicalBorg by DangerRevolution(github), CargoAssistant recoloured from MedicalIntern by Radezolid, AdminAssistant made by noctyrnal (github), Surgeon by Janet Blackquill 2024. Security cards modified by TJohnson.", "size": { "x": 8, "y": 8 @@ -69,6 +69,9 @@ }, { "name": "SeniorOfficer" + }, + { + "name": "Prisoner" } ] } diff --git a/Resources/Textures/_DV/Interface/Misc/job_icons.rsi/nyanoPrisonGuard.png b/Resources/Textures/_DV/Interface/Misc/job_icons.rsi/nyanoPrisonGuard.png index 4f4ec66fbe7..0e7c51ff1dd 100644 Binary files a/Resources/Textures/_DV/Interface/Misc/job_icons.rsi/nyanoPrisonGuard.png and b/Resources/Textures/_DV/Interface/Misc/job_icons.rsi/nyanoPrisonGuard.png differ diff --git a/Resources/Textures/_DV/Objects/Devices/deadmanssignaller.rsi/active.png b/Resources/Textures/_DV/Objects/Devices/deadmanssignaller.rsi/active.png new file mode 100644 index 00000000000..037224c50bb Binary files /dev/null and b/Resources/Textures/_DV/Objects/Devices/deadmanssignaller.rsi/active.png differ diff --git a/Resources/Textures/_DV/Objects/Devices/deadmanssignaller.rsi/inactive.png b/Resources/Textures/_DV/Objects/Devices/deadmanssignaller.rsi/inactive.png new file mode 100644 index 00000000000..396e17942e0 Binary files /dev/null and b/Resources/Textures/_DV/Objects/Devices/deadmanssignaller.rsi/inactive.png differ diff --git a/Resources/Textures/_DV/Objects/Devices/deadmanssignaller.rsi/inhand-left.png b/Resources/Textures/_DV/Objects/Devices/deadmanssignaller.rsi/inhand-left.png new file mode 100644 index 00000000000..011508c4d1c Binary files /dev/null and b/Resources/Textures/_DV/Objects/Devices/deadmanssignaller.rsi/inhand-left.png differ diff --git a/Resources/Textures/_DV/Objects/Devices/deadmanssignaller.rsi/inhand-right.png b/Resources/Textures/_DV/Objects/Devices/deadmanssignaller.rsi/inhand-right.png new file mode 100644 index 00000000000..751ae9080b7 Binary files /dev/null and b/Resources/Textures/_DV/Objects/Devices/deadmanssignaller.rsi/inhand-right.png differ diff --git a/Resources/Textures/_DV/Objects/Devices/deadmanssignaller.rsi/meta.json b/Resources/Textures/_DV/Objects/Devices/deadmanssignaller.rsi/meta.json new file mode 100644 index 00000000000..d5068041597 --- /dev/null +++ b/Resources/Textures/_DV/Objects/Devices/deadmanssignaller.rsi/meta.json @@ -0,0 +1,25 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "signaller state taken from /vg/station at commit https://github.com/vgstation-coders/vgstation13/commit/2c980a1f423f26e990a578bae057d1eca19675ec. inhands & advanced made by Flaregy for Space Station 14. Dead Man's Signaller is modified from signaller", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "active" + }, + { + "name": "inactive" + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/_DV/Objects/Misc/id_cards.rsi/idsecurityofficer.png b/Resources/Textures/_DV/Objects/Misc/id_cards.rsi/idsecurityofficer.png index 09a461ee267..dcf89e0ff75 100644 Binary files a/Resources/Textures/_DV/Objects/Misc/id_cards.rsi/idsecurityofficer.png and b/Resources/Textures/_DV/Objects/Misc/id_cards.rsi/idsecurityofficer.png differ diff --git a/Resources/Textures/_DV/Objects/Misc/id_cards.rsi/idwarden.png b/Resources/Textures/_DV/Objects/Misc/id_cards.rsi/idwarden.png index edada474506..4221aae0ddc 100644 Binary files a/Resources/Textures/_DV/Objects/Misc/id_cards.rsi/idwarden.png and b/Resources/Textures/_DV/Objects/Misc/id_cards.rsi/idwarden.png differ diff --git a/Resources/Textures/_DV/Objects/Misc/id_cards.rsi/meta.json b/Resources/Textures/_DV/Objects/Misc/id_cards.rsi/meta.json index bbac5740dff..97650351214 100644 --- a/Resources/Textures/_DV/Objects/Misc/id_cards.rsi/meta.json +++ b/Resources/Textures/_DV/Objects/Misc/id_cards.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/d917f4c2a088419d5c3aec7656b7ff8cebd1822e | nyanoprisonguard, nyanogladiator, nyanomartialartist made by Floofers, idchiefjustice idclerk and idlawyer made by leonardo_dabepis (Discord), idprosecutor made by Timemaster99 (Discord), idcargoassistant made by Radezolid, idadminassistant by noctyrnal (github), idsurgeon by Janet Blackquill 2024. Security sprites modified by TJohnson.", + "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/d917f4c2a088419d5c3aec7656b7ff8cebd1822e | idsecurityofficer, nyanogladiator, nyanomartialartist made by Floofers, idchiefjustice idclerk and idlawyer made by leonardo_dabepis (Discord), idprosecutor made by Timemaster99 (Discord), idcargoassistant made by Radezolid, idadminassistant by noctyrnal (github), idsurgeon by Janet Blackquill 2024. Security sprites modified by TJohnson.", "size": { "x": 32, "y": 32 diff --git a/Resources/Textures/_DV/Objects/Misc/id_cards.rsi/nyanoprisoner.png b/Resources/Textures/_DV/Objects/Misc/id_cards.rsi/nyanoprisoner.png index 96c8f4d9825..33752f69a17 100644 Binary files a/Resources/Textures/_DV/Objects/Misc/id_cards.rsi/nyanoprisoner.png and b/Resources/Textures/_DV/Objects/Misc/id_cards.rsi/nyanoprisoner.png differ diff --git a/Resources/Textures/_DV/Objects/Misc/id_cards.rsi/nyanoprisonguard.png b/Resources/Textures/_DV/Objects/Misc/id_cards.rsi/nyanoprisonguard.png index dcf89e0ff75..edada474506 100644 Binary files a/Resources/Textures/_DV/Objects/Misc/id_cards.rsi/nyanoprisonguard.png and b/Resources/Textures/_DV/Objects/Misc/id_cards.rsi/nyanoprisonguard.png differ