Upstream Sync (License Change) #56

add (cherry picked from commit ad7256750c5ccb8a5b1025d287dae1d1c507f78e)

(cherry picked from commit 3966a65c659d3881d58c1fb2beadaf6c4e53f827)

* Initial Pass, Rev, Thief * Zombie initial pass * Rebase, Traitor * Nukeops, More overloads * Revert RevolutionaryRuleComponent * Use TryRoundStartAttempt, Rewrite nukie spawning * Comments, Add task scheduler to GameRuleSystem * Zombie initial testing done * Sort methods, rework GameRuleTask * Add CCVar, Initial testing continues * Might as well get rid of the obsolete logging * Oops, i dont know how to log apparently * Suggested formatting fixes * Suggested changes * Fix merge issues * Minor optimisation * Allowed thief to choose other antags * Review changes * Spawn items on floor first, then inserting * minor tweaks * Shift as much as possible to ProtoId<> * Remove unneeded * Add exclusive antag attribute * Fix merge issues * Minor formatting fix * Convert to struct * Cleanup * Review cleanup (need to test a lot) * Some fixes, (mostly) tested * oop * Pass tests (for real) --------- Co-authored-by: Rainfall <[email protected]> Co-authored-by: AJCM <[email protected]> (cherry picked from commit 4e6c59cfe51211064d79a727cc2d37c2a2f55a2c)

(cherry picked from commit a281efde2868151169540aab0ed19c8083753ebe)

(cherry picked from commit 4bb5b23145f37081672072a6be3519a2e1507a76)

* number stuff * too many wehs, must increase price.. * Update fun.yml * Update cargo_fun.yml --------- Co-authored-by: Ed <[email protected]> (cherry picked from commit e17acdc6b04c47b76f5a795525ed499efb389364)

(cherry picked from commit af71f1e2df9abe201d7e30697b6bf5664f90d05e)

Fix PDA home icon. (cherry picked from commit 8c6c19c9934f6a57b861b1a36501c4ca6c68387c)

…leftovers (#25659) * I forgot to commit, damn it * Adds the brick to survival kit (cherry picked from commit e4d98f1ab94d08f7db457b538e857c0732ab0c0d)

…counterpart N2 tanks (#25660) kills off N2 & O2 tanks from lockers & removes duplicate n2 tanks from stuff with o2 tanks (cherry picked from commit b0e811b4f35ba7968c98fe21263bae0b104273d8)

* fills * contrast (cherry picked from commit e2741498b88a3e3b5d6312197525addb918bc53a)

* Change tilefrictionmodifier of default item to base friction * Remove anchored friction modifier from baseItem * Revert "Remove anchored friction modifier from baseItem" This reverts commit 2d9d53f38a3704c8b5df4172629c78812f72f6ae. * Removed anchored friction component from BaseItem. --------- Co-authored-by: Plykiya <[email protected]> (cherry picked from commit e3b061025d86c9712e867f54342e13f6c94b0095)

(cherry picked from commit 7aa0bade6cac1ad8d3b200cec398ebf7cd984e72)

* Using wrench on AME doesn't first try to put it in. * Refactor AME to use ItemSlot for fuel. * Apparently these names want to match. (cherry picked from commit c47391011d0f7f56dfcba8e4db348f0dc0d58c09)

* curwa * fix * huh * revert huh * add fancy white * resprite hospital * add suffix (cherry picked from commit 66cf642e5632dd960a0af56b526020ec1b025c24)

(cherry picked from commit 3caf58029b24080efb029bb31b5f6b14b0d33d0a)

* Undertoned Tail * Locale (cherry picked from commit ba8e92ddc80d66d627384fe44ef47724a082b4cd)

the meat and potatoes YEAH (cherry picked from commit 0001c23df2c917c66c74cde31110285826b9d979)

remove grandpa's fucked up bed (cherry picked from commit 1037bfc6a0016d869359ae825e97c51bdf36ded9)

(cherry picked from commit b2902ff0c55d5daec7678f0cd657c73df6c8ca56)

* cleaning * fix (cherry picked from commit d479c854cc7326c7a2e79ba35172274e22f7f3e0)

…m windows) (#25723) * adds a new syndie space shuttle ruin + plastitanium windows * the green goomba gaming * fixe * visor > gloves (cherry picked from commit 7b9346d2a8f3ab7e62c19b207ba5091cbddd6ecd)

(cherry picked from commit df271f5ead4cfa453093d18675785361300fd10c)

(cherry picked from commit 650c04badb6f4f442a2b352a87a3d27d24fc04f6)

…(#22804) * un-eviled the reinforced glass recipes the tyranny of accidentally crafting plasma glass instead of reinforced plasma glass is finally over * fix? (cherry picked from commit db15efc3a3754d4f180a8787702696df69b1da29)

(cherry picked from commit 36d505b82ae332c1871c0081577794d9c14ae9cf)

Co-authored-by: Jeff <[email protected]> (cherry picked from commit 70307f9e00fbc73278249c719fd77c03e3b8322c)

(cherry picked from commit 2852483b5caf02c9f6688395fc97b170e6d84e82)

added condition checking description to cargo search (cherry picked from commit c83ad11be170f860a0fbd5dde257fd0537e89712)

@deltanedas

* add ActionAttemptEvent * add ConfirmableAction compsys * make suicide actions confirmable * use new trolling techniques * better query and dirty them * death --------- Co-authored-by: deltanedas <@deltanedas:kde.org> (cherry picked from commit ad3f3a5d360be6f7c8acb9c7753b45653a28cc0f)

(cherry picked from commit 0ba9df26a048dc4b9c962ebe5efe70ffed71a387)

* Make the round end sound collection a cvar * Fix comment * Clarity (cherry picked from commit 30ccde0a47f65d0f6b0641f5bf92d95650c4fb87)

(cherry picked from commit 1abd1f615fb0e8423855c1cea9c858db01abad31)

(cherry picked from commit a0d159bac69169434a38500b386476c7affccf3d)

Cryo Access Fix (cherry picked from commit 5d941920c8437d600476564fab6b16d08c137328)

(cherry picked from commit a4804dbabe8d9c4746fd4a5bfe97344cd4235b14)

Expensive coat (cherry picked from commit 8dedbf22a4967769f078ca5521537f16bff40002)

Stamp Detective (cherry picked from commit 81b016433fea9f67645776a42ca1762350bfce2b)

(cherry picked from commit 7a7e0e8db68c16efb9ef989cef139ef1e1d3981a)

(cherry picked from commit c38b44ea6907f19980a81535e22b54ec04c871c2)

…25762) (cherry picked from commit 2904ff421ad7477a503e4835624e2e3c82db0cf2)

initial commit (cherry picked from commit 55b0cb19348d391392cdfdf912f7ef9e04dbf9be)

(cherry picked from commit 0fde3b045e4cffeb0ae8cc49cb35007aa72d7265)

* move space heaters into cargo * AAA!!! the indentation1!!! * remove crate (cherry picked from commit 9cdffb7b6e357da6b38833fa54fb6564d086de53)

(cherry picked from commit 1c628b24c7933f1383d3fcc65b30e0ac93b478d7)

…5764) (cherry picked from commit a5200cc18527dad8f5c749e0b0ddbe55676122ce)

…25743) * fix(research): Fix `ResearchSystem.Client` `UpdateClientInterface` preconditions. Fixes a paradox where selecting a research server requires a research server to already be selected. This would softlock the research client until it is reconstructed. * style: Discards the discard operator Co-authored-by: Nemanja <[email protected]> --------- Co-authored-by: Nemanja <[email protected]> (cherry picked from commit aaf5d0d30254d27d319b2b5f5874ebe787537f0a)

