 Charlotte Tezuka
|
1e59562465
|
Mfhm~
|
2026-05-11 03:33:25 +02:00 |
|
|
Charlotte Tezuka
|
284bc8ecf3
|
Merge remote-tracking branch 'dimo2/fix-something' into upstream30.04
|
2026-05-10 23:22:37 +02:00 |
|
|
Pieter-Jan BriersandGitHub
|
5168b5f3d4
|
IoC source gen compatibility (#43863)
* IoC source gen compatibility
Can be merged before or after https://github.com/space-wizards/RobustToolbox/pull/6549 doesn't really matter.
* Missed a spot
|
2026-05-09 03:29:58 +00:00 |
|
|
Charlotte Tezuka
|
cdcdae8d6e
|
Merge remote-tracking branch 'corvax/master'
|
2026-02-18 22:45:10 +02:00 |
|
|
B_KirillandGitHub
|
07076a5a32
|
Cleanup warnings: CS0414 (#42429)
cleanup
|
2026-01-15 13:37:11 +00:00 |
|
|
ssdaniel24
|
d399099102
|
Merge remote-tracking branch 'corvax/master' into wl-upstream-sync-try-2
Conflicts:
Content.Client/Humanoid/HumanoidAppearanceSystem.cs
Content.Client/LateJoin/LateJoinGui.cs
Content.Client/Stylesheets/StyleNano.cs
Content.Server/Administration/Systems/AdminVerbSystem.Tools.cs
Content.Server/Fax/FaxSystem.cs
Content.Server/GameTicking/GameTicker.Spawning.cs
Content.Server/Objectives/Systems/KillPersonConditionSystem.cs
Content.Server/Station/Systems/StationSpawningSystem.cs
Content.Shared.Database/LogType.cs
Content.Shared/Ghost/GhostComponent.cs
Content.Shared/Humanoid/SharedHumanoidAppearanceSystem.cs
Content.Shared/Preferences/HumanoidCharacterProfile.cs
Content.Shared/Roles/SharedRoleSystem.cs
README.md
Resources/ConfigPresets/Corvax/common.toml
Resources/Credits/GitHub.txt
Resources/Locale/ru-RU/ss14-ru/prototypes/entities/mobs/cyborgs/base_borg_chassis.ftl
Resources/Maps/Shuttles/trading_outpost.yml
Resources/Prototypes/Corvax/Roles/Jobs/Command/iaa.yml
Resources/Prototypes/Corvax/Roles/Jobs/Security/brigmedic.yml
Resources/Prototypes/Corvax/Roles/Jobs/Security/pilot.yml
Resources/Prototypes/Entities/Clothing/OuterClothing/base_clothingouter.yml
Resources/Prototypes/Entities/Mobs/Customization/Markings/reptilian.yml
Resources/Prototypes/Entities/Mobs/Cyborgs/base_borg_chassis.yml
Resources/Prototypes/Entities/Objects/Weapons/Guns/Battery/battery_guns.yml
Resources/Prototypes/Entities/Objects/Weapons/Melee/sword.yml
Resources/Prototypes/Entities/Structures/Machines/chem_master.yml
Resources/Prototypes/Entities/Structures/Power/substation.yml
Resources/Prototypes/GameRules/cargo_gifts.yml
Resources/Prototypes/GameRules/events.yml
Resources/Prototypes/GameRules/meteorswarms.yml
Resources/Prototypes/Maps/bagel.yml
Resources/Prototypes/Reagents/Consumable/Drink/drinks.yml
Resources/Prototypes/Reagents/chemicals.yml
Resources/Prototypes/Reagents/medicine.yml
Resources/Prototypes/Reagents/pyrotechnic.yml
Resources/Prototypes/Reagents/toxins.yml
Resources/Prototypes/Recipes/Cooking/meal_recipes.yml
Resources/Prototypes/Roles/Jobs/Cargo/quartermaster.yml
Resources/Prototypes/Roles/Jobs/Command/captain.yml
Resources/Prototypes/Roles/Jobs/Command/head_of_personnel.yml
Resources/Prototypes/Roles/Jobs/Engineering/chief_engineer.yml
Resources/Prototypes/Roles/Jobs/Medical/chief_medical_officer.yml
Resources/Prototypes/Roles/Jobs/Medical/paramedic.yml
Resources/Prototypes/Roles/Jobs/Science/research_director.yml
Resources/Prototypes/Roles/Jobs/Security/detective.yml
Resources/Prototypes/Roles/Jobs/Security/head_of_security.yml
Resources/Prototypes/Roles/Jobs/Security/security_officer.yml
Resources/Prototypes/Roles/Jobs/Security/warden.yml
Resources/Prototypes/Voice/disease_emotes.yml
Resources/Prototypes/Voice/speech_emotes.yml
Resources/Prototypes/radio_channels.yml
Resources/Textures/Effects/speech.rsi/meta.json
Resources/Textures/Interface/Default/Slots/id.png
Resources/Textures/Interface/Minimalist/Slots/pda.png
Resources/Textures/Mobs/Customization/reptilian_parts.rsi/meta.json
Resources/Textures/Mobs/Silicon/chassis.rsi/meta.json
RobustToolbox
|
2025-06-02 12:30:02 +03:00 |
|
|
+71
|
25c5e59248
|
Upstream (#3172)
Signed-off-by: Prole <172158352+Prole0@users.noreply.github.com>
Co-authored-by: PJBot <pieterjan.briers+bot@gmail.com>
Co-authored-by: ScarKy0 <106310278+ScarKy0@users.noreply.github.com>
Co-authored-by: Samuka-C <47865393+Samuka-C@users.noreply.github.com>
Co-authored-by: ArtisticRoomba <145879011+ArtisticRoomba@users.noreply.github.com>
Co-authored-by: Partmedia <kevinz5000@gmail.com>
Co-authored-by: slarticodefast <161409025+slarticodefast@users.noreply.github.com>
Co-authored-by: themias <89101928+themias@users.noreply.github.com>
Co-authored-by: Victor Shen <71985089+Vexerot@users.noreply.github.com>
Co-authored-by: Ed <96445749+TheShuEd@users.noreply.github.com>
Co-authored-by: Milon <milonpl.git@proton.me>
Co-authored-by: Kirus59 <145689588+Kirus59@users.noreply.github.com>
Co-authored-by: Nemanja <98561806+EmoGarbage404@users.noreply.github.com>
Co-authored-by: Stomf <5dorkydorks@gmail.com>
Co-authored-by: drakewill-CRL <46307022+drakewill-CRL@users.noreply.github.com>
Co-authored-by: PraxisMapper <praxismapper@gmail.com>
Co-authored-by: EmoGarbage404 <retron404@gmail.com>
Co-authored-by: lzk <124214523+lzk228@users.noreply.github.com>
Co-authored-by: Princess Cheeseballs <66055347+Pronana@users.noreply.github.com>
Co-authored-by: IProduceWidgets <107586145+IProduceWidgets@users.noreply.github.com>
Co-authored-by: TytosB <54259736+TytosB@users.noreply.github.com>
Co-authored-by: abadaba695 <spacestation13thingy@gmail.com>
Co-authored-by: kosticia <kosticia46@gmail.com>
Co-authored-by: Thinbug <101073555+Thinbug0@users.noreply.github.com>
Co-authored-by: pathetic meowmeow <uhhadd@gmail.com>
Co-authored-by: SlamBamActionman <83650252+SlamBamActionman@users.noreply.github.com>
Co-authored-by: Boaz1111 <149967078+Boaz1111@users.noreply.github.com>
Co-authored-by: ActiveMammmoth <140334666+ActiveMammmoth@users.noreply.github.com>
Co-authored-by: Myra <vasilis@pikachu.systems>
Co-authored-by: Whatstone <166147148+whatston3@users.noreply.github.com>
Co-authored-by: Pieter-Jan Briers <pieterjan.briers+git@gmail.com>
Co-authored-by: K-Dynamic <20566341+K-Dynamic@users.noreply.github.com>
Co-authored-by: Gentleman-Bird <dcgreen406@gmail.com>
Co-authored-by: metalgearsloth <31366439+metalgearsloth@users.noreply.github.com>
Co-authored-by: BIGZi0348 <svalker0348@gmail.com>
Co-authored-by: LaCumbiaDelCoronavirus <90893484+LaCumbiaDelCoronavirus@users.noreply.github.com>
Co-authored-by: imatsoup <93290208+imatsoup@users.noreply.github.com>
Co-authored-by: Matthew Herber <32679887+happyrobot33@users.noreply.github.com>
Co-authored-by: Ertanic <36124833+Ertanic@users.noreply.github.com>
Co-authored-by: MissKay1994 <15877268+MissKay1994@users.noreply.github.com>
Co-authored-by: Errant <35878406+Errant-4@users.noreply.github.com>
Co-authored-by: eoineoineoin <helloworld@eoinrul.es>
Co-authored-by: Tiniest Shark <head.rebel@yahoo.com>
Co-authored-by: nikitosych <boriszyn@gmail.com>
Co-authored-by: Tayrtahn <tayrtahn@gmail.com>
Co-authored-by: Perry Fraser <perryprog@users.noreply.github.com>
Co-authored-by: YoungThug <ramialanbagy@gmail.com>
Co-authored-by: beck-thompson <107373427+beck-thompson@users.noreply.github.com>
Co-authored-by: metalgearsloth <comedian_vs_clown@hotmail.com>
Co-authored-by: Southbridge <7013162+southbridge-fur@users.noreply.github.com>
Co-authored-by: Vladislav Suchkov <20380250+murolem@users.noreply.github.com>
Co-authored-by: Prole <172158352+Prole0@users.noreply.github.com>
Co-authored-by: Unkn0wn_Gh0st <shadowstalkermll@gmail.com>
Co-authored-by: 3nderall <101940324+3nderall@users.noreply.github.com>
Co-authored-by: Radezolid <snappednexus@gmail.com>
Co-authored-by: J <billsmith116@gmail.com>
Co-authored-by: Ghagliiarghii <68826635+Ghagliiarghii@users.noreply.github.com>
Co-authored-by: chromiumboy <50505512+chromiumboy@users.noreply.github.com>
Co-authored-by: youtissoum <51883137+youtissoum@users.noreply.github.com>
Co-authored-by: Minemoder5000 <minemoder50000@gmail.com>
Co-authored-by: Spanky <scott@wearejacob.com>
Co-authored-by: Spessmann <156740760+Spessmann@users.noreply.github.com>
Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
Co-authored-by: brainfood1183 <113240905+brainfood1183@users.noreply.github.com>
Co-authored-by: Deerstop <edainturner@gmail.com>
Co-authored-by: B_Kirill <153602297+B-Kirill@users.noreply.github.com>
Co-authored-by: archee1 <archee3@hotmail.co.uk>
Co-authored-by: Cojoke <83733158+Cojoke-dot@users.noreply.github.com>
Co-authored-by: Quantum-cross <7065792+Quantum-cross@users.noreply.github.com>
Co-authored-by: poklj <compgeek223@gmail.com>
Co-authored-by: Krunklehorn <42424291+Krunklehorn@users.noreply.github.com>
Co-authored-by: OnyxTheBrave <131422822+OnyxTheBrave@users.noreply.github.com>
Co-authored-by: UpAndLeaves <92269094+Alpha-Two@users.noreply.github.com>
Co-authored-by: Flareguy <78941145+Flareguy@users.noreply.github.com>
Co-authored-by: Zalycon <84675130+Zalycon@users.noreply.github.com>
Co-authored-by: deltanedas <39013340+deltanedas@users.noreply.github.com>
Co-authored-by: Verm <32827189+Vermidia@users.noreply.github.com>
Co-authored-by: nikthechampiongr <32041239+nikthechampiongr@users.noreply.github.com>
Co-authored-by: ScarKy0 <scarky0@onet.eu>
Co-authored-by: Dmitry <57028746+dimm00n@users.noreply.github.com>
|
2025-05-24 11:00:17 +03:00 |
|
|
B_KirillandGitHub
|
c196538aaf
|
Cleanup warnings: CS0414 (#36950)
* Clean up
* Use #pragma
|
2025-05-07 20:00:12 -04:00 |
|
|
Kyle TyoandGitHub
|
a711912cba
|
Unused dependency cleanup. (#36760)
* take 2! fight!!!
* final touches
* reeeeeee
|
2025-04-20 15:56:39 +02:00 |
|
|
Leon FriedrichandGitHub
|
e4f3d19094
|
Make MappingDataNode use string keys (#36111)
* MappingDataNode string keys
* a
* poke
|
2025-04-18 19:28:22 +10:00 |
|
|
LEVELcat
|
790070d410
|
Merge branch 'master' of https://github.com/space-syndicate/space-station-14 into upstreamAgain
# Resolved Conflicts:
# .github/workflows/publish.yml
# Content.IntegrationTests/Tests/Commands/SuicideCommandTests.cs
# Content.Server/Administration/Systems/BwoinkSystem.cs
# Content.Server/Corvax/StationGoal/StationGoalPaperSystem.cs
# Content.Server/DetailExaminable/DetailExaminableystem.cs
# Content.Server/GameTicking/GameTicker.Spawning.cs
# Content.Server/Ghost/GhostSystem.cs
# Content.Server/Light/EntitySystems/PoweredLightSystem.cs
# Content.Server/Station/Systems/StationSpawningSystem.cs
# Content.Server/Store/Systems/StoreSystem.Listings.cs
# Content.Server/Store/Systems/StoreSystem.Ui.cs
# Content.Shared.Database/LogType.cs
# Content.Shared/Damage/Systems/StaminaSystem.cs
# Content.Shared/Eye/VisibilityFlags.cs
# Content.Shared/Humanoid/Markings/MarkingCategories.cs
# Content.Shared/Humanoid/NamingSystem.cs
# Content.Shared/Humanoid/Prototypes/SpeciesPrototype.cs
# Content.Shared/Humanoid/SharedHumanoidAppearanceSystem.cs
# Directory.Packages.props
# Resources/Audio/Lobby/attributions.yml
# Resources/Credits/GitHub.txt
# Resources/Locale/ru-RU/ghost/roles/ghost-role-component.ftl
# Resources/Prototypes/Corvax/Reagents/Consumable/Drink/alcohol.yml
# Resources/Prototypes/Corvax/lobbyscreens.yml
# Resources/Prototypes/Entities/Mobs/Species/base.yml
# Resources/Prototypes/Entities/Mobs/Species/moth.yml
# Resources/Prototypes/Entities/Objects/Tools/toolbox.yml
# Resources/Prototypes/Entities/Objects/Weapons/Melee/sledgehammer.yml
# Resources/Prototypes/Entities/Structures/Shuttles/cannons.yml
# Resources/Prototypes/GameRules/events.yml
# Resources/Prototypes/Reagents/medicine.yml
# Resources/Prototypes/Roles/Jobs/Security/warden.yml
# Resources/Prototypes/SoundCollections/lobby.yml
# Resources/Prototypes/Species/arachnid.yml
# Resources/Prototypes/Species/diona.yml
# Resources/Prototypes/Species/moth.yml
# Resources/Prototypes/Species/reptilian.yml
# Resources/Prototypes/Species/vox.yml
# Resources/Prototypes/Voice/speech_emotes.yml
# Resources/Prototypes/game_presets.yml
# Resources/Prototypes/secret_weights.yml
# Resources/Textures/Corvax/LobbyScreens/attributions.yml
# Resources/Textures/Interface/Misc/job_icons.rsi/meta.json
|
2025-04-06 08:43:40 +03:00 |
|
|
LEVELcat
|
241fecc5a8
|
reverted book removing
|
2025-04-05 18:36:29 +03:00 |
|
|
ElectroJr
|
6242567aff
|
Refactor map loading & saving
|
2024-12-23 02:42:17 +13:00 |
|
|
Pupchansky
|
5b8cdc75c1
|
Мини фиксы
|
2024-09-06 11:50:13 +05:00 |
|
|
Pupchansky
|
578a39d1b1
|
Апстрим
|
2024-08-25 18:54:10 +05:00 |
|
|
Leon FriedrichandGitHub
|
5ba1a41742
|
Trim migration.yml (#19081)
|
2023-08-14 01:44:34 -06:00 |
|
|
Leon FriedrichandGitHub
|
9c8ee0c6c9
|
Fix invalid followers being saved in maps (#16146)
|
2023-05-07 09:38:56 +10:00 |
|
|
Leon FriedrichandGitHub
|
90a137c752
|
Add basic map loader support for entity renaming (#15862)
|
2023-05-01 13:41:57 +10:00 |
|