master
63 Commits
| Author | SHA1 | Message | Date | |
|---|---|---|---|---|
ThereDrD
|
63b816b83b |
[WIP] Upstream 2 (#489)
* Automatic changelog update
(cherry picked from commit 235091b377d6dc8f95b38d239a8e07560d45fa7c)
* Remove airtight flaps from the construction menu (#27619)
They are meant to be mapping only items.
(cherry picked from commit a4b0a34bc74e3e374d780e7ba142d7670ca5ff59)
* Automatic changelog update
(cherry picked from commit 64a732ad7b1ba93b3aa64c233ecc7e4609683bf1)
* Wine and beer bottles can be inserted into booze dispenser (#27626)
Fixes tags on wine and beer bottles
(cherry picked from commit b728f36f30260a80a7a499429430f0d7c69ff54d)
* Automatic changelog update
(cherry picked from commit 09b6f5c12888ca3a2fa51ab3544e4139988febcd)
* small SpawnItemsOnUse cleanup (#27625)
* small SpawnItemsOnUse cleanup
* that one was not needed
(cherry picked from commit eab276a12da4bd762b33c44c868722c2ef813d68)
* make ducky slippers waddle (#27628)
Co-authored-by: deltanedas <@deltanedas:kde.org>
(cherry picked from commit 8909dc7d401a7351ce0034c9e58af66922f5dbda)
* Fix SpawnItemsOnUse not playing sound (#27621)
Made SpamItemsOnUse play sound at entity coordinates instead of parenting
(cherry picked from commit 9b176933969b00e70d52bbb9b960ed631f09b0ac)
* Automatic changelog update
(cherry picked from commit 8a7f7097944f6d9bb7c587a22118cad8b068926c)
* Fix UI interaction priority (#27631)
(cherry picked from commit 3c3c2daf26eb4c215e3de26120e5be593ebb3620)
* Automatic changelog update
(cherry picked from commit f76a471e5a22480f975ec1448a2fdea3c6476271)
* Automatic changelog update
(cherry picked from commit 291ecf9643a5308fd5f8b9172e1710862da683f8)
* Add EntityWhitelistSystem (#27632)
* Add EntityWhitelistSystem
* Sandbox fix
* update test
(cherry picked from commit f348e6aa306a3542b1ed75b021c45228250aca3c)
* Add syndicate sleeper agents random event (#27501)
* Intercept rule (#10)
* add
* b
* add this back lol
* fix test fails (alert levels dont have prototypes)
* tweaks
(cherry picked from commit c69bf2f2aa23d57179dce1f6af9f7c73903d47e2)
* Automatic changelog update
(cherry picked from commit 192de3d9cb06c9526c5c63783507590c175acff9)
* Space Ninjas auto-toggle internals after spawning (#25083)
* fix engine version
* actually fix engine version
* Automatically activated breathing masks
* weh
* who needed that component anyway
* check if internals are already running
* Update Content.Server/Atmos/Components/BreathToolComponent.cs
Co-authored-by: metalgearsloth <31366439+metalgearsloth@users.noreply.github.com>
* Update Content.Server/Body/Systems/InternalsSystem.cs
Co-authored-by: metalgearsloth <31366439+metalgearsloth@users.noreply.github.com>
* prediction
* record struct event
* remove delayed activation, instead ensure that masks spawn last
* leftover
* engine version
* re-implement
---------
Co-authored-by: metalgearsloth <31366439+metalgearsloth@users.noreply.github.com>
Co-authored-by: metalgearsloth <comedian_vs_clown@hotmail.com>
(cherry picked from commit f64dd5f45f8ebc08d791ac34e9482c6c3d85a51b)
* Automatic changelog update
(cherry picked from commit 4ede46003abf4c0593de00f802550df2b3642055)
* Fixes the grammar for the captain's supervisor (#27638)
Fixes the grammar on the captain's supervisor
(cherry picked from commit a28296433b03c041e4374e88bdef7347a85f895f)
* Red bool update (#27597)
* the meat and potatoes
yuh yuh yuh
* what the hell is a copyright?
am I right?
(cherry picked from commit a8bf2689a4696e841ce607c7061ac73faceeeefb)
* Automatic changelog update
(cherry picked from commit 40a4eeaa3953db8213034fd3dd12fedce922deff)
* Allow EMP implants to be used while stunned or cuffed. (#27644)
Update types.yml
(cherry picked from commit 0056befd4bac47f9e86c975342fcc80583affbb9)
* Automatic changelog update
(cherry picked from commit bedec83cd9a778d86795a0c8a5e4d439a3e4d407)
* Geras bug fixes (#27308)
* Geras bug fixes
* oops
* its as shrimple as that
toggled transferName in the polymorph yml instead of using the system to manually change it
* its as shrimple as that (2.0)
fixed reviews for zombies having a dummy action, instead - properly implemented removal of action
* its as shrimple as that (3.0)
fixed tests by removing nameidentifier from slime (its already inherited, anyway)
(cherry picked from commit 76ecdee94604f3cc73aba8b09d7bb36125a069e4)
* Automatic changelog update
(cherry picked from commit c045e2488e6ce85f16c7f4cf5dfced18cb18ce62)
* Ninja's pinpointer tracks the research server (#27552)
Change the tracked component on the ninja's pinpointer from BecomesStation to Research Server
(cherry picked from commit 6fc684812d4deed313970de40e81822157afe461)
* Automatic changelog update
(cherry picked from commit 960f268d1cf5d2b318ccd4b2adf18f1837d1c9bc)
* Fix some gamerules' round summary not working (#27654)
Update GameRuleSystem.cs
(cherry picked from commit 6ecbf0a04ce3ebaa6c74e144a8fb64ddf3223b43)
* Automatic changelog update
(cherry picked from commit 1d5392f86bd9a086283619ad7ce5d3259b1313df)
* Change return to continue in gamerulesystem (#27656)
Update GameRuleSystem.cs
(cherry picked from commit 96a3967c3f4bcf5826b62013bc3e665656b1db81)
* Rename Lizard urist (#27652)
(cherry picked from commit 1b3481f094edffee3d7841e0c3ccbf8ba4cc30cb)
* Automatic changelog update
(cherry picked from commit 07d43af4a6e407d4e752466d965177dfe3e5c876)
* Pathological Liar (#27618)
* content
* upgrade
* n't
* ye ya
* Update speech-liar.ftl
* Mith replacement ideas
* fix
* more!
* Revert "more!"
This reverts commit 6d10bdf694985c525a2b451ed39380f975059b44.
* Update Content.Server/Speech/Components/ReplacementAccentComponent.cs
---------
Co-authored-by: Kara <lunarautomaton6@gmail.com>
(cherry picked from commit 5ab1cc0c846775e438517bbff9d7713eeb5ef85d)
* Automatic changelog update
(cherry picked from commit 540c45cbe9b6dbfce9eeb523f0c374d39ac7221c)
* npc can no longer attack you through a locker (#27677)
(cherry picked from commit 83b486b63fd23e149bb0112aac4800e63b1f33dc)
* translations
* Automatic changelog update
(cherry picked from commit 8ee9ca22276df595ab4dc7767d66d9145dac2743)
* Security belts can now hold more items commonly carried by secoffs/HoS (#27674)
holobarrier
(cherry picked from commit 873799095cc28cb5db753b005b3fa00ee117c370)
* Automatic changelog update
(cherry picked from commit 0a15d0855083eb5a35c5c8d0170720a294d07bf7)
* Floodlights now have medium powercells instead of small (#27672)
mediumcellfloodlight
(cherry picked from commit 1c125cb14e661492e4c2a31f2e9d07c60bdde0c8)
* Automatic changelog update
(cherry picked from commit 4bb078601845228391db7a09f1b8c4a5c8f410d1)
* More descriptions for the beakers in the status panel (#27669)
Bottles
Descriptions for status panel
(cherry picked from commit c3fe975e8b8cf1dd220a49ceecd7450535eabf45)
* Revert "npc can no longer attack you through a locker" (#27680)
Revert "npc can no longer attack you through a locker (#27677)"
This reverts commit 83b486b63fd23e149bb0112aac4800e63b1f33dc.
(cherry picked from commit 37d0cb9c9085befad4f7fe1ee21a15d1d3c2f66c)
* Scattershot antag fixes (#27429)
* scattershot antag fixes
* this too?
* dawg fuck this code
* ok so we kinda need this?
(cherry picked from commit 5183f3ed8ba40527808610596d7e3eef3c925eef)
* Rename ChemCleanBoodstream.cs (#27691)
(cherry picked from commit 45fc6bed2f6e812603e0c181b0b163f15576749e)
* Add default whistle + whistles reorganize (#27676)
* Add default whistle + whistle reorganize
* aaa
* fux?
* fiiiiix???
* Revert "fiiiiix???"
This reverts commit 15353465d58db615185afa8c549e1819099c1a5b.
* Apply suggestions from code review
Co-authored-by: Tayrtahn <tayrtahn@gmail.com>
---------
Co-authored-by: Tayrtahn <tayrtahn@gmail.com>
(cherry picked from commit ead78b72d2e507fadf4f5424377aff8a5f94d271)
* Automatic changelog update
(cherry picked from commit 92c2ff0b05482ea490fbdc8ac3d27776a30dd936)
* Use dotnet run for the run batch files instead of directly calling the exe (#27698)
* Use dotnet run for the run batch files instead of directly calling the exe
* FUCK
(cherry picked from commit eb2fac40db1dfaf789511eef0cb7e394100fef50)
* Emergency Tank + Plasma Can visible on suit storage slot (#27598)
* Suitstorage Sprites + Plasma tank slots
* Fix some extra brackets
(cherry picked from commit 70d3cf7ba411ef38818f63eec944c4f0c7c33c98)
* Cache regex instances in most cases (#27699)
Using static Regex functions that take in a pattern is bad because the pattern constantly needs to be re-parsed. With https://github.com/space-wizards/RobustToolbox/pull/5107, the engine has an analyzer to warn for this practice now.
This commit brings most of content up to snuff already, though some of the tricker code I left for somebody else.
(cherry picked from commit 4a2a63a86b0ad36a2850e5750bfd5e653cb2ebd6)
* update engine 6
* Remove useless line in runclient (#27701)
I forgor
(cherry picked from commit c61e683354d45bd4ec382de9117ba75cab67db9f)
* welding masks on utility belts (#27694)
(cherry picked from commit 7d35d54a814df74ef385ad8293eadff3e921c1c9)
* Automatic changelog update
(cherry picked from commit b947490d089af4c70ff0979250a4a03064e87069)
* Add solution temperature to chemical analysis goggles (#27693)
yes
(cherry picked from commit 93c5e868579c0bd1baec8c6d023d98f530b63c44)
* Automatic changelog update
(cherry picked from commit 254a9177fc99a359f134516b19d2943baf50ae5f)
* Expeditions audio tweaks (#27524)
- Now uses a SoundCollection.
- Now properly handles going between maps (audio rework mucho wow).
- GetAudioLength used so it can properly countdown ANY song (wow audio rework wow wow).
(cherry picked from commit d1a5d3562355a514c42b1027742549180f6edc37)
* Automatic changelog update
(cherry picked from commit 82fe5ab55de121e153b164b83b363fd4d95e437d)
* Fix AlertControl throwing an error if the sprite view entity is deleted multiple times (#27690)
* Fix AlertControl throwing an error if disposed multiple times
* Replace default check with deleted check
(cherry picked from commit c20df3e39ffd3b28db499bcc4a0e1fb48b563826)
* Fix tests (#27711)
* Fix tests
* Fix test fail
* Apply same fix to other tests
(cherry picked from commit eee8e03c15ea22472d6b442281fccc4cb036e64d)
* New Salvage song: Deadline (#27707)
Deadline
(cherry picked from commit 104c2afe692c0c05172b9ba2a15213d2a54ae99c)
* fix(ui): Fix shuttle control radius marking text vertical spacing (#27695)
(cherry picked from commit 7ffa74abd009650de3868d47c95b45ef4a18ea9c)
* Automatic changelog update
(cherry picked from commit 1ecc36b04945169e42ad42de56d7af69092aa447)
* Dock device link port (#27646)
* Add dock device link port
* SpawnAndDeleteAllEntitiesInTheSameSpot moment
* The fuck is TryStopNukeOpsFromConstantlyFailing??
Do we have a new test that can randomly fail?
(cherry picked from commit c7a5587e0710f6d4b8a959bb54fbcd9e9631a96f)
* Automatic changelog update
(cherry picked from commit 3b3cc0e66cd03d71c27ba65810f876001923fcfa)
* update engine 7
* Update license of deadline.ogg (#27715)
(cherry picked from commit b8d03b814b1ede3a53874efe2d8d46f3ef8dbd6c)
* Round event frequency simulation command (#27718)
(cherry picked from commit c1aae2398b5e4510b9b07ea7af877fc5760dd5c3)
* New lobby art: Just a week away (#27717)
just a week away
(cherry picked from commit 026af631f8a844b000dec4702eb6080e9a7bed9b)
* Automatic changelog update
(cherry picked from commit 3dcb65feb292e3088729b69f36fc3d5ac51eae58)
* Fix missing command desc (#27722)
(cherry picked from commit aa426c9c3aec67ee82f7b6d10cd5770ad008483d)
* Remove duplicate liar word id (#27723)
(cherry picked from commit fbe8374c0f79b32dc49f0a009041798510f2c888)
* Event frequency balance pass (#27721)
balance
(cherry picked from commit 8f4362df036ea1dd5dba7a31c3669640964a45c2)
* Automatic changelog update
(cherry picked from commit 8fa7ea7cf9c03ea3273882708d31092a0c6e2eb9)
* Fix some gamerules' round summary not working (#27654)
Update GameRuleSystem.cs
* fixes
* fix antag selection being evil (#28197)
* fix antag selection being evil
* fix test
* untroll the other tests
* remove role timer troll
* Allow tests to modify antag preferences
* Fix antag selection
* Misc test fixes
* Add AntagPreferenceTest
* Fix lazy mistakes
* Test cleanup
* Try stop players in lobbies from being assigned mid-round antags
* ranting
* I am going insane
---------
Co-authored-by: deltanedas <@deltanedas:kde.org>
Co-authored-by: ElectroJr <leonsfriedrich@gmail.com>
* fucking tests
* fix round restart loops
* Fix `TryFindRandomTile` grid weighting (#27724)
(cherry picked from commit aaabd5e9141e2e51b81c0dacd32e7e849826204d)
* Automatic changelog update
(cherry picked from commit ddb07d5f6362de11832f6b2085c4f6e8abfa625c)
* Remove duplicate liar word id. Again (#27727)
Missed one translation
(cherry picked from commit b58d8a02b6e0d0a8b546fc0d1e437cb0b4f147bf)
* Half the amount of bleed rate cauterized by burn damage (#27726)
half
(cherry picked from commit 7d23d014458180fe26b3ec847417a99120cf6ef5)
* Reduce the amount of burn damage from touching lights (#27728)
* chilled
* external
(cherry picked from commit 7794ab86094d1c406fbb888ae3ed2a489348af9c)
* Automatic changelog update
(cherry picked from commit 008f6ef94a65a48d8bc2e89c80774d1ac6c624b3)
* Moved Serverside solution container code to shared (yes that includes ensureSolution!) (#27478)
* Added warning to tryGetSolution, moved SolutionContainer code to shared
- Added an optional warning (false by default) to print an error if a solution is missing when using tryGetSolution methods
- Moved ensuring solution containers to shared, left the old method stubs for compatability and marked them as obsolete.
* Update SharedSolutionContainerSystem.cs
* Update SharedSolutionContainerSystem.cs
* Update SolutionContainerSystem.cs
* Update SharedSolutionContainerSystem.cs
* Fixing ensuring chem solutions always returning false on client
- ensuring chem solutions will only return false on the client if it is waiting for a server solutionEntity to be synced
* Added concentration helpers
* fix whitespace
(cherry picked from commit 6685146a1e3e188eac1fb2502920225c56cc08e1)
* Automatic changelog update
(cherry picked from commit 19aeff26ec2cb87ceee918c1c5f4f6639fd35ad5)
* Night on Europa (#27731)
night
(cherry picked from commit cc9e40820fa48a7378c6b96371ef819010e7c085)
* Reduce ratking chance severely (#27760)
(cherry picked from commit 7d7c71e6a66bd0e626bc1b31529db0f708b8066a)
* Automatic changelog update
(cherry picked from commit 61c1aeddf369e46c269c2b03cace3f0b25ebf470)
* Fix preference loading bugs (#27742)
First bug: if an error occured during pref loading code, it would fail. If the person then readied up, it would likely cause the round to fail to start.
Why could they ready up? The code only checks that the prefs finished loading, not that they finished loading *successfully*. Whoops.
Anyways, now people get kicked if their prefs fail to load. And I improved the error handling.
Second bug: if a user disconnected while their prefs were loading, it would cause an exception. This exception would go unobserved on lobby servers or raise through gameticker on non-lobby servers.
This happened even on a live server once and then triggered the first bug, but idk how.
Fixed this by properly plumbing through cancellation into the preferences loading code. The stuff is now cancelled properly.
Third bug: if somebody has a loadout item with a playtime requirement active, load-time sanitization of player prefs could run into a race condition because the sanitization can happen *before* play time was loaded.
Fixed by moving pref sanitizations to a later stage in the load process.
(cherry picked from commit 7a38b22ddbf03814680277d54c285dcc70345e20)
* Automatic changelog update
(cherry picked from commit 0cb50a24c37f83da2f852660cf5e38a8936750d8)
* Little morgue overhaul (#27750)
(cherry picked from commit d099b634242b3f8b84724f90b279f5b20f153333)
* Automatic changelog update
(cherry picked from commit 35dc85fd47a9d3e6af10de2f7aad3076586ee4da)
* Make arguments and parameters wrap to one variable per line (#27766)
(cherry picked from commit b9906eb34cb56f7ef34f5b4f050b0ef2f87b1be9)
* Revert "Fix turned off thrusters consume power" (#27755)
Revert "Fix turned off thrusters consume power (#26690)"
This reverts commit
|
||
|
ThereDrD
|
8e4ebf02aa |
Revert "Goida revert (#600)" (#601)
This reverts commit
|
||
MJSailor
|
a95fe13180 |
Goida revert (#600)
* Revert "- fix: YAML linter fixes. (#598)" This reverts commit |
||
Aviu00
|
012bf3c357 | - fix: YAML linter fixes. (#598) | ||
|
ThereDrD0
|
ae4b7834b7 |
Респрайт всего связанного с клоуном (#529)
* resprite all clown stuff * commit 2 |
||
|
ThereDrD0
|
1acc84c21c |
Cherry picks 6 (#486)
* inital * force them to WRITE * b * new system * aaaa * b * bbbb * translations * add tts support for evacuation reason * PaddedStool_Sprite&Prototype 8 colors of pudded stool. * PaddedStool_Crafting * ComfyChair_Sprites&Prototype * ComfyChair_Crafting * Sofa_Sprites&Prototype * Sofa_Crafting * Sofa_SpriteFix * Sofa_RemoveSomeSprites * Revert "Sofa_RemoveSomeSprites" This reverts commit b110e9bda9a75cf6337c4efacd4888967d0e1fe6. * Revert "Sofa_SpriteFix" This reverts commit bfa8a17c16c57d2f70d64eb8dd54ae94ac48b248. * Revert "Sofa_Crafting" This reverts commit 89daadcb1e9d45a84281a5fdf998ab6c6f6b0f9b. * Revert "Sofa_Sprites&Prototype" This reverts commit 73cd0be403e03b1852a4632e1b6a8ca7526c5622. * Revert "ComfyChair_Crafting" This reverts commit 940f9665dd998090b43bca596ef3800c0c6ba89b. * Revert "ComfyChair_Sprites&Prototype" This reverts commit 2c909de5d3e3f4ab5efa1cbef6b5feda32d05a80. * Revert "PaddedStool_Crafting" This reverts commit 82040ba82c0190f2a52614fd3573e77586d73802. * Revert "PaddedStool_Sprite&Prototype" This reverts commit c5241a03ffeccbb4a18ab0f108d05c4fe1e047ba. * Sprites&Meta * Crafting * Tweaks * PaddedStool_tweaks * Add Random Spawners * remove old colored chairs * Sprites&Meta * Changing prototypes * Adding to Theater vend * Sprite_Change * Sprite_Change * Prototype_Changes Is this exactly how it should be?... * add bouquet * Not very useful functionality has been removed * Update toys.yml * Now you need cloth to made bouquet * Update toys.yml * I hope. I done right * Update toys.yml * Update bouquet.yml * Update toys.yml * Update Resources/Prototypes/Recipes/Crafting/Graphs/toys.yml Co-authored-by: lzk <124214523+lzk228@users.noreply.github.com> * add musician jumpskirt to loadouts * better bouquet * pAIs can now be inserted into plushies. * No more bad bleed * More Tourniquets, hopefully fixed YML check. * deals a bit of bloodloss * Reduce Stack Count. * fix tourniquet * add migrations for old chair types and add few new --------- Co-authored-by: Mr. 27 <koolthunder019@gmail.com> Co-authored-by: Арт <123451459+JustArt1m@users.noreply.github.com> Co-authored-by: Green resomi <135062489+Yeah-I-listening-Hollywood-undead@users.noreply.github.com> Co-authored-by: lzk <124214523+lzk228@users.noreply.github.com> Co-authored-by: Moomoobeef <moomoobeef@protonmail.com> Co-authored-by: PoorMansDreams <andyroblox14@gmail.com> |
||
|
ThereDrD0
|
d8ffea1ee8 |
Апстрим некоторого из ботаники (#415)
* Rainbow Weed (#25759) * rainbow weed * Lipolicide * psicodine + mannitol * happiness * ground + dried + smokables * damn you notepad++ * fix WHY NOT TELL ME ALL THE PROBLEMS AT THE SAME TIME!!! * work * work i beg you * recipe good * possibly fix merge conflict * remove reagents * Psicodine, Mannitol, Lipolicide and Happiness (#27134) * reagents * Update Resources/Locale/en-US/reagents/meta/narcotics.ftl --------- Co-authored-by: Kara <lunarautomaton6@gmail.com> * fix cannabis * Killer tomatoes (#26053) * make tomatoes * many friends! many mommies * finish * renaming system * fix * Update miscellaneous.yml * Update Content.Server/NPC/Systems/NPCImpritingBehaviourSystem.cs Co-authored-by: faint <46868845+ficcialfaint@users.noreply.github.com> * N * deleete exception? * merge conflict fix * fix? * fuck you * sloth fixes * fixess? * fix --------- Co-authored-by: faint <46868845+ficcialfaint@users.noreply.github.com> Co-authored-by: metalgearsloth <comedian_vs_clown@hotmail.com> * Small tomato killer tweak (#27265) * Update miscellaneous.yml * Update mobspawn.yml * Update miscellaneous.yml * Update miscellaneous.yml * Spaceman's Trumpet and Lily (#25090) * trumpet + lily +polypy * trumbet * Change plant clipping mechanics (#25326) Make seeds from clipped plants inherit the decreased health from parents. Also require one growth stage before clipping. * fixes * Resprite & hand position correction of Nettle & Death Nettle (#25421) Resprite of Nettle & Death Nettle. Corrected R & L hand locations for all orientations of both plants. * Remake hairflowers (#25475) * Add more lily usage (orange hairflower and flowercrown) * comit 2 * ee * more fixes * w * im stupid * bring poppy in authodrobe * weh --------- Co-authored-by: metalgearsloth <31366439+metalgearsloth@users.noreply.github.com> * Revert "Remake hairflowers (#25475)" This reverts commit 6b2a9b96b18a6c854c3aea149611d7dd496518c0. * Make Holy Water more like Water (#27068) holy water can now be used to satiate thirst, water plants, and extinguish fires. * New plant mutation: Pyrotton (#27200) * WIP * sprites n stuff * flavour * maybe fix * add stack * fix parent * Rewords plant/effect descriptions for clarity (#28156) (#28169) * Rewords plant/effect descriptions for clarity (#28156) * Forgot Robust Harvest. * Update Resources/Locale/en-US/guidebook/chemistry/effects.ftl --------- Co-authored-by: Nemanja <98561806+EmoGarbage404@users.noreply.github.com> --------- Co-authored-by: potato1234_x <79580518+potato1234x@users.noreply.github.com> Co-authored-by: Kara <lunarautomaton6@gmail.com> Co-authored-by: Ed <96445749+TheShuEd@users.noreply.github.com> Co-authored-by: faint <46868845+ficcialfaint@users.noreply.github.com> Co-authored-by: metalgearsloth <comedian_vs_clown@hotmail.com> Co-authored-by: Flesh <62557990+PolterTzi@users.noreply.github.com> Co-authored-by: MjrLandWhale <brandonemitch@gmail.com> Co-authored-by: lzk <124214523+lzk228@users.noreply.github.com> Co-authored-by: metalgearsloth <31366439+metalgearsloth@users.noreply.github.com> Co-authored-by: Ghagliiarghii <68826635+Ghagliiarghii@users.noreply.github.com> Co-authored-by: Ubaser <134914314+UbaserB@users.noreply.github.com> Co-authored-by: alex-georgeff <54858069+taurie@users.noreply.github.com> Co-authored-by: Nemanja <98561806+EmoGarbage404@users.noreply.github.com> |
||
|
ThereDrD0
|
164251ffa7 |
Cherrypicks 5 (#399)
* Give moldy food the "Trash" tag (#29380) Make moldy food items have the "Trash" tag, so they can be collected. * Add "Structure" tag to switches, buttons, and levers (#29378) shit Co-authored-by: Eoin Mcloughlin <helloworld@eoinrul.es> * Revamped Meteor Swarm (#28974) * meteor code and balanced values * Meteor Swarms * Update meteors.yml * Update meteors.yml * HOO! (fix overkill bug and buff space dust) * undo BloodstreamComponent.cs changes * DamageDistribution -> DamageTypes * part 2. * meteor fixes * improve meteor spawning (#29057) * Decrease meteor frequency (#29194) * Make Projectiles Only Hit a Variety of Station Objects Unless Clicked on (#28571) * Revert "Make Projectiles Only Hit a Variety of Station Objects Unless Clicked on (#28571)" This reverts commit 4f934f02f17ce55cabc03b965eb1df7738d63148. * Makes machine parts stackable, removes unused field in stack prototypes (#28434) * Makes machine parts stacks, removes unused field in stack prototypes * forgor * Fix tests * Fixes lathe construction. Yes. This sucks but there's no better way that doesnt involve refactoring machine parts completely * detail * a * Add pressure and temperature warning text to firelocks (#28341) * fix firelocks * missing nukies can be filled in by ghost roles (#28316) * Revert "missing nukies can be filled in by ghost roles (#28316)" This reverts commit 99f13e1e45bc778a4941316fde5d89d7b91337ce. * welding gas mask (#27108) * welding gas mask * eek * Canes + Cane Blade for Syndicate Librarians (#25873) * Cane + Cane Blade * Add - type: ContainerContainer * Add another - type: ContainerContainer * Fix and add proper ContainerContainer component * Add UserInterface component * Remove Space * Stat Changes * review --------- Co-authored-by: metalgearsloth <comedian_vs_clown@hotmail.com> * Fix stupid NPC. (#26868) * init commit * Review --------- Co-authored-by: metalgearsloth <comedian_vs_clown@hotmail.com> * fixes --------- Co-authored-by: VeritableCalamity <34698192+Veritable-Calamity@users.noreply.github.com> Co-authored-by: eoineoineoin <github@eoinrul.es> Co-authored-by: Nemanja <98561806+EmoGarbage404@users.noreply.github.com> Co-authored-by: Cojoke <83733158+Cojoke-dot@users.noreply.github.com> Co-authored-by: AJCM-git <60196617+AJCM-git@users.noreply.github.com> Co-authored-by: ShadowCommander <10494922+ShadowCommander@users.noreply.github.com> Co-authored-by: deltanedas <39013340+deltanedas@users.noreply.github.com> Co-authored-by: Ps3Moira <113228053+ps3moira@users.noreply.github.com> Co-authored-by: metalgearsloth <comedian_vs_clown@hotmail.com> Co-authored-by: Vigers Ray <60344369+VigersRay@users.noreply.github.com> |
||
Remuchi
|
6c7c89e4ec | переводы хихихаха | ||
|
Remuchi
|
0b2238b57a |
Merge remote-tracking branch 'upstream/master' into upstream
# Conflicts: # Content.Client/Clothing/ClientClothingSystem.cs # Content.Client/Options/UI/Tabs/KeyRebindTab.xaml.cs # Content.Client/VoiceMask/VoiceMaskBoundUserInterface.cs # Content.Client/VoiceMask/VoiceMaskNameChangeWindow.xaml # Content.Client/VoiceMask/VoiceMaskNameChangeWindow.xaml.cs # Content.Server/Administration/Commands/AdminWhoCommand.cs # Content.Server/Bed/Sleep/SleepingSystem.cs # Content.Server/Body/Components/BloodstreamComponent.cs # Content.Server/Body/Components/RespiratorComponent.cs # Content.Server/Body/Systems/InternalsSystem.cs # Content.Server/Body/Systems/RespiratorSystem.cs # Content.Server/Chat/Managers/IChatManager.cs # Content.Server/Chemistry/EntitySystems/ReagentDispenserSystem.cs # Content.Server/DeviceNetwork/Systems/DeviceNetworkSystem.cs # Content.Server/Electrocution/ElectrocutionSystem.cs # Content.Server/Holosign/HolosignProjectorComponent.cs # Content.Server/Holosign/HolosignSystem.cs # Content.Server/Remotes/DoorRemoteSystem.cs # Content.Server/Shuttles/Systems/EmergencyShuttleSystem.cs # Content.Server/Shuttles/Systems/ShuttleConsoleSystem.cs # Content.Server/Store/Systems/StoreSystem.Ui.cs # Content.Server/VendingMachines/VendingMachineSystem.cs # Content.Server/VoiceMask/VoiceMaskSystem.Equip.cs # Content.Server/VoiceMask/VoiceMaskSystem.cs # Content.Server/VoiceMask/VoiceMaskerComponent.cs # Content.Server/Zombies/ZombieSystem.cs # Content.Shared/Bed/Sleep/SleepEmitSoundComponent.cs # Content.Shared/Cuffs/SharedCuffableSystem.cs # Content.Shared/VoiceMask/SharedVoiceMaskSystem.cs # Resources/Locale/en-US/escape-menu/ui/options-menu.ftl # Resources/Maps/bagel.yml # Resources/Maps/box.yml # Resources/Maps/centcomm.yml # Resources/Maps/cluster.yml # Resources/Maps/europa.yml # Resources/Maps/marathon.yml # Resources/Maps/meta.yml # Resources/Maps/omega.yml # Resources/Maps/origin.yml # Resources/Maps/packed.yml # Resources/Maps/reach.yml # Resources/Prototypes/Catalog/Fills/Boxes/syndicate.yml # Resources/Prototypes/Catalog/Fills/Lockers/security.yml # Resources/Prototypes/Catalog/VendingMachines/Inventories/medidrobe.yml # Resources/Prototypes/Entities/Clothing/Hands/colored.yml # Resources/Prototypes/Entities/Clothing/Neck/mantles.yml # Resources/Prototypes/Entities/Clothing/OuterClothing/wintercoats.yml # Resources/Prototypes/Entities/Objects/Consumable/Smokeables/Cigarettes/packs.yml # Resources/Prototypes/Entities/Objects/Misc/land_mine.yml # Resources/Prototypes/Entities/Objects/Tools/cable_coils.yml # Resources/Prototypes/Entities/Objects/Weapons/Melee/armblade.yml # Resources/Prototypes/Entities/Structures/Decoration/curtains.yml # Resources/Prototypes/Entities/Structures/Doors/Airlocks/highsec.yml # Resources/Prototypes/Entities/Structures/Doors/Shutter/shutters.yml # Resources/Prototypes/Entities/Structures/Holographic/projections.yml # Resources/Prototypes/Entities/Structures/Machines/lathe.yml # Resources/Prototypes/Maps/marathon.yml # Resources/Prototypes/Maps/packed.yml # Resources/Prototypes/Recipes/Lathes/security.yml # Resources/Prototypes/Roles/Jobs/Engineering/atmospheric_technician.yml # Resources/Prototypes/Roles/Jobs/Security/detective.yml # Resources/Prototypes/Roles/Jobs/Security/head_of_security.yml # Resources/Prototypes/Roles/Jobs/Security/security_cadet.yml # Resources/Prototypes/Roles/Jobs/Security/security_officer.yml # Resources/Prototypes/Roles/Jobs/Security/warden.yml # Resources/Textures/Clothing/OuterClothing/Armor/lingarmor.rsi/meta.json # Resources/Textures/Clothing/OuterClothing/Coats/labcoat.rsi/equipped-OUTERCLOTHING.png # Resources/Textures/Clothing/OuterClothing/Coats/labcoat.rsi/icon-open.png # Resources/Textures/Clothing/OuterClothing/Coats/labcoat.rsi/icon.png # Resources/Textures/Clothing/OuterClothing/Coats/labcoat.rsi/inhand-left.png # Resources/Textures/Clothing/OuterClothing/Coats/labcoat.rsi/inhand-right.png # Resources/Textures/Clothing/OuterClothing/Coats/labcoat.rsi/open-equipped-OUTERCLOTHING.png # Resources/Textures/Clothing/OuterClothing/Coats/labcoat.rsi/open-inhand-left.png # Resources/Textures/Clothing/OuterClothing/Coats/labcoat.rsi/open-inhand-right.png # Resources/Textures/Clothing/OuterClothing/Coats/labcoat_chem.rsi/equipped-OUTERCLOTHING.png # Resources/Textures/Clothing/OuterClothing/Coats/labcoat_chem.rsi/icon-open.png # Resources/Textures/Clothing/OuterClothing/Coats/labcoat_chem.rsi/icon.png # Resources/Textures/Clothing/OuterClothing/Coats/labcoat_chem.rsi/inhand-left.png # Resources/Textures/Clothing/OuterClothing/Coats/labcoat_chem.rsi/inhand-right.png # Resources/Textures/Clothing/OuterClothing/Coats/labcoat_chem.rsi/open-equipped-OUTERCLOTHING.png # Resources/Textures/Clothing/OuterClothing/Coats/labcoat_chem.rsi/open-inhand-left.png # Resources/Textures/Clothing/OuterClothing/Coats/labcoat_chem.rsi/open-inhand-right.png # Resources/Textures/Clothing/OuterClothing/Coats/labcoat_cmo.rsi/equipped-OUTERCLOTHING.png # Resources/Textures/Clothing/OuterClothing/Coats/labcoat_cmo.rsi/icon-open.png # Resources/Textures/Clothing/OuterClothing/Coats/labcoat_cmo.rsi/icon.png # Resources/Textures/Clothing/OuterClothing/Coats/labcoat_cmo.rsi/meta.json # Resources/Textures/Clothing/OuterClothing/Coats/labcoat_cmo.rsi/open-equipped-OUTERCLOTHING.png # Resources/Textures/Clothing/OuterClothing/Coats/labcoat_sci.rsi/equipped-OUTERCLOTHING-body-slim.png # Resources/Textures/Clothing/OuterClothing/Coats/labcoat_sci.rsi/open-equipped-OUTERCLOTHING-body-slim.png # Resources/Textures/Clothing/OuterClothing/Hardsuits/cybersun.rsi/meta.json # Resources/Textures/Clothing/OuterClothing/Hardsuits/lingspacesuit.rsi/meta.json # Resources/Textures/Clothing/OuterClothing/Hardsuits/paramed.rsi/meta.json # Resources/Textures/Clothing/OuterClothing/Hardsuits/spatio.rsi/meta.json # Resources/Textures/Clothing/OuterClothing/Hardsuits/syndiecommander.rsi/meta.json # Resources/Textures/Clothing/OuterClothing/Hardsuits/syndieelite.rsi/meta.json # Resources/Textures/Clothing/OuterClothing/Misc/nunrobe.rsi/meta.json # Resources/Textures/Clothing/OuterClothing/Misc/plaguedoctorsuit.rsi/meta.json # Resources/Textures/Clothing/OuterClothing/Suits/atmos_firesuit.rsi/meta.json # Resources/Textures/Clothing/OuterClothing/WinterCoats/coat.rsi/meta.json # Resources/Textures/Clothing/OuterClothing/WinterCoats/coatatmos.rsi/meta.json # Resources/Textures/Clothing/OuterClothing/WinterCoats/coatbar.rsi/meta.json # Resources/Textures/Clothing/OuterClothing/WinterCoats/coatcap.rsi/meta.json # Resources/Textures/Clothing/OuterClothing/WinterCoats/coatcargo.rsi/meta.json # Resources/Textures/Clothing/OuterClothing/WinterCoats/coatce.rsi/meta.json # Resources/Textures/Clothing/OuterClothing/WinterCoats/coatcentcom.rsi/meta.json # Resources/Textures/Clothing/OuterClothing/WinterCoats/coatchem.rsi/meta.json # Resources/Textures/Clothing/OuterClothing/WinterCoats/coatclown.rsi/meta.json # Resources/Textures/Clothing/OuterClothing/WinterCoats/coatcmo.rsi/meta.json # Resources/Textures/Clothing/OuterClothing/WinterCoats/coatengi.rsi/meta.json # Resources/Textures/Clothing/OuterClothing/WinterCoats/coatgen.rsi/meta.json # Resources/Textures/Clothing/OuterClothing/WinterCoats/coathop.rsi/meta.json # Resources/Textures/Clothing/OuterClothing/WinterCoats/coathos.rsi/meta.json # Resources/Textures/Clothing/OuterClothing/WinterCoats/coathydro.rsi/meta.json # Resources/Textures/Clothing/OuterClothing/WinterCoats/coatjani.rsi/meta.json # Resources/Textures/Clothing/OuterClothing/WinterCoats/coatmed.rsi/meta.json # Resources/Textures/Clothing/OuterClothing/WinterCoats/coatmime.rsi/meta.json # Resources/Textures/Clothing/OuterClothing/WinterCoats/coatminer.rsi/meta.json # Resources/Textures/Clothing/OuterClothing/WinterCoats/coatnomi.rsi/meta.json # Resources/Textures/Clothing/OuterClothing/WinterCoats/coatparamed.rsi/meta.json # Resources/Textures/Clothing/OuterClothing/WinterCoats/coatqm.rsi/meta.json # Resources/Textures/Clothing/OuterClothing/WinterCoats/coatrd.rsi/meta.json # Resources/Textures/Clothing/OuterClothing/WinterCoats/coatrobo.rsi/meta.json # Resources/Textures/Clothing/OuterClothing/WinterCoats/coatsci.rsi/meta.json # Resources/Textures/Clothing/OuterClothing/WinterCoats/coatsec.rsi/meta.json # Resources/Textures/Clothing/OuterClothing/WinterCoats/coatviro.rsi/meta.json # Resources/Textures/Clothing/OuterClothing/WinterCoats/coatwarden.rsi/meta.json # Resources/Textures/Clothing/Shoes/Boots/combatboots.rsi/meta.json # Resources/Textures/Clothing/Shoes/Specific/bling.rsi/meta.json # Resources/Textures/Clothing/Uniforms/Jumpskirt/atmosf.rsi/meta.json # Resources/Textures/Clothing/Uniforms/Jumpskirt/centcomformaldress.rsi/meta.json # Resources/Textures/Clothing/Uniforms/Jumpskirt/hosformaldress.rsi/meta.json # Resources/Textures/Clothing/Uniforms/Jumpskirt/operative_s.rsi/meta.json # Resources/Textures/Clothing/Uniforms/Jumpsuit/atmos.rsi/meta.json # Resources/Textures/Clothing/Uniforms/Jumpsuit/centcomformal.rsi/meta.json # Resources/Textures/Clothing/Uniforms/Jumpsuit/hosformal.rsi/meta.json # Resources/Textures/Clothing/Uniforms/Jumpsuit/journalist.rsi/meta.json # Resources/Textures/Clothing/Uniforms/Jumpsuit/operative.rsi/meta.json # Resources/Textures/Clothing/Uniforms/Jumpsuit/psychologist.rsi/meta.json # Resources/Textures/Clothing/Uniforms/Jumpsuit/reporter.rsi/meta.json # Resources/Textures/Interface/Alerts/essence_counter.rsi/essence0.png # Resources/Textures/Interface/Alerts/essence_counter.rsi/essence16.png # Resources/Textures/Objects/Storage/boxes.rsi/meta.json # Resources/Textures/Structures/Doors/Airlocks/Glass/atmospherics.rsi/meta.json # Resources/Textures/Structures/Doors/Airlocks/Standard/atmospherics.rsi/meta.json # Resources/Textures/Structures/Doors/Airlocks/highsec/highsec.rsi/meta.json |
||
|
Remuchi
|
5e74f6ae53 |
Merge branch 'master' of https://github.com/space-wizards/space-station-14 into upstream
# Conflicts: # Content.Client/Administration/Managers/ClientAdminManager.cs # Content.Client/Administration/Systems/BwoinkSystem.cs # Content.Client/Alerts/ClientAlertsSystem.cs # Content.Client/Audio/BackgroundAudioSystem.cs # Content.Client/CardboardBox/CardboardBoxSystem.cs # Content.Client/Chemistry/UI/InjectorStatusControl.cs # Content.Client/Chemistry/UI/ReagentDispenserWindow.xaml # Content.Client/Chemistry/UI/ReagentDispenserWindow.xaml.cs # Content.Client/Clothing/ClientClothingSystem.cs # Content.Client/CriminalRecords/CriminalRecordsConsoleBoundUserInterface.cs # Content.Client/CriminalRecords/CriminalRecordsConsoleWindow.xaml.cs # Content.Client/Decals/Overlays/DecalOverlay.cs # Content.Client/DoAfter/DoAfterOverlay.cs # Content.Client/Doors/AirlockSystem.cs # Content.Client/HealthAnalyzer/UI/HealthAnalyzerWindow.xaml # Content.Client/HealthAnalyzer/UI/HealthAnalyzerWindow.xaml.cs # Content.Client/Launcher/LauncherConnectingGui.xaml # Content.Client/Launcher/LauncherConnectingGui.xaml.cs # Content.Client/Lobby/LobbyState.cs # Content.Client/Lobby/UI/LobbyGui.xaml.cs # Content.Client/MainMenu/UI/MainMenuControl.xaml # Content.Client/MassMedia/Ui/MiniArticleCardControl.xaml # Content.Client/MassMedia/Ui/MiniArticleCardControl.xaml.cs # Content.Client/MassMedia/Ui/NewsWriteMenu.xaml # Content.Client/MassMedia/Ui/NewsWriteMenu.xaml.cs # Content.Client/Options/UI/Tabs/MiscTab.xaml # Content.Client/Options/UI/Tabs/MiscTab.xaml.cs # Content.Client/Outline/InteractionOutlineSystem.cs # Content.Client/Overlays/ShowSecurityIconsSystem.cs # Content.Client/Players/PlayTimeTracking/JobRequirementsManager.cs # Content.Client/Popups/PopupOverlay.cs # Content.Client/Popups/PopupSystem.cs # Content.Client/Preferences/ClientPreferencesManager.cs # Content.Client/Preferences/UI/HumanoidProfileEditor.xaml # Content.Client/Preferences/UI/HumanoidProfileEditor.xaml.cs # Content.Client/StatusIcon/StatusIconOverlay.cs # Content.Client/Stylesheets/StyleNano.cs # Content.Client/UserInterface/Systems/Bwoink/AHelpUIController.cs # Content.Client/UserInterface/Systems/Chat/ChatUIController.cs # Content.Server/Access/Systems/IdCardConsoleSystem.cs # Content.Server/Administration/Commands/BanCommand.cs # Content.Server/Administration/Notes/AdminMessageEui.cs # Content.Server/Administration/Notes/AdminNotesSystem.cs # Content.Server/Administration/Notes/IAdminNotesManager.cs # Content.Server/Administration/Systems/AdminVerbSystem.Antags.cs # Content.Server/Administration/Systems/BwoinkSystem.cs # Content.Server/Administration/UI/PermissionsEui.cs # Content.Server/Antag/AntagSelectionSystem.cs # Content.Server/Atmos/EntitySystems/BarotraumaSystem.cs # Content.Server/Atmos/Piping/Unary/EntitySystems/GasThermoMachineSystem.cs # Content.Server/Chat/Systems/ChatSystem.cs # Content.Server/Chemistry/EntitySystems/InjectorSystem.cs # Content.Server/Chemistry/EntitySystems/ReagentDispenserSystem.cs # Content.Server/Connection/ConnectionManager.cs # Content.Server/CriminalRecords/Systems/CriminalRecordsConsoleSystem.cs # Content.Server/Database/DatabaseRecords.cs # Content.Server/Database/ServerDbBase.cs # Content.Server/Database/ServerDbManager.cs # Content.Server/DeviceLinking/Systems/SignalTimerSystem.cs # Content.Server/Doors/Systems/DoorSystem.cs # Content.Server/Execution/ExecutionSystem.cs # Content.Server/Explosion/EntitySystems/ExplosionSystem.cs # Content.Server/Fax/FaxSystem.cs # Content.Server/Fluids/EntitySystems/PuddleSystem.Evaporation.cs # Content.Server/GameTicking/GameTicker.Replays.cs # Content.Server/GameTicking/GameTicker.RoundFlow.cs # Content.Server/GameTicking/Rules/Components/ThiefRuleComponent.cs # Content.Server/GameTicking/Rules/GameRuleSystem.Utility.cs # Content.Server/GameTicking/Rules/NukeopsRuleSystem.cs # Content.Server/GameTicking/Rules/RevolutionaryRuleSystem.cs # Content.Server/GameTicking/Rules/ThiefRuleSystem.cs # Content.Server/GameTicking/Rules/TraitorRuleSystem.cs # Content.Server/GameTicking/Rules/ZombieRuleSystem.cs # Content.Server/Hands/Systems/HandsSystem.cs # Content.Server/Holosign/HolosignSystem.cs # Content.Server/Humanoid/Systems/HumanoidAppearanceSystem.cs # Content.Server/Info/InfoSystem.cs # Content.Server/Kitchen/EntitySystems/SharpSystem.cs # Content.Server/Magic/MagicSystem.cs # Content.Server/MagicMirror/MagicMirrorSystem.cs # Content.Server/Mapping/MappingSystem.cs # Content.Server/MassMedia/Systems/NewsSystem.cs # Content.Server/Medical/Components/HealthAnalyzerComponent.cs # Content.Server/Medical/CrewMonitoring/CrewMonitoringServerSystem.cs # Content.Server/Medical/CryoPodSystem.cs # Content.Server/Medical/HealthAnalyzerSystem.cs # Content.Server/Nutrition/EntitySystems/OpenableSystem.cs # Content.Server/Preferences/Managers/ServerPreferencesManager.cs # Content.Server/Remotes/DoorRemoteSystem.cs # Content.Server/Resist/EscapeInventorySystem.cs # Content.Server/Revenant/EntitySystems/RevenantSystem.Abilities.cs # Content.Server/Shuttles/Systems/EmergencyShuttleSystem.Console.cs # Content.Server/Shuttles/Systems/EmergencyShuttleSystem.cs # Content.Server/Shuttles/Systems/ShuttleConsoleSystem.cs # Content.Server/Shuttles/Systems/ShuttleSystem.FasterThanLight.cs # Content.Server/Species/Systems/NymphSystem.cs # Content.Server/StationEvents/Components/GasLeakRuleComponent.cs # Content.Server/StationEvents/EventManagerSystem.cs # Content.Server/Store/Systems/StoreSystem.Ui.cs # Content.Server/Strip/StrippableSystem.cs # Content.Server/VendingMachines/VendingMachineSystem.cs # Content.Server/Weapons/Ranged/Systems/GunSystem.cs # Content.Shared.Database/LogType.cs # Content.Shared/Actions/SharedActionsSystem.cs # Content.Shared/Administration/AdminFlags.cs # Content.Shared/Administration/SharedBwoinkSystem.cs # Content.Shared/Anomaly/SharedAnomalySystem.cs # Content.Shared/Bed/Sleep/SharedSleepingSystem.cs # Content.Shared/Buckle/SharedBuckleSystem.Strap.cs # Content.Shared/Chat/ChatChannel.cs # Content.Shared/Chemistry/Components/InjectorComponent.cs # Content.Shared/Chemistry/EntitySystems/SharedInjectorSystem.cs # Content.Shared/Chemistry/SharedReagentDispenser.cs # Content.Shared/Containers/ItemSlot/ItemSlotsComponent.cs # Content.Shared/CriminalRecords/Systems/SharedCriminalRecordsConsoleSystem.cs # Content.Shared/Cuffs/SharedCuffableSystem.cs # Content.Shared/Doors/Systems/SharedDoorSystem.cs # Content.Shared/Friction/TileFrictionController.cs # Content.Shared/Humanoid/Prototypes/SpeciesPrototype.cs # Content.Shared/Humanoid/SharedHumanoidAppearanceSystem.cs # Content.Shared/Implants/SharedImplanterSystem.cs # Content.Shared/Lock/LockSystem.cs # Content.Shared/MedicalScanner/HealthAnalyzerScannedUserMessage.cs # Content.Shared/Nutrition/Components/OpenableComponent.cs # Content.Shared/Nutrition/EntitySystems/SharedOpenableSystem.cs # Content.Shared/Nutrition/EntitySystems/ThirstSystem.cs # Content.Shared/Preferences/HumanoidCharacterProfile.cs # Content.Shared/Preferences/ICharacterProfile.cs # Content.Shared/Projectiles/SharedProjectileSystem.cs # Content.Shared/Pulling/Systems/SharedPullingSystem.Actions.cs # Content.Shared/Security/SecurityStatus.cs # Content.Shared/Security/Systems/DeployableBarrierSystem.cs # Content.Shared/Slippery/SlipperySystem.cs # Content.Shared/Species/Systems/ReformSystem.cs # Content.Shared/Standing/StandingStateSystem.cs # Content.Shared/StatusIcon/StatusIconPrototype.cs # Content.Shared/Store/ListingPrototype.cs # Content.Shared/VendingMachines/SharedVendingMachineSystem.cs # Content.Shared/Weapons/Melee/SharedMeleeWeaponSystem.cs # README.md # Resources/Audio/Ambience/Antag/pirate_start.ogg # Resources/Changelog/Changelog.yml # Resources/Credits/GitHub.txt # Resources/Locale/en-US/criminal-records/criminal-records.ftl # Resources/Locale/en-US/escape-menu/ui/options-menu.ftl # Resources/Locale/en-US/medical/components/health-analyzer-component.ftl # Resources/Locale/en-US/reagents/meta/biological.ftl # Resources/Locale/en-US/reagents/meta/fun.ftl # Resources/Locale/en-US/reagents/meta/physical-desc.ftl # Resources/Locale/en-US/seeds/seeds.ftl # Resources/Locale/en-US/wires/wire-names.ftl # Resources/Maps/Shuttles/cargo_fland.yml # Resources/Maps/core.yml # Resources/Maps/europa.yml # Resources/Maps/fland.yml # Resources/Maps/origin.yml # Resources/Maps/saltern.yml # Resources/Maps/train.yml # Resources/Prototypes/Actions/diona.yml # Resources/Prototypes/Atmospherics/gases.yml # Resources/Prototypes/Catalog/Cargo/cargo_emergency.yml # Resources/Prototypes/Catalog/Cargo/cargo_engines.yml # Resources/Prototypes/Catalog/Cargo/cargo_fun.yml # Resources/Prototypes/Catalog/Cargo/cargo_security.yml # Resources/Prototypes/Catalog/Cargo/cargo_service.yml # Resources/Prototypes/Catalog/Cargo/cargo_vending.yml # Resources/Prototypes/Catalog/Fills/Boxes/general.yml # Resources/Prototypes/Catalog/Fills/Boxes/syndicate.yml # Resources/Prototypes/Catalog/Fills/Crates/engines.yml # Resources/Prototypes/Catalog/Fills/Items/briefcases.yml # Resources/Prototypes/Catalog/Fills/Items/toolboxes.yml # Resources/Prototypes/Catalog/Fills/Lockers/dressers.yml # Resources/Prototypes/Catalog/Fills/Lockers/heads.yml # Resources/Prototypes/Catalog/Fills/Lockers/security.yml # Resources/Prototypes/Catalog/VendingMachines/Inventories/bardrobe.yml # Resources/Prototypes/Catalog/VendingMachines/Inventories/clothesmate.yml # Resources/Prototypes/Catalog/VendingMachines/Inventories/lawdrobe.yml # Resources/Prototypes/Catalog/VendingMachines/Inventories/medical.yml # Resources/Prototypes/Catalog/VendingMachines/Inventories/medidrobe.yml # Resources/Prototypes/Catalog/VendingMachines/Inventories/robotics.yml # Resources/Prototypes/Catalog/VendingMachines/Inventories/sec.yml # Resources/Prototypes/Catalog/uplink_catalog.yml # Resources/Prototypes/Datasets/Names/first_male.yml # Resources/Prototypes/Datasets/tips.yml # Resources/Prototypes/Entities/Clothing/Hands/colored.yml # Resources/Prototypes/Entities/Clothing/Head/base_clothinghead.yml # Resources/Prototypes/Entities/Clothing/Head/hats.yml # Resources/Prototypes/Entities/Clothing/OuterClothing/coats.yml # Resources/Prototypes/Entities/Clothing/Uniforms/jumpsuits.yml # Resources/Prototypes/Entities/Mobs/NPCs/animals.yml # Resources/Prototypes/Entities/Mobs/Player/silicon.yml # Resources/Prototypes/Entities/Mobs/Species/base.yml # Resources/Prototypes/Entities/Mobs/Species/slime.yml # Resources/Prototypes/Entities/Mobs/Species/vox.yml # Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks.yml # Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks_bottles.yml # Resources/Prototypes/Entities/Objects/Consumable/Food/produce.yml # Resources/Prototypes/Entities/Objects/Devices/Electronics/signaller.yml # Resources/Prototypes/Entities/Objects/Devices/nuke.yml # Resources/Prototypes/Entities/Objects/Devices/pda.yml # Resources/Prototypes/Entities/Objects/Fun/toys.yml # Resources/Prototypes/Entities/Objects/Materials/Sheets/glass.yml # Resources/Prototypes/Entities/Objects/Materials/parts.yml # Resources/Prototypes/Entities/Objects/Misc/identification_cards.yml # Resources/Prototypes/Entities/Objects/Misc/implanters.yml # Resources/Prototypes/Entities/Objects/Misc/kudzu.yml # Resources/Prototypes/Entities/Objects/Misc/rubber_stamp.yml # Resources/Prototypes/Entities/Objects/Shields/shields.yml # Resources/Prototypes/Entities/Objects/Specific/Hydroponics/tools.yml # Resources/Prototypes/Entities/Objects/Specific/Medical/handheld_crew_monitor.yml # Resources/Prototypes/Entities/Objects/Specific/Medical/healthanalyzer.yml # Resources/Prototypes/Entities/Objects/Specific/Robotics/borg_modules.yml # Resources/Prototypes/Entities/Objects/Weapons/Bombs/firebomb.yml # Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Cartridges/shotgun.yml # Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Projectiles/shotgun.yml # Resources/Prototypes/Entities/Objects/Weapons/Melee/e_sword.yml # Resources/Prototypes/Entities/Structures/Decoration/curtains.yml # Resources/Prototypes/Entities/Structures/Doors/Airlocks/access.yml # Resources/Prototypes/Entities/Structures/Doors/MaterialDoors/material_doors.yml # Resources/Prototypes/Entities/Structures/Doors/Windoors/base_structurewindoors.yml # Resources/Prototypes/Entities/Structures/Lighting/base_lighting.yml # Resources/Prototypes/Entities/Structures/Machines/lathe.yml # Resources/Prototypes/Entities/Structures/Machines/vending_machines.yml # Resources/Prototypes/Entities/Structures/Specific/Anomaly/anomalies.yml # Resources/Prototypes/Entities/Structures/Storage/glass_box.yml # Resources/Prototypes/Entities/Structures/Wallmounts/fireaxe_cabinet.yml # Resources/Prototypes/Entities/Structures/Wallmounts/switch.yml # Resources/Prototypes/Entities/Structures/Walls/asteroid.yml # Resources/Prototypes/Entities/Structures/Walls/grille.yml # Resources/Prototypes/Entities/Structures/Walls/walls.yml # Resources/Prototypes/Entities/Structures/Windows/window.yml # Resources/Prototypes/Entities/Structures/stairs.yml # Resources/Prototypes/GameRules/events.yml # Resources/Prototypes/Hydroponics/seeds.yml # Resources/Prototypes/Maps/saltern.yml # Resources/Prototypes/Reagents/biological.yml # Resources/Prototypes/Reagents/fun.yml # Resources/Prototypes/Recipes/Construction/Graphs/utilities/solarpanel.yml # Resources/Prototypes/Recipes/Construction/weapons.yml # Resources/Prototypes/Recipes/Crafting/improvised.yml # Resources/Prototypes/Recipes/Lathes/clothing.yml # Resources/Prototypes/Recipes/Reactions/fun.yml # Resources/Prototypes/Research/arsenal.yml # Resources/Prototypes/Roles/Jobs/Engineering/technical_assistant.yml # Resources/Prototypes/Roles/Jobs/Fun/emergencyresponseteam.yml # Resources/Prototypes/Roles/Jobs/Medical/medical_intern.yml # Resources/Prototypes/Roles/Jobs/Medical/paramedic.yml # Resources/Prototypes/Roles/Jobs/Science/research_assistant.yml # Resources/Prototypes/Roles/Jobs/Security/detective.yml # Resources/Prototypes/Roles/Jobs/Security/security_cadet.yml # Resources/Prototypes/Roles/Jobs/departments.yml # Resources/Prototypes/Species/human.yml # Resources/Prototypes/Species/vox.yml # Resources/Prototypes/Stacks/Materials/materials.yml # Resources/Prototypes/StatusEffects/health.yml # Resources/Prototypes/Tiles/plating.yml # Resources/Prototypes/Voice/speech_emote_sounds.yml # Resources/Prototypes/Voice/speech_emotes.yml # Resources/Prototypes/explosion.yml # Resources/Prototypes/game_presets.yml # Resources/Prototypes/lobbyscreens.yml # Resources/Prototypes/secret_weights.yml # Resources/Prototypes/tags.yml # Resources/ServerInfo/Guidebook/Jobs.xml # Resources/ServerInfo/Guidebook/Science/ArtifactReports.xml # Resources/Textures/Clothing/Belt/emt.rsi/meta.json # Resources/Textures/Clothing/Head/Hats/beret_medic.rsi/meta.json # Resources/Textures/Clothing/Head/Hats/beret_qm.rsi/meta.json # Resources/Textures/Clothing/Head/Soft/bluesoft_flipped.rsi/meta.json # Resources/Textures/Clothing/Head/Soft/corpsoft_flipped.rsi/meta.json # Resources/Textures/Clothing/Head/Soft/greensoft_flipped.rsi/meta.json # Resources/Textures/Clothing/Head/Soft/greysoft_flipped.rsi/meta.json # Resources/Textures/Clothing/Head/Soft/paramedicsoft_flipped.rsi/meta.json # Resources/Textures/Clothing/Mask/neckgaiterred.rsi/meta.json # Resources/Textures/Clothing/OuterClothing/Hardsuits/slayer.rsi/meta.json # Resources/Textures/Clothing/OuterClothing/Hardsuits/syndicate.rsi/meta.json # Resources/Textures/Clothing/OuterClothing/Suits/syndicate.rsi/meta.json # Resources/Textures/Clothing/Uniforms/Jumpsuit/qmformal.rsi/meta.json # Resources/Textures/Decals/Overlays/greyscale.rsi/checkerNESW.png # Resources/Textures/Decals/Overlays/greyscale.rsi/checkerNWSE.png # Resources/Textures/Decals/Overlays/greyscale.rsi/fulltile_overlay.png # Resources/Textures/Decals/Overlays/greyscale.rsi/halftile_overlay.png # Resources/Textures/Decals/Overlays/greyscale.rsi/halftile_overlay_180.png # Resources/Textures/Decals/Overlays/greyscale.rsi/halftile_overlay_270.png # Resources/Textures/Decals/Overlays/greyscale.rsi/halftile_overlay_90.png # Resources/Textures/Decals/Overlays/greyscale.rsi/quartertile_overlay.png # Resources/Textures/Decals/Overlays/greyscale.rsi/quartertile_overlay_180.png # Resources/Textures/Decals/Overlays/greyscale.rsi/quartertile_overlay_270.png # Resources/Textures/Decals/Overlays/greyscale.rsi/quartertile_overlay_90.png # Resources/Textures/Decals/Overlays/greyscale.rsi/threequartertile_overlay.png # Resources/Textures/Decals/Overlays/greyscale.rsi/threequartertile_overlay_180.png # Resources/Textures/Decals/Overlays/greyscale.rsi/threequartertile_overlay_270.png # Resources/Textures/Decals/Overlays/greyscale.rsi/threequartertile_overlay_90.png # Resources/Textures/Interface/Misc/job_icons.rsi/meta.json # Resources/Textures/Interface/emotions.svg.192dpi.png.yml # Resources/Textures/LobbyScreens/dead-in-space.png.yml # Resources/Textures/LobbyScreens/doomed.webp.yml # Resources/Textures/LobbyScreens/pharmacy.png.yml # Resources/Textures/LobbyScreens/pharmacy.webp.yml # Resources/Textures/LobbyScreens/robotics.webp.yml # Resources/Textures/LobbyScreens/supermatter.png.yml # Resources/Textures/LobbyScreens/susstation.png.yml # Resources/Textures/LobbyScreens/warden.png.yml # Resources/Textures/LobbyScreens/warden.webp.yml # Resources/Textures/Mobs/Customization/human_hair.rsi/meta.json # Resources/Textures/Mobs/Effects/brute_damage.rsi/LLeg_Brute_40.png # Resources/Textures/Mobs/Effects/brute_damage.rsi/RLeg_Brute_40.png # Resources/Textures/Objects/Devices/nuke.rsi/meta.json # Resources/Textures/Objects/Devices/nuke.rsi/nuclearbomb_deployed.png # Resources/Textures/Objects/Devices/nuke.rsi/nuclearbomb_exploding.png # Resources/Textures/Objects/Devices/nuke.rsi/nuclearbomb_timing.png # Resources/Textures/Objects/Misc/books.rsi/meta.json # Resources/Textures/Objects/Misc/bureaucracy.rsi/paper_stamp-lawyer.png # Resources/Textures/Objects/Storage/boxes.rsi/meta.json # Resources/Textures/Objects/Tools/t-ray.rsi/tray-off.png # Resources/Textures/Objects/Tools/t-ray.rsi/tray-on.png # Resources/Textures/Objects/Weapons/Guns/Battery/mini-ebow.rsi/bolt.png # Resources/Textures/Structures/Doors/Airlocks/Standard/external.rsi/emergency_open_unlit.png # Resources/Textures/Structures/Doors/Airlocks/Standard/shuttle_syndicate.rsi/emergency_open_unlit.png # Resources/Textures/Structures/Doors/Windoors/plasma.rsi/emergency_unlit.png # Resources/Textures/Structures/Doors/Windoors/uranium.rsi/emergency_unlit.png # Resources/Textures/Structures/Power/Generation/Singularity/emitter.rsi/locked.png # Resources/Textures/Tiles/attributions.yml # Resources/Textures/Tiles/shuttleblue.png # Resources/Textures/Tiles/shuttleorange.png # Resources/Textures/Tiles/shuttlepurple.png # Resources/Textures/Tiles/shuttlered.png # Resources/Textures/Tiles/shuttlewhite.png # Resources/Textures/White/Fluff/DOOMMAX/cap_cap.rsi/meta.json # Resources/Textures/White/Fluff/HSKveez/hardsuit.rsi/meta.json # Resources/Textures/White/Fluff/Vtergot/strictgloves.rsi/meta.json # Resources/clientCommandPerms.yml # Resources/migration.yml |
||
IProduceWidgets
|
89235b9e1b | Add astro-jungle/mowed grass and astro-snow (#26381) | ||
Mr. 27
|
3cb1c585c5 |
Pipebombs and IED rework (#25705)
* inital * 2-9 * add crafting function, rename ied to fire bomb * add firebomb ignition * fikss * change damage values * add note * fix tests i think * ok * good * Review * warning --------- Co-authored-by: metalgearsloth <comedian_vs_clown@hotmail.com> |
||
MACMAN2003
|
f0e8695a91 |
Clockwork structures and furniture (#24673)
* 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
|
||
Zadeon
|
133bd0353a |
Adds minable salt "ore" (#25324)
* Added salt to ore.yml Added salt to ores.yml Added salt walls to asteroid.yml Added salt to BaseAsteroidDebris' list of ores to generate in asteroids.yml Added OreSalt to biome_ore_templates.yml Added salt to guaranteed salvageLoot in salvage_loot.yml Added salt entry under salvage-magnet-resources in salvage-magnet.ftl Added WIP sprites for salt. * Renamed salt's id to SaltOre inside Entities/Objects/Materials/ore.yml Fixed salt not being grindable due to using an incorrect reagent name Added salt to ore.rsi/meta.json and rock.rsi/meta.json * Added chlorine to the list of solutions salt gives when used in the grinder. * Gave salt ore and salt rock overlay unique sprites. * Added raw salt to materials/materials.ftl Updated SaltOre definition in ore.yml to have RawSalt under materialComposition * Updated saltore definition to give 10 units of tablesalt and 5 units of iodine when ground. |
||
Ed
|
84cbcb93ca |
Fancy table (#25562)
* blue * others * add white table * add crafting carpets * finish carpets * tags * crafting * pip * finish |
||
Ps3Moira
|
83cd1089fe |
Add Large Wood Floors (#25462)
Large Wood Floors |
||
Flareguy
|
a93466ac24 |
Shuttle floor resprite (#25127)
* resprites shuttle tiles * resprites shuttle floor tiles & adds grey/black shuttle tiles * attributions.yml update |
||
EnefFlow
|
4fab8188f0 | main cult | ||
HitPanda
|
31f87a6a52 | Craft menu translate (#88) | ||
Nemanja
|
86c1e36cd5 |
Fix iron naming, add specific materials for ores (#23590)
add materials for ores, fix iron naming |
||
Velcroboy
|
27308915f1 |
Adds coal (#22559)
* Adds coal * Fix stack splitting spawn * Convert size * Ahhh, it's a reagent tooo.... * ore.rsi * Adjust recipes, add reagent extraction * solution name * Adjust reagents to prevent reactions * Adjust reagents for standard of 10u --------- Co-authored-by: Jeff <velcroboy333@hotmail.com> |
||
Kara
|
8399d0a9eb |
Faux astro-tiles for science & mappers (#22586)
* Faux astro-tiles for science * didnt mean to commit dode |
||
|
Flareguy
|
ae1a1b9e07 | adds lime tiles (#22235) | ||
NULL882
|
f268e626a7 |
Mining things (#21909)
* mining-doors * mining-tiles * mining-window * Change copyright in meta.json * Change license in attributions.yml |
||
cOrigin
|
1c497db665 |
Artifact fragments can now stack. (#21232)
* it stacks now * Fixed typo * fixes random sprite * fix |
||
Tunguso4ka
|
ee54022832 |
Ash Walker`s spear and uniform (#20292)
* bones, gladiators, milk, spear and tears * :trollface: my copy/paste python script did the funny * forgor * fixed * mat.yml fixed * bones * bone armor * gladiator uniform now in clothesmate like ss13 * bone armor craft * pieces * i was dumb in the past, now im dumb too * that was dumb... * fixing stuff * i hate git * Revert "i hate git" This reverts commit 17ef4e5a07a3ebad7d4f487f15721d1df16d757f. * Revert "fixing stuff" This reverts commit 4fc5d6b2dc1fc6ebb3945bdf5663b8e432ca7aa3. * this will work? * i fucking merged it |
||
|
Nemanja
|
f4503864d5 |
Concrete and asphalt tiles (#19642)
* concrete and asphalt * los decals |
||
PixelTK
|
f189b73fe5 |
Arachnid rework (#18631)
* Merge before I fuck up anything again * craft whitelist * Sericulture * Spider * gone * quickly fixed * and coders taketh away * And we take more away * sericulture improvements * arachnid * better webbed * OH WAIT * test fail |
||
Arendian
|
b4c251472f |
Adds Advanced ointment and bruisepack recipes (#17583)
* Adds Advanced ointment and bruisepack recipes * Changes the sprites to the ones from /tg * Changed names and sprites, slight tweaks * Formatting * Solve Conflict * Formatting * Fix issues found in check * Fix Oopsie |
||
|
Nemanja
|
5c60a27c7c |
Make item size scale with stack size (#17623)
* Make stack count affect item size * and the test, too * readd this check * vwoom * huh * if you ever read this commit message ping me on discord in #contributors * changerinos |
||
|
Nemanja
|
9946bd1f61 | Sheet-meister 2000 (#16686) | ||
AsikKEsel
|
b67cb04f19 |
Added uranium glass and uranium window (#15869)
Co-authored-by: metalgearsloth <comedian_vs_clown@hotmail.com> |
||
brainfood1183
|
2fba2b18ab | Adds Bananium (#14663) | ||
Whisper
|
0e43f90bb8 |
The bleed update (#14814)
* Removed arbitrary modifier scaling. The bleed amount is now 1-1 in units. * Added some comments to explain the blood and bleed code * added some comments * added some comments * profusely bleeding message scales with max bleed rate * Added some comments * Added some comments (tm) * Halved the speed bleed rate heals. * Changed the wording of a comment to make the function of the values more clear * Changed bleed rate values, made heat heal more bleed rate * doubled crit chance, since damage types were reduced * Made iron restore more blood, 2->4u per 1u * Starting to add the blood pack * add bloodlevel to healingcomponent * Created code support in the healing system for restoring blood * first test of blood pack prototype * More pack testing, and defining the yml stack * yml syntax fix * adds bloodpack tag * Successfully added the item, but the effect and deletion after using the item is not working yet. * the blood regen worksgit add -A! * blood pack is entirely functioning * Removed bleed rate healing from brute pack * Comment correction * I tried * Removed bleed stats from corrupted corgi, they inherit same stats from basemob * Removed bleed stats from xeno, they inherit same stats from a base mob * Removed bleed stats from diona, they inherit same stats from a base mob * Removed bleed stats from slimes, they inherit same stats from a base mob * All mobs now heal bloodloss damage at a rate of 1 instead of 0.25 when healthy * The cautery now closes bleed wounds * Nerf blood pack bleed rate heal * Added 2 blood packs to medicine locker * Added 2 blood packs to wall medicine locker * Minor YML fix to chemistry locker, no changes in game * Added tag to medical belt for blood pack, added 2 blood packs to medical belt * Added 1 gauze to medical belt * 5 blood packs addded to nanomed plus * nanomed inventory change * 2 blood packs added to medical supplies crate from cargo * Moved 1 gauze from med kit to advanced med kit * Moved 1 tricord pill from advanced med kit to basic med kit * added 2 ointment to burn kit * Moved ina syringe from burn treatment to oxygen kit * Removed one gauze from brute kit * Added one bloodpack to brute med kit * Moved tranex acid syringe from advanced first aid to brute kit * Poison medipen moved from advanced first aid kit to toxin kit * Removed health analyzer from advanced first aid kit * removed one brute pack from advanced aid kit * added one ointment to advanced aid kit * Added one blood pack to advanced aid kit * Added 2 blood packs to combat med kit * Starting with adding the license for the tg sprite * Adds the blood pack sprite and meta.json code * I forgor to actually code the sprite in * Advanced med kit missing one blood pack * Replaced tricord pill with emergency medipen in cobat kit * Removed emergency pen from combat kit, there's no space for it * Revert "I tried" This reverts commit 94c2e28df3200993d3f09b72ecabc838ea5ae5c0. * Trying to fix yml test fail * Try again * attempt number 3 * Restock crate price was too low * fixing merge conflict without making a HUGE mess this time * ??? * again * again * Can I add the newline now maybe??? * Revert "Can I add the newline now maybe???" This reverts commit 22d26706a65a24633f7da1dea6315012e2d3ac6f. * Adds the doafter fix code from Keron to the blood level healing * minor typo fix * Feedback from Emisse and sloth; Removed chance based feedback on cauterizing * comment fix |
||
MisterMecky
|
a7571ac45b |
Add cardboard material (#14701)
* add cardboard material * missing stack visualizers * add crafting recipes * cardboard crate * license thing * rename various things |
||
|
Nemanja
|
faca40b8d5 |
more component ref removal + combining server/client comps (#13178)
Co-authored-by: DrSmugleaf <DrSmugleaf@users.noreply.github.com> |
||
Pieter-Jan Briers
|
10a99617b8 | Remove usages of texture: .rsi/*.png and such. (#12896) | ||
Paul Ritter
|
da1f0ce8b1 | hotfix (#12530) | ||
|
Nemanja
|
9428d4b341 |
stack cleanup and mild refactoring (#11717)
* stack cleanup * fix tests and ulong * somehow did half a commit * ulong got usmall. (it's ints now) * sussy baka cleanup * mirror's review * make da tests pass again * shadowcommander review * sloth por favor * Update StoreSystem.Ui.cs |
||
Mervill
|
4dc6355622 | delete duplicate entities (#12454) | ||
|
brainfood1183
|
062d3c656e |
New Tiles (2 maintenance specific and 1 new wood). (#12193)
* new maint specific tiles * merge * merge * merge * merge * Update Resources/Textures/Tiles/attributions.yml Co-authored-by: Moony <moony@hellomouse.net> |
||
Jacob Tong
|
68a17b3794 | Add shuttle airlock construction (#10944) | ||
Rane
|
f36d278499 |
Biomass (#10313)
* Material * good prototype * Fix material storage * You can insert biomass into the cloner * ok, basic biomass subtraction works * amogus * ok chance works * Alright, the biomass and genetic stuff works * feedback for cloning * more reclaimer polish * ship it * starting biomass + fix lathes * I changed my mind on rat mass and these guys are definitely getting ground up * Doafter * clean up, sync the two * fix naming, fix mass * technology + construction * additional logging, stop unanchoring when active * fix event / logs * dont gib dead salvage * auto eject * fix deconstruction behavior * make warning message better, temporarily disable cancer scanner * fix biomass stacks * add easy mode CVAR * stack cleanup, make biomass 2x as fast * bugfix * new sprite from hyenh * fix tests * hello? :smilethink: * :smilethink: * medical scanner gets antirotting * fix cloner and medical scanner Co-authored-by: Moony <moonheart08@users.noreply.github.com> |
||
Visne
|
906edc592d | Fix/improve smokeables (#10497) | ||
Linus Wacker
|
47a642cf22 | fixes aloe cream splitting (#8949) | ||
Peptide90
|
8d9b56fce6 |
Goon floor pack 1 (#8267)
* floors boxing, arcadeblue2 and carpet clown * adds gym, metaldiamond and carpetoffice from goon * adds variants for boxing and gym * tile variants updated |
||
Chris V
|
94a0bc92b7 |
Salvage mining, ore processing, and material clean-up (#7406)
* adding stuff cuz new computer * removed unused materials * remove unused materials and such, lathe things * material volume no longer hardcoded * fixed mining system * add 5 stacks of materials, and add them to the ore processor * fix copyright for ores and handdrill * comma momma * whyyyyy * more fixes to make the yaml linter happy * i should get my eyes checked * silver proper * more cleanup * leftovers * remove more references to material doors * couldn't bear to be without bearhide * added uranium, added more lathe recipes * copyright fix, stack fix * ore processor sprite and such * ore processing some binches * MaterialCotton removal * 1 uranium ore means 1 sheet * fix merge conflict? idk * time to ketchup * lathe recognizes material volume again * yaml cleanup * forgot to remove adamantine lol * re-added diamond for now * diamond stacks * functional ore processor * added ignoreColor to lathe visuals * ore processor machine board * add board to industrial tech and circuit printer * provided lathes their whitelists * fix wonky ore spawning, added insert sound to lathe, adjusted ore chance * re-added ore processor * typos and cleanup * Update Content.Client/Lathe/LatheSystem.cs Co-authored-by: metalgearsloth <31366439+metalgearsloth@users.noreply.github.com> * Update Content.Server/Lathe/LatheSystem.cs Co-authored-by: metalgearsloth <31366439+metalgearsloth@users.noreply.github.com> * revert mapchange * VV ignorecolor, pass entitymanager, move canceltoken to pickaxe, removed foreach from orespawn * actually null canceltoken * remove five-stacks, ore processor produces full stacks or single sheets/ingots * VV proper * adjust ore chances * readd Cotton * Update Content.Server/Mining/MineableSystem.cs * tweaks * Material is now dict (material, volume) * removed unused property * Space crystal -> space quartz * forgor asteroid space quartz Co-authored-by: metalgearsloth <31366439+metalgearsloth@users.noreply.github.com> Co-authored-by: metalgearsloth <comedian_vs_clown@hotmail.com> |
||
|
Paul Ritter
|
2ff40d5a1f | Serv3 rework content changes (#7145) | ||
|
Peptide90
|
fc667f8f44 | Big tile PR (3 carpets, 4 red sands, 1 grass, 5 shuttle floors) (#6864) |