Weight based delay, retuned average, fixed comments (cherry picked from commit c775410370a650aa51a1feda99f45cefda0c811e)

(cherry picked from commit e7a806a443923fc6d44f14d5bfaf3a05d58ad2bc)

* Alert autoremove v0 * Code cleanup and timing * comment * Tritium, code compression * not resolving manually * reduced lookups, new comp * fix-fix yes * use RemCompDeferred, handle OnUnpaused * missed a todo * entitysystem resolve * remove unnecessary component updates * remove AlertState from comp, move EntityUnpausedEvent actions to AlertStateComponent's Timespan * Code cleanup * comments * combines AutoRemove input into Clear * minor logic adjustment that does not really change anything but is less ambiguous (cherry picked from commit ecd2d5a644540c6ad28903ee4fb2af87876e3030)

(cherry picked from commit 6476b623d0472e3540ba315b1835038c1a74f5bc)

1 (cherry picked from commit 325349965d7f3a8e504eccbc3410aeae0a4bfd92)

This is a trash item for the most part, and should get picked up by the janitor's trash bag (cherry picked from commit 2e60d3300b4d2986d65f923bdb0de9ee8b4755a2)

(cherry picked from commit 709881f912ac74c396b7e9f7cd0d676ee918b6ba)

@deltanedas

* add SubGamemodes comp/sys * remove RuleChance from thief rule * use SubGamemodes for adding thief rule instead of adding ThiefRule component to random gamemodes * clean up thief rule prototype * add better logging + end rule if it fails to start * march 1st incident * preset ops * the dreaded --------- Co-authored-by: deltanedas <@deltanedas:kde.org> (cherry picked from commit 7f060eb129f100754647e5221e9ebab2b00e6925)

* fix(seizures): remove seizures from the game * Reduced animation time to 2 seconds (cherry picked from commit bc2dee9f707eb3680aaffee7bf9eb3bb043b60dd)

* loc * per review * Update Content.Client/MassMedia/Ui/ArticleEditorPanel.xaml Co-authored-by: Nemanja <[email protected]> --------- Co-authored-by: Nemanja <[email protected]> (cherry picked from commit 4f7facbd73270d38efce72fbb9d0dabd1f432dd2)

…tart (also lobby music not looped anymore) (#25530) * fix: lobby music volume will be changed on options change without restart (also lobby music not looped anymore) * refactor: now lobby music is part of ContentAudioSystem. Lobby playlist is used instead of single track. Client now selects next lobby soundtrack after previous finished. * refactor: incapsulated info on current lobby track in simple record * refactor: fixed inconsistent naming between song and soundtrack for lobbymusic * refactor: xml-doc for LobbyPlaylistChangedEvent * fix: inverted invalid _audio.PlayGlobal check to return only if lobby soundtrack play call failed --------- Co-authored-by: pa.pecherskij <[email protected]> (cherry picked from commit 4c87dcd3cb92855df1fa01dea52d2ddd09f2adce)

(cherry picked from commit 10cf94859bcc09bf9ef2da4b5835a5599b21d1be)

* feat(inventory): Add secondary quick-remove star * style: Fix end of file newline * feat(inventory): Change secondary smart-equip star to silver star * feat(inventory): Decrease secondary quick-equip star luminosity to better match the primary (cherry picked from commit c8cc806a8fed7de92db48f4f066f63d5464502d1)

(cherry picked from commit b412ad47cf68b51a3ebcfa439d27f2d2a6b4f0c8)

cleanup chairs.yml not sure if i did this correctly (cherry picked from commit 862ab5ca9f1e4034577fb2f8829b0cc4b793890d)

(cherry picked from commit 67f4802fe4327a7e47ac17c8604e0c0b8364a4e0)

(cherry picked from commit 57a69fc0c65dfbb8893fbc3b42b2b6d7ff8fabd9)

(cherry picked from commit 8d83efd254ce42758dbe013fa4cd91238b6f7bd8)

Librarian drip Co-authored-by: Plykiya <[email protected]> (cherry picked from commit a0b33def481ef77eedd4a86b1e6ec71f1f49d654)

Prediction for puddle and spillable examines (cherry picked from commit 4943151111c8db9ac94701128b08f857b3abd3e6)

* Make itemslots more verbose with AME proof of concept. * Remove unnecessary [DataField] strings and use null coalescing in whitelist checks. * Change optional popup fields into LocId. (cherry picked from commit 06d755a860fa60dd393bfece6495109af8b60c21)

* patch QSI exception * fuck don't die (cherry picked from commit 9a795b35adba4575f2674f937f8b4bb566b3cb15)

(cherry picked from commit 977bd1baecbb5c6ec708c7150cc6efebc1cc1c3d)

Revert "Make galoshes obtainable and slowing you (#25484)" This reverts commit 65687375eec57b453d9bd67b945598691052bb8a. (cherry picked from commit f2f1c0b0ad96b05b5bc874e1a7f94a59eb53df74)

(cherry picked from commit 0e3664f03f3db7a7e4b2467684692026e44732cd)

(cherry picked from commit 2ef38f8a629726b5f4dbe94a443b69d91167a4ec)

(cherry picked from commit a2c729a33b5fda3a1ca5159da1e54efc4c877ffe)

remove doafter from toggling your own internals (cherry picked from commit 759b6229c2ff3ae4f0808dbda3a17ac603e23928)

(cherry picked from commit 133b11cae8fcc6198a7a37696d55a99be9c07e64)

fixed it (cherry picked from commit 094f30e2281d55d500305dbbaf31ac2221614d10)

(cherry picked from commit 8a910f6673498760f4637ff10625a2c894068ebf)

(cherry picked from commit a72373e408297ea70f758027215295bd683f10b8)

(cherry picked from commit 1ed63d43b00ebacafb5d6bc50d6c39348c7e8b39)

(cherry picked from commit 540c819602a0ea72e7a7f78dce52d1ea52f812c8)

(cherry picked from commit ee051217ae0fcea8d7c76e0803ac902aa24bf15a)

Co-authored-by: Plykiya <[email protected]> (cherry picked from commit 4f7ff56e87d78a2acc0936466f83a6b841ee8fea)

(cherry picked from commit 196cc39232dc8984364334c0b65ce7b5be3f185a)

(cherry picked from commit ce9e13de6afb90c064cc52a09a9d347fbb020237)

* content * catwalks * fix fucking icons * finish PR * +1 room * fix (cherry picked from commit ace82854406631bad58cd731899fc8e20ef21e65)

(cherry picked from commit da9775709b1d96dfaaadf86c437da715f491ecf2)

* Lathe-able Welding Masks * Fix Composition Tests (cherry picked from commit 7944badd004dd4819466e169721b660f3818bb50)

(cherry picked from commit 163a5274838a90b486bf38b5a27bf28fd6fb04c5)

+dungen (cherry picked from commit bdcf1444423cffdb88e3398077ad7b770a224341)

Lower Volume (cherry picked from commit f4754febb114dbd23b06b92224dd0067f75391f5)

(cherry picked from commit 1e8b683c5b83c1a093e952454ef27f0088ec02f0)

@deltanedas

* refactor ops * inherit dna and fiber when fish hydrated *

* kid named finger *

* move rehydrating to shared

* nobody noticed the popup being missing all this time * method ops --------- Co-authored-by: deltanedas <@deltanedas:kde.org> (cherry picked from commit 550612a37f4fd61088c994b289c833ed3d564855)

(cherry picked from commit 7d841d4df117918d7eaa2f5f6d2f79a08979f9bc)

…tial infected in zombie mode #25529 (#25785) * fix(antags): respects canBeAntag = true * updated more * includeAllJobs = False?????????? * fixed comma placement * removed unused dependencies (cherry picked from commit 511e245de1fe668e0af5d2ae0581c54e44712812)

(cherry picked from commit 926b1407f61927d360741b40a23c03addc69b956)

fix: sane keybindings? (cherry picked from commit 4b56996fcdbf88581d31d4c8aeb184f0c4c23309)

(cherry picked from commit 68bb57bbaf41b84544ccdeb683ad356e2b344cc6)

Actually enforce max/min temperatures server side (cherry picked from commit bad11742d3cdf23ac5cc9354da98767ff623449a)

(cherry picked from commit 4d0ec65f35f80efe319aa2ca38a888a555573403)

(cherry picked from commit 35d0d0b59a8e80aafdec950ffe431f7870756fa0)

* sprites something something strength and certainty of steel (except this is brass) * test1 * commas it was commas * commas and brackets * LET THERE BE BRASS * brass-glass-etc-windows-thindows-floors-lattice * ALL THE STRUCTURES!! "Which structures did you add?" "all." * buyable brass and on the first day the quartermaster said "let there be brass" and all the cargo techs stopped inve$ting in awe * Update windoor.yml i forgor 💀 * Update tiles.ftl * i hate random capital letters * linter fix 1 whew, thank god for linters * fix 2 * maybe this shot in the dark, idk what the hell i'm doing hopefully this fixes it? * fix attempt 1 weather to true, maybe the thingy got confused? * remove clockwork lattice it's fixed the test fail... but at what cost? * changes 1 * fix clockwork windoor * FLOORS HAHAHA LET THERE BE FLOORS * try linter fix 1 i love linters they find things i'd never catch myself * tweaks fixes 1 fixes merge conflict and does more stuff part two later because i'm tired * tweaks fixes 2 i should probably do this stuff during the day when i have more energy but eh * Update assembly.yml * Update chairs.yml * fix door sprites somehow the deny_unlit was broken for all the clockwork doors * fix glass.yml (cherry picked from commit f0e8695a91b787c8107ebf198309d92159463dc0)

(cherry picked from commit 9036e59ee82a844e64e8ea9dc6d36b575d87a146)

Update lathe+clothing.yml (cherry picked from commit 7e9c3b88146d5ca3336eec9213d4b0908c87976d)

Glowstick now garbo (cherry picked from commit d3b981f35439d87a633ba4dd3d8ce76952eb3873)

(cherry picked from commit 907403759c856f4486ca526c95e1f82008070f02)

Added prediction to labels (cherry picked from commit f4976a32886850df2033e7866d0c9a5df37be1af)

(cherry picked from commit b5066dc4c69680711061cbc4ef8d15588b78eee4)

* Revert "Change keybindings for paper (#25853)" This reverts commit 4b56996fcdbf88581d31d4c8aeb184f0c4c23309. * Add a save button to the paper editing UI instead. (cherry picked from commit d385c1bb2327da4fa6bf83d1813c44295eb8efdd)

Separate Walls (cherry picked from commit 8a154d3fd786b259cd50e456aa27e099f95c8b52)

(cherry picked from commit 55cebb3b56e694955f1cff6ef1c870db81e0814c)

* update * rename tank to pool. bigger arbitrary #. remove bad copy paste part. (cherry picked from commit 8e8156a6a753200bde60a83e03989d2f87909039)

(cherry picked from commit be1864939e699bea7024a61c1fc36aa12851cc9e)

* penis * done (cherry picked from commit 0ab4acedebd765109e78cdf532a18e05ed1ba206)

* Added appropriate wideAnimationRotation fields to items that needed it * Modified some wideAnimationRotation (cherry picked from commit 091332787e9344f4ca4d4dbda848bbe6ab63cdfc)

(cherry picked from commit 623aa799a94771bd63e88a8a626e3487195e0409)

the fog is coming (cherry picked from commit 27e14d8a9660c9ab7a69470e7566fea0ff1b71c1)

* Clothing sprites & meta * Changing prototypes & sprites Rename sprites folder, edit prototypes and meta * Hair_sprites_&_prototype Add hair sprites and change prototype * Update meta.json * Rename added hair * Revert "Changing prototypes & sprites" This reverts commit 801cadbdaa90cfb5e7ae43cd7d017e20b40cdc98. * Revert "Clothing sprites & meta" This reverts commit 73442163fd8bc8f49207e616b415dc0f26d6ef32. (cherry picked from commit 2ba28cc3d21034c93d8b2c4486b9a158d4be9618)

(cherry picked from commit 8e2ebdd1215343c15ed5f292b62eccb66a338322)

(cherry picked from commit 89831d77a45510a5e6c3ad89df30cd5176feda0d)

readmin debugcoords (cherry picked from commit 46f6799ba2afe0e6a5cfbcceef9db84f950d84e5)

Was too lazy to fix and forgot. (cherry picked from commit e648fe50123419e24bec7c0b4ac14dd657498675)

(cherry picked from commit 72b0889359d575c57ea936ffc1794d5723150071)

* Added SharedPopupSystem.PopupPredicted * Documentation improvement (cherry picked from commit 0738829510d823bf0f22eaf197f6f5cc3744bbc3)

bald update Co-authored-by: Kadeo64 <[email protected]> (cherry picked from commit 974c4b92197452ffac0d11730a8045b1f4eb936b)

(cherry picked from commit 4228305b12fb1302de74b578318f46b8c1887827)

Removed all obsolete, non-ECS method calls to BatteryComponent (cherry picked from commit 2935e5bd780d6cd08897521ba0b54adccb3fd0da)

(cherry picked from commit e5536e0652ab3605701627474d6450f0884a079c)

Added FitsInDispenser to FlaskBase (cherry picked from commit 56454b6c167b0cac055b3b2eeb654018fb45c4f0)

(cherry picked from commit 6da400980b72c146c8401b7981e5eadb71c94e68)

* fix(emag): Emagging a lock properly unlocks the component Fixes #24860 * fix(emag): Emagging a lock no longer duplicates the unlock sound (cherry picked from commit 370a79fbc847c75aca4d733e1cac2bb56a19776b)

* clown mask real * Update masks.yml (cherry picked from commit 2c2be09956e5221cec4835aae6c38981e525e112)

Signed-off-by: Debug <[email protected]>

This reverts commit 02b1352.

2024/03/05 merge master

* Add Station Efficiency Lawset from YogStation * Adds Clown & Cowboy LawSets * adds research lawset & shuffles laws * adds janitor lawset * adds engineer lawset, moves station efficiency to a ion storm lawset * Medical Lawset * Apply lawsets to Borg Chassis' * Medical Lawset * errors >:( * Adds the Druid and Tyrant Lawsets * adds the chaplain lawset * adds chaplain (& maybe clown) to ion storm pool * chaplain locale >:( * adds reporter & live and let live lawsets * and their locale >:( * and their chance to spawn >:( * drone --> cyborg * dungeon master, silicon police, nutimov * paladin lawset * Update silicon-laws.yml using the horrific git mobile interface * i don't really like the engineering lawset, so replaced until further notice * moved things to delta-v places * more fixing * Update silicon-laws.yml * adds clown lawset to ionstorm pool * added "ObeysTo" fields as per Wizden merge * spelling mistake >:( * added custom "obeyTo" for Cowboy * adds delta-v tags --------- Signed-off-by: Danger Revolution! <[email protected]> Co-authored-by: DangerRevoltion <[email protected]>

* Fix weird firerates The .45 magnum firerate is around 2 to 3 so it was extremely funny how the .38 would be slower than a .45 and even the snubbed version. * change ejection port placement on psibreaker * Rubber nerf + new ammo + fix recipe costs Everyone gets incendiary and uranium bullets so why not. * Make lucky available in salvage Alongside the other revolvers * Update look of speedloader So it matches the other revolver speedloader. Slightly smaller just because. * Fix mistakes 🍞 * Add extra speedloaders * mindbreaker ammo box * New markers, update old .38 markers * commentfix * firerate pass 2 * Fixes * cleanup * Add new colored tips to cartridges * Fix typo * holy update after someone pointed out the damage It's technically still a bullet but coated in silver/holy magic whatever, so it should still pierce. Still have to print them one by one and they are not as good as normal bullet against normal things * someone did the math for silver bullets I guess.

Finally add the recipe I swear I hadn't forgot about it

It has bothered me and today felt like fixin it.

Signed-off-by: Debug <[email protected]>

Co-authored-by: Velcroboy <>

* new stamps * add stamps to cmos locker and lawdrobe * adds stamps to starting gear of psychologist and lawyer * move locale to deltav

* nukie medhud Signed-off-by: JoeHammad1844 <[email protected]> * Update meta.json Signed-off-by: JoeHammad1844 <[email protected]> * should solve conflict Signed-off-by: JoeHammad1844 <[email protected]> * that took too long to fix Signed-off-by: JoeHammad1844 <[email protected]> * Update hud.yml Signed-off-by: JoeHammad1844 <[email protected]> * hmmm Signed-off-by: JoeHammad1844 <[email protected]> * might fix it Signed-off-by: JoeHammad1844 <[email protected]> * Update hud.yml Signed-off-by: VMSolidus <[email protected]> --------- Signed-off-by: JoeHammad1844 <[email protected]> Signed-off-by: VMSolidus <[email protected]> Co-authored-by: VMSolidus <[email protected]>

* Finished * Revert "Finished" This reverts commit 4ab2d612a8167b22827c0a042eea657c09fcba9c. * Finished actual * Update general.yml * Update general.yml * making changes added prison coms to security key and removed it from hos headset * I think this is correct * Move localisations into Delta-V directory * file fix * file location change --------- Co-authored-by: Nova <[email protected]>

Half all energy requirements

* updates map, lowers server volume * Delete PLEASEWORKTHISTIMEIBEGYOUS14.yml * Update DV-pirateradio.yml * changes fax machine to *not* alert admins; and start with emagged by default instead of using VV * Revert "changes fax machine to *not* alert admins; and start with emagged by default instead of using VV" This reverts commit 05bb5f402d7986214f753dd217765e01b46e69a7. * Revert "Update DV-pirateradio.yml" This reverts commit e77fb34e86c994bce2f63205741636be6c0286fd. * Revert "Delete PLEASEWORKTHISTIMEIBEGYOUS14.yml" This reverts commit 2000e2c147125827405eeaf1191abb29c7b4c7d8. * Revert "updates map, lowers server volume" This reverts commit d99cab6f36c26441c8431ee5c7d2fc2ad1ff68d7. * adds new syndicate fax, maps it in as well as other QOL changes * adds cybersun pen to Syndicate PDA's * Update DV-pirateradio.yml * adds blacklist to CC Fax + quieter server * Update PirateRadioSpawnRule.cs * unfinished scuttling system * Adding colorblind quality of life. * Tweaks to map and guards, no more self destruct system * added guard flavor text * The reasons for these are now gone * DONE * Update events.yml * Update PirateRadioSpawnRule.cs * Update DV-pirateradio.yml * fixes crew monitor server not working at *extreme* ranges * adds delta-v comment where needed * Small code optimization and tons of documentation * Update outpost visuals! Guards have a PDA now * Update DV-pirateradio.yml * Update DV-pirateradio.yml * Goodbye crab. Hello Content.Shared migration * Cleaning up pirateradio spawn * Update DV-pirateradio.yml * reverts pen changes to upstream PDA's * adds new PDA * adds new PDA to loadouts. * Update Resources/Prototypes/DeltaV/Entities/Mobs/NPCs/salvage.yml Co-authored-by: Debug <[email protected]> Signed-off-by: Danger Revolution! <[email protected]> * Maintainer requested changes * Update salvage.yml * Update syndicateNPCs.yml * Cleaning up unneeded stuff * more code cleanup * Update PirateRadioSpawnRule.cs * Update computers.yml * Revert "Update computers.yml" This reverts commit cbd0c583d48c66579d9fd6ee2c10cd7a350a955c. * Last fixes to the math * Update PirateRadioSpawnRule.cs * update license. --------- Signed-off-by: VMSolidus <[email protected]> Signed-off-by: Danger Revolution! <[email protected]> Co-authored-by: DangerRevoltion <[email protected]> Co-authored-by: VMSolidus <[email protected]> Co-authored-by: Debug <[email protected]>

* Added chemical resistant apron * Added formal chemistry suit * Added chemist's tie * Added enclosed shoes * Added chemistry gloves * Added glasses + fixed errors on modifiers * Updated the ChemDrobe with new items * modified the chemdrobe file * modified the outerclothing misc file * modified glasses file * modified the gloves file * modified ties file * modified specific shoes file * modified jumpsuits file * Update glasses.yml Signed-off-by: VMSolidus <[email protected]> * Update gloves.yml Touching up descriptions Signed-off-by: VMSolidus <[email protected]> * Update misc.yml Signed-off-by: VMSolidus <[email protected]> --------- Signed-off-by: VMSolidus <[email protected]> Co-authored-by: VMSolidus <[email protected]>

* Update cargo_fun.yml Signed-off-by: dge21 <[email protected]> * Update cargo_fun.yml Signed-off-by: dge21 <[email protected]> * Update fun.yml Signed-off-by: dge21 <[email protected]> --------- Signed-off-by: dge21 <[email protected]>

* Adds DV fluff to captain's nolaser locker * I ALREADY DELETED THS, WTF --------- Co-authored-by: Velcroboy <>

* Adds howling / growling noises * revenge of the spelling error!! grahh!! * trying to fix that error with the schema validator * Fixing copyright + adds vulp growls to harpy emote * The case of the missing attributions dashes. * Fixes up attributions.yml with license.txt info * Update Resources/Audio/DeltaV/Voice/Vulpkanin/attributions.yml Co-authored-by: DEATHB4DEFEAT <[email protected]> Signed-off-by: Adeinitas <[email protected]> --------- Signed-off-by: Adeinitas <[email protected]> Co-authored-by: DEATHB4DEFEAT <[email protected]>

Revert "Revert AME buff (#930)" This reverts commit 152a190.

(cherry picked from commit 129892f1442fa0873b907aaf822a9a6d617d2ecf)

* add * yes (cherry picked from commit 83640863699720bce708af20ae0bc37ce2a9ff54)

(cherry picked from commit f82fd23f2c87b7cab852bdc2563cfa30c2d2a6dd)

add (cherry picked from commit 00e770d4dc68f98ecc8a3ef1605277fc2c59fb8f)

Removes metadata merge alongside space-wizards/RobustToolbox#4861 (cherry picked from commit 6ae45378715b9f8fc843a28b762f8b785330f28d)

(cherry picked from commit 3933490962993e839c71efea46c3e799ac824778)

* Minor cloning change in guidebook Cloning this should be removed at some point anyway, but im unsure if it can still be found in salv? can anyone confirm? * Changes and updates to survival, removed fluff * Create TradeStation.xml * Forgor * Change hex * Rework this cause it was out of date * Pointless spacing fixed (copy and pasted made it funny,) * revert (somewhat) Science cant set up cloning, so i just removed that part * Remove more space (cherry picked from commit 7ba6a278a410af8e894abd5798e4577a782f0f94)

Co-authored-by: Kevin Zheng <[email protected]> (cherry picked from commit 1837459614fde9a11c1e5f2a34b3f82fa92f7167)

* please tell me this is empty * it wasn't empty, fixing that * This should fix it * fix for the fix * address changes * fix * Added some comments, hoping that failed test was a fluke. (cherry picked from commit aa4e7c061939fbe314be97a2e7f559477b941c07)

* Add shuttle interior drawing back Just do it per-tile she'll be right, at least it's done with 1 draw call. * Revamp shuttle console * Bunch of cleanup work * Lables sortito * dok * Pixel alignment and colours * Fix a bunch of drawing bugs * Shuttle map drawing * Drawing fixes * Map parallax working finally * weh * Commit all my stuff * mic * deez * Update everything * Xamlify everything * uh * Rudimentary blocker range * My enemies have succeeded * Bunch of changes to FTL * Heaps of cleanup * Fix FTL bugs * FTL * weewoo * FTL fallback * wew * weh * Basic FTL working * FTL working * FTL destination fixes * a * Exclusion zones * Fix drawing / FTL * Beacons working * Coordinates drawing * Fix unknown map names * Dorks beginning * State + docking cleanup start * Basic dock drawing * Bunch of drawing fixes * Batching / color fixes * Cleanup and beacons support * weh * weh * Begin pings * First draft at map objects * Map fixup * Faster drawing * Fix perf + FTL * Cached drawing * Fix drawing * Best I got * strips * Back to lists but with caching * Final optimisation * Fix dock bounds * Docking work * stinker * kobolds * Btns * Docking vis working * Fix docking pre-vis * canasses * Helldivers 2 * a * Array life * Fix * Fix TODOs * liltenhead feature club * dorking * Merge artifacts * Last-minute touchup (cherry picked from commit c5486873db0d6826122eb1f30007e392fc101082)

* Fix FTLToDock - Removed Enabled coz unneeded really. - Fixed SetCoordinates call that got dumped at some point oop. * Fix this docking check (cherry picked from commit 92872e546ad5c281980ab8f56fea970c1921f8e4)

(cherry picked from commit b7ccf738883b486364b10b272ce4c9fef3ad6261)

(cherry picked from commit 21a95960f0fd04b6d99cd7c6617985a7eb5e9175)

Didn't account for UI scale properly I love transforms. (cherry picked from commit 87e2755c31a972f8839b408e5cf78d4665533927)

(cherry picked from commit 4b6e5deb59f53d8d66a2ea9f7af276c0f2aff19d)

Also fixed some other stuff I noticed. (cherry picked from commit c23b3d804efc7f35cf6c56d872d8dd7fee82ece1)

Only thing that even triggers it atm is escape pods. (cherry picked from commit bbb78807c43a9c22b08cf055339dbb74e8ab5d4c)

Branch moment. (cherry picked from commit 574c625d124ba086f03d327be28d961c680dbd73)

* Update shoukou.yml * Update shoukou.yml * Update shoukou.yml * Update shoukou.yml

* Fixes ifriit. The mystagogue's guardian. TO-DO: Figure out how to give the ifriit the actual tool instead of bite that still has the damage propertys of the tool? * Hands, innatetool DEATH giving different parent to make the bite attack frick off. Dont let them shove, simple different attack would make sense. * forgot to delete that one * Just going to put this together I suppose? * I guess his hands atleast work * whoopsie yaml linter * Finishing touches and cleaning up. Not sure how long I will have to living but eh, at the least might aswell finish some PR's * Eh, i wanted to keep it but i guess not. * Update misc_startinggear.yml * Update ifrit.yml * Innate tooling... * Makes it work just how its needed to do so. * brings back the previous pngs

Co-authored-by: DeltaV-Bot <[email protected]>

Signed-off-by: Debug <[email protected]>

Because uh.... higher being.... not really flesh.... pure fire.... gettin zombified? what type of horror is this when it comes to diseases? Now you gonna tell me you can zombify a computer.

Implmement trading post and finish shuttle refactor cherry-pick

* Adds Delta V station beacons * Duped * Add corpsman * Added mantis and shortened names * Remove escape pod beacon * Tidy, remove duplicate changes, and update * Missed Mysta * remove notes --------- Co-authored-by: Velcroboy <>

Signed-off-by: Debug <[email protected]>

This reverts commit 171e56d.

* minor law changes to stop shitters & reduce confusion * Update laws.ftl * space at the end --------- Co-authored-by: DangerRevoltion <[email protected]>

Fix 2 oopsies

* Fix changelog order and admin changelog * Rename upstream admin file

Remove bogus cl entry

* Updated rules 2-5, 2-10, 3-4, 4-8, 6-2, 8-4. * Added a summary. * Update Rules.txt Signed-off-by: Debug <[email protected]> --------- Signed-off-by: Debug <[email protected]> Co-authored-by: Debug <[email protected]>

Fixes the Boxer room's access so that a boxer can actually enter it, also slight changes to the dojo.

* fix warp points, bombing sites, added mcgriff, paramed job. * fix solution smh * added screens and service lights, cargo docks less narrow

Signed-off-by: Debug <[email protected]>

Co-authored-by: Jeff <[email protected]>

…ngines into upstream-sync-5

Update README.md

# Description Replaced the [issue](https://github.com/DEATHB4DEFEAT/Einstein-Engines/tree/markdown/.github/ISSUE_TEMPLATE) and [pull request](https://github.com/DEATHB4DEFEAT/Einstein-Engines/blob/markdown/.github/PULL_REQUEST_TEMPLATE.md) templates with some better ones. Temporarily empty the [CODEOWNERS](https://github.com/DEATHB4DEFEAT/Einstein-Engines/blob/markdown/.github/CODEOWNERS) file until people actually own anything significant. Improve the [LEGAL](https://github.com/DEATHB4DEFEAT/Einstein-Engines/blob/markdown/LEGAL.md) and [README](https://github.com/DEATHB4DEFEAT/Einstein-Engines/blob/markdown/README.md) files.

## About the PR  Ports: DeltaV-Station/Delta-v#976 Ports: DeltaV-Station/Delta-v#975 ## Technical details  "PrisonJumpsuit" component is removed from jumpskirts, so none of the tags are needed hence PrisonJumpskirt no longer needs to overwrite any tags. WhitelistChameleon, ClothMade and Skirt are added to fix Harpy, Cloth and Chameleon issues. ## ( I haven't tested the jumpskirts in the chameleon menu ) ## Media - [X] this PR does not require an ingame showcase ## Breaking changes  PrisonUniform no longer used on Jumpskirts **Changelog** :cl: DangerRevolution - fix: Fixed Harpies being unable to wear prison jumpskirts - fix: Moths can now eat jumpskirts - fix: Jumpskirts are now a chameleon option.

## About the PR  Title ## Why / Balance  Moffs can't eat them **Changelog** :cl: DangerRevolution - fix: Moths can no longer eat medals

# Description I added a few more labels to the repository, this'll make the bot use them.

## About the PR I believed I've removed all the "player facing" Delta-V branding from the game. So - Client name - Client icons and splash - Lobby screens ## Why / Balance The client details were a necessary change for debranding. The current lobby art has 'Delta-V' across the top, and we'll need to ask the authors if they want to change it for EE. For now, I moved over the wizden ones since they're unbranded. ## Media ![logo](https://github.com/Simple-Station/Einstein-Engines/assets/158120145/cbb9b2e4-50e4-4217-ace3-93c33dadeab3) :cl: - add: Added a new icon - tweak: Switched to Wizard's Den's lobby art --------- Co-authored-by: DEATHB4DEFEAT <[email protected]>

GUH

# Description Frees up some runners.

# Description On a repository (and organization) level, I have enabled Actions to create and approve pull requests. This PR will have the in-game GitHub contributor credits automatically updated every week.

# Description Wouldn't it be great if we had Species info in the Guidebook? Wouldn't it be even better if this was available in the character editor? Now there will be an info button next to the species selection dropdown, complete with hover tooltip. Pressing the button opens the relevant Guidebook page and also loads the other species pages, so the player can click check them all without having to change species in the character editor. --- <details><summary><h1>Media</h2></summary> <p> ![1](https://private-user-images.githubusercontent.com/35878406/310249378-5ef5a892-2290-445e-b347-7d81265a261d.png?jwt=eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJpc3MiOiJnaXRodWIuY29tIiwiYXVkIjoicmF3LmdpdGh1YnVzZXJjb250ZW50LmNvbSIsImtleSI6ImtleTUiLCJleHAiOjE3MTA3MDI4MzMsIm5iZiI6MTcxMDcwMjUzMywicGF0aCI6Ii8zNTg3ODQwNi8zMTAyNDkzNzgtNWVmNWE4OTItMjI5MC00NDVlLWIzNDctN2Q4MTI2NWEyNjFkLnBuZz9YLUFtei1BbGdvcml0aG09QVdTNC1ITUFDLVNIQTI1NiZYLUFtei1DcmVkZW50aWFsPUFLSUFWQ09EWUxTQTUzUFFLNFpBJTJGMjAyNDAzMTclMkZ1cy1lYXN0LTElMkZzMyUyRmF3czRfcmVxdWVzdCZYLUFtei1EYXRlPTIwMjQwMzE3VDE5MDg1M1omWC1BbXotRXhwaXJlcz0zMDAmWC1BbXotU2lnbmF0dXJlPTk3NDdhMDZjMzU2YjI0YWVmZjc3MjEwMmI4ODJiOGUzZTljNmU5ZGE1ODIxYjZkNjFkYjgxNDU5ZGY2ZTdhZGUmWC1BbXotU2lnbmVkSGVhZGVycz1ob3N0JmFjdG9yX2lkPTAma2V5X2lkPTAmcmVwb19pZD0wIn0.A05R1DRjL1uDD3-XL0ztRR2zG2MDCHNoW5Pjs8nmW1w) ![2](https://private-user-images.githubusercontent.com/35878406/309905910-90953fbc-d264-4908-ad20-ace690a296c0.png?jwt=eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJpc3MiOiJnaXRodWIuY29tIiwiYXVkIjoicmF3LmdpdGh1YnVzZXJjb250ZW50LmNvbSIsImtleSI6ImtleTUiLCJleHAiOjE3MTA3MDI4MzMsIm5iZiI6MTcxMDcwMjUzMywicGF0aCI6Ii8zNTg3ODQwNi8zMDk5MDU5MTAtOTA5NTNmYmMtZDI2NC00OTA4LWFkMjAtYWNlNjkwYTI5NmMwLnBuZz9YLUFtei1BbGdvcml0aG09QVdTNC1ITUFDLVNIQTI1NiZYLUFtei1DcmVkZW50aWFsPUFLSUFWQ09EWUxTQTUzUFFLNFpBJTJGMjAyNDAzMTclMkZ1cy1lYXN0LTElMkZzMyUyRmF3czRfcmVxdWVzdCZYLUFtei1EYXRlPTIwMjQwMzE3VDE5MDg1M1omWC1BbXotRXhwaXJlcz0zMDAmWC1BbXotU2lnbmF0dXJlPTQxY2Y2NGYwZTdhZmQ0NWRhOWFiOWMwMDc0YTVmOGJjNzU0N2ZkMGM5NzY4NTZkNzJiYzk1ZjViNTc4ODYzNDgmWC1BbXotU2lnbmVkSGVhZGVycz1ob3N0JmFjdG9yX2lkPTAma2V5X2lkPTAmcmVwb19pZD0wIn0.t1gTj4gzm6Kon5N2Dlg-H4uOwIrDMSre3gnKhM4qU7A) ![3](https://private-user-images.githubusercontent.com/35878406/309905952-b52e9c05-141c-4078-9ec6-d34318c5d35b.png?jwt=eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJpc3MiOiJnaXRodWIuY29tIiwiYXVkIjoicmF3LmdpdGh1YnVzZXJjb250ZW50LmNvbSIsImtleSI6ImtleTUiLCJleHAiOjE3MTA3MDI4MzMsIm5iZiI6MTcxMDcwMjUzMywicGF0aCI6Ii8zNTg3ODQwNi8zMDk5MDU5NTItYjUyZTljMDUtMTQxYy00MDc4LTllYzYtZDM0MzE4YzVkMzViLnBuZz9YLUFtei1BbGdvcml0aG09QVdTNC1ITUFDLVNIQTI1NiZYLUFtei1DcmVkZW50aWFsPUFLSUFWQ09EWUxTQTUzUFFLNFpBJTJGMjAyNDAzMTclMkZ1cy1lYXN0LTElMkZzMyUyRmF3czRfcmVxdWVzdCZYLUFtei1EYXRlPTIwMjQwMzE3VDE5MDg1M1omWC1BbXotRXhwaXJlcz0zMDAmWC1BbXotU2lnbmF0dXJlPTVmNGZlMGU1Y2Q4Mjc3YWEyNjIxNjQ1YTg4MzQ3MzVhZTg3YTkzMjBmZDE1NzcwM2NlYjc1MTAyNWI3OGJlNTAmWC1BbXotU2lnbmVkSGVhZGVycz1ob3N0JmFjdG9yX2lkPTAma2V5X2lkPTAmcmVwb19pZD0wIn0.XkaMdUDpi2uZxRqb4NtVf9JX45yE1sn2xRrsEELCDA8) </p> </details> # Changelog :cl: Errant - add: Added guidebooks for species - add: Species in the character editor have a shortcut to their guidebook entry Co-authored-by: Errant <[email protected]>

space-wizards/space-station-14#26136 # Description Light Replacer no longer sends out the wrong locale string. Read PR above for details ^ Cherrypicked from Wizden in the gap between last merge and right now.

@justani

Courtesy of @justani <3

This is an automated Pull Request. This PR updates the GitHub contributors in the credits section. Co-authored-by: SimpleStation Changelogs <[email protected]>

<details><summary><h1>Media</h1></summary> <p> ![Content Client_6OiLX3GDTn](https://github.com/Simple-Station/Einstein-Engines/assets/77995199/1ee78b9c-0f49-48ed-b958-b22bcb54a1c3) </p> </details>

# Description Ports space-wizards/space-station-14#26102. Co-authored-by: Tayrtahn <[email protected]>

…ngines into upstream-sync-5

…n-Friendly-Chainsaw into upstream-sync-5

Commits on Apr 6, 2024

review changes

DEATHB4DEFEAT committed Apr 6, 2024

Configuration menu

View commit details

Copy full SHA for 3d31fd1

Browse repository at this point

Copy the full SHA

3d31fd1 View commit details

Browse the repository at this point in the history

Commits on May 3, 2024

review changes

DEATHB4DEFEAT committed May 3, 2024

Configuration menu

View commit details

Copy full SHA for a0f3d17

Browse repository at this point

Copy the full SHA

a0f3d17 View commit details

Browse the repository at this point in the history

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Upstream Sync (License Change) #56

Upstream Sync (License Change) #56

Commits on Mar 7, 2024

Commits on Mar 8, 2024

Commits on Mar 9, 2024

Commits on Mar 10, 2024

Commits on Mar 11, 2024

Commits on Mar 12, 2024

Commits on Mar 13, 2024

Commits on Mar 14, 2024

Commits on Mar 16, 2024

Commits on Mar 18, 2024

Commits on Mar 19, 2024

Commits on Mar 20, 2024

Commits on Mar 22, 2024

Commits on Mar 23, 2024

Commits on Mar 24, 2024

Commits on Mar 26, 2024

Commits on Mar 27, 2024

Commits on Mar 28, 2024

Commits on Apr 6, 2024

Commits on May 3, 2024

Commits on Jun 3, 2024