Dmitry
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
Morb0
be480aced1
Merge remote-tracking branch 'wizards/master' into upstream-sync
...
# Conflicts:
# Content.Server/Chat/Managers/ChatSanitizationManager.cs
# Content.Shared/Localizations/ContentLocalizationManager.cs
# Resources/Audio/Weapons/Guns/Gunshots/attributions.yml
# Resources/Prototypes/Datasets/Names/last.yml
# Resources/Prototypes/Loadouts/loadout_groups.yml
# Resources/ServerInfo/Guidebook/Antagonist/Traitors.xml
2024-10-30 16:38:56 +03:00
Vasilis
a739b21b04
Change the window titlebar to show the joined server ( #32547 )
...
* Change the window titlebar to show the joined server
Requires https://github.com/space-wizards/RobustToolbox/pull/5475/
* Totally not a webedit
* Can you tell what cvar I copied?
* And this kids is why we don't webedit
* Reviews
---------
Co-authored-by: metalgearsloth <comedian_vs_clown@hotmail.com >
2024-10-17 13:06:07 +02:00
Morb0
3ab6d3ef71
Merge remote-tracking branch 'wizards/master' into upstream-sync
...
# Conflicts:
# .github/workflows/publish.yml
# Content.Client/VoiceMask/VoiceMaskNameChangeWindow.xaml.cs
# Content.Server/GameTicking/GameTicker.Player.cs
# Content.Server/VoiceMask/VoiceMaskComponent.cs
# Content.Server/VoiceMask/VoiceMaskSystem.Equip.cs
# Content.Server/VoiceMask/VoiceMaskSystem.cs
# Content.Server/VoiceMask/VoiceMaskerComponent.cs
# Resources/Prototypes/Catalog/Fills/Lockers/heads.yml
# Resources/Prototypes/Entities/Clothing/Masks/specific.yml
# Resources/Prototypes/Entities/Mobs/NPCs/regalrat.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/Science/research_director.yml
# Resources/Prototypes/Roles/Jobs/Security/head_of_security.yml
# Resources/Prototypes/Roles/Jobs/Wildcards/psychologist.yml
# Resources/Textures/Objects/Misc/bureaucracy.rsi/meta.json
# Resources/Textures/Objects/Misc/bureaucracy.rsi/paper_stamp-psychologist.png
# Resources/Textures/Structures/Walls/solid.rsi/reinf_over0.png
# Resources/Textures/Tiles/attributions.yml
# Resources/Textures/Tiles/blue_circuit.png
# Resources/Textures/Tiles/green_circuit.png
# Resources/Textures/Tiles/steel.png
2024-10-04 19:47:54 +03:00
nikthechampiongr
a5840b925b
Fix RA0032 ( #32514 )
2024-09-29 02:25:21 +02:00
Morb0
721f7bfecf
Merge remote-tracking branch 'refs/remotes/wizards/master' into upstream-sync
...
# Conflicts:
# Content.Server/Connection/ConnectionManager.cs
# Resources/Prototypes/Datasets/Names/ai.yml
# Resources/Prototypes/Datasets/adjectives.yml
# Resources/Prototypes/Datasets/verbs.yml
# Resources/Prototypes/Entities/Clothing/Shoes/specific.yml
# Resources/Prototypes/Entities/Mobs/NPCs/revenant.yml
# Resources/Prototypes/Entities/Mobs/base.yml
# Resources/Prototypes/Maps/bagel.yml
# Resources/Prototypes/Roles/Jobs/Security/security_cadet.yml
# Resources/Textures/Clothing/Head/Helmets/light_riot.rsi/equipped-HELMET.png
# Resources/Textures/Clothing/Head/Helmets/light_riot.rsi/icon.png
# Resources/Textures/Clothing/Head/Helmets/light_riot.rsi/meta.json
# Resources/Textures/Interface/Misc/job_icons.rsi/meta.json
# Resources/Textures/Objects/Misc/bureaucracy.rsi/meta.json
# Resources/Textures/Structures/Wallmounts/barsign.rsi/officerbeersky.png
# Resources/Textures/Structures/Wallmounts/signs.rsi/anomaly.png
# SpaceStation14.sln
2024-08-28 16:40:36 +03:00
Simon
f92ef41538
Automated whitelists ( #23985 )
...
* Beginnings of making the breadmemes jobs easier
* stuff
* stuff pt. 2
* Stuff pt.3
* Stuff I forgot last time
* Basic whitelist
Only people that are added to the whitelist with the addwhitelist command will be able to join. I call this the "legacy" whitelist
* Remove always deny condition in favor of just breaking if playtime check fails
* Change default whitelist
Default whitelist is now the "legacy" whitelist.
* localization
* Admin check
* minor spelling change
* Fix build
* Whitelist message
* Fix vars not being datafield and spelling mistakes
* Minor spelling mistake
* Change config for salamander
* Reviews and stuff
* Add summaries
* Fix whitelists
* Forgot to add a datafield
* Fixing stuff I guess
* Reuse admin remarks to reduce load when connecting.
* Update log messages to be verbose instead of debug
* Reviews
* whoops
* Explain a bit more how whitelist checking works
* Apply CE's review
* Append Membership to Blacklist and Whitelist conditions
* Fix review comments
* Uncapitalize playerConnectionWhitelist, add to ignored client prototypes
* Make note count field work
* Fix cvar for thingy
---------
Co-authored-by: Pieter-Jan Briers <pieterjan.briers+git@gmail.com >
2024-08-27 18:01:17 +02:00
Morbo
44a22c928d
Merge remote-tracking branch 'refs/remotes/upstream/master' into master-syndie
...
# Conflicts:
# Content.Client/Entry/EntryPoint.cs
# Content.Client/IoC/ClientContentIoC.cs
2024-06-27 18:13:54 +03:00
Pieter-Jan Briers
ced15b7934
Fix coords monitor in replays ( #29512 )
...
The F3 coords manager is blocked if you're not an admin. This check happened even when playing a replay, where you actually aren't. There's now a check to make sure you are actually server-connected-to-game before running the logic.
Also moved it to a manager because this *shouldn't be a bloody entity system in the first place*.
2024-06-27 16:58:51 +02:00
Morb0
9888f8fa57
Merge remote-tracking branch 'refs/remotes/upstream/master' into upstream-sync
...
# Conflicts:
# .github/CODEOWNERS
# Content.Client/Administration/UI/Tabs/PanicBunkerTab/PanicBunkerTab.xaml.cs
# Content.Client/Lobby/LobbyUIController.cs
# Content.Server/Administration/Systems/AdminSystem.cs
# Content.Server/Connection/ConnectionManager.cs
# Content.Server/GameTicking/Rules/NukeopsRuleSystem.cs
# Content.Shared/Administration/Events/PanicBunkerChangedEvent.cs
# Content.Shared/Preferences/HumanoidCharacterProfile.cs
# Resources/Prototypes/Accents/word_replacements.yml
# Resources/Prototypes/Catalog/Fills/Backpacks/StarterGear/backpack.yml
# Resources/Prototypes/Catalog/Fills/Backpacks/StarterGear/duffelbag.yml
# Resources/Prototypes/Catalog/Fills/Backpacks/StarterGear/satchel.yml
# Resources/Prototypes/Entities/Mobs/base.yml
# Resources/Prototypes/Roles/Antags/nukeops.yml
# Resources/Prototypes/Roles/Antags/revolutionary.yml
# Resources/Prototypes/Roles/Antags/traitor.yml
# Resources/Prototypes/Roles/Antags/zombie.yml
# Resources/Prototypes/Roles/Jobs/Security/security_cadet.yml
# Resources/ServerInfo/Guidebook/Antagonist/Traitors.xml
# Resources/ServerInfo/Guidebook/Cargo/Cargo.xml
# Resources/ServerInfo/Guidebook/Cargo/CargoBounties.xml
# Resources/ServerInfo/Guidebook/Cargo/Salvage.xml
# Resources/ServerInfo/Guidebook/Controls/Controls.xml
# Resources/ServerInfo/Guidebook/Controls/Radio.xml
# Resources/ServerInfo/Guidebook/Engineering/Engineering.xml
# Resources/ServerInfo/Guidebook/Engineering/Fires.xml
# Resources/ServerInfo/Guidebook/Engineering/Singularity.xml
# Resources/ServerInfo/Guidebook/Jobs.xml
# Resources/ServerInfo/Guidebook/Medical/Chemist.xml
# Resources/ServerInfo/Guidebook/Medical/Medical.xml
# Resources/ServerInfo/Guidebook/Medical/MedicalDoctor.xml
# Resources/ServerInfo/Guidebook/Science/Science.xml
# Resources/ServerInfo/Guidebook/Security/Security.xml
# Resources/ServerInfo/Guidebook/Service/Bartender.xml
# Resources/ServerInfo/Guidebook/Service/Chef.xml
# Resources/ServerInfo/Guidebook/SpaceStation14.xml
# Resources/ServerInfo/Guidebook/Survival.xml
# Resources/Textures/Objects/Storage/boxes.rsi/meta.json
2024-06-14 19:48:52 +03:00
Nemanja
1333b48747
Convert rules to use guidebook parsing ( #28647 )
2024-06-06 03:11:26 -04:00
Morb0
6a6bf86856
Merge remote-tracking branch 'refs/remotes/upstream/master' into upstream-sync
...
# Conflicts:
# Resources/Prototypes/GameRules/events.yml
2024-06-02 19:57:53 +03:00
slarticodefast
1283989346
Flash overlay rework and bugfixes ( #27369 )
2024-06-02 00:17:53 -04:00
Morb0
d97a09543d
Merge remote-tracking branch 'refs/remotes/upstream/master' into upstream-sync
...
# Conflicts:
# Content.Client/IoC/ClientContentIoC.cs
# Content.Client/Lobby/UI/HumanoidProfileEditor.xaml.cs
# Content.Client/Preferences/UI/CharacterSetupGui.xaml.cs
# Content.IntegrationTests/Tests/Preferences/ServerDbSqliteTests.cs
# Content.Server/Preferences/Managers/ServerPreferencesManager.cs
# Content.Shared/Preferences/HumanoidCharacterProfile.cs
# Content.Shared/Preferences/Loadouts/Effects/GroupLoadoutEffect.cs
# Content.Shared/Preferences/Loadouts/Effects/JobRequirementLoadoutEffect.cs
# Content.Shared/Preferences/Loadouts/RoleLoadout.cs
# Resources/ServerInfo/Guidebook/Engineering/TEG.xml
# Resources/Textures/Clothing/Uniforms/Jumpsuit/security.rsi/equipped-INNERCLOTHING.png
# Resources/Textures/Clothing/Uniforms/Jumpsuit/security.rsi/meta.json
2024-05-15 18:53:52 +03:00
metalgearsloth
332f54a3ae
Lobby refactor + species loadouts support ( #27576 )
...
* Vox stuff
* Species loadouts and lobby refactor
The control flow for lobby is all over the shop so I pulled it all up from the individual controls so now they handle the bare minimum required and LobbyUIController handles the rest.
* a
* Bulk changes
* a
* weh
* Character import / export
* finalise
* woops this stuff too
* Also datafield exporting
* comments
* Review
2024-05-12 09:18:21 +10:00
Morb0
b704ef0d5e
Merge remote-tracking branch 'refs/remotes/upstream/master' into upstream-sync
...
# Conflicts:
# Content.Client/Entry/EntryPoint.cs
# Content.Server/GameTicking/GameTicker.Spawning.cs
# Content.Server/Preferences/Managers/ServerPreferencesManager.cs
# Resources/Prototypes/Entities/Clothing/Hands/gloves.yml
# Resources/Textures/Clothing/Hands/Gloves/combat.rsi/equipped-HAND.png
# Resources/Textures/Clothing/Hands/Gloves/combat.rsi/icon.png
# Resources/Textures/Clothing/Hands/Gloves/combat.rsi/inhand-left.png
# Resources/Textures/Clothing/Hands/Gloves/combat.rsi/inhand-right.png
# Resources/Textures/Clothing/Hands/Gloves/combat.rsi/meta.json
# Resources/Textures/Clothing/Head/Hardsuits/ERThelmets/ertengineer.rsi/meta.json
# Resources/Textures/Clothing/Head/Hardsuits/ERThelmets/ertengineer.rsi/off-inhand-left.png
# Resources/Textures/Clothing/Head/Hardsuits/ERThelmets/ertengineer.rsi/off-inhand-right.png
# Resources/Textures/Clothing/Head/Hardsuits/ERThelmets/ertengineer.rsi/on-inhand-left.png
# Resources/Textures/Clothing/Head/Hardsuits/ERThelmets/ertengineer.rsi/on-inhand-right.png
# Resources/Textures/Clothing/Head/Hardsuits/ERThelmets/ertjanitor.rsi/meta.json
# Resources/Textures/Clothing/Head/Hardsuits/ERThelmets/ertjanitor.rsi/off-inhand-left.png
# Resources/Textures/Clothing/Head/Hardsuits/ERThelmets/ertjanitor.rsi/off-inhand-right.png
# Resources/Textures/Clothing/Head/Hardsuits/ERThelmets/ertjanitor.rsi/on-inhand-left.png
# Resources/Textures/Clothing/Head/Hardsuits/ERThelmets/ertjanitor.rsi/on-inhand-right.png
# Resources/Textures/Clothing/Head/Hardsuits/ERThelmets/ertleader.rsi/meta.json
# Resources/Textures/Clothing/Head/Hardsuits/ERThelmets/ertleader.rsi/off-inhand-left.png
# Resources/Textures/Clothing/Head/Hardsuits/ERThelmets/ertleader.rsi/off-inhand-right.png
# Resources/Textures/Clothing/Head/Hardsuits/ERThelmets/ertleader.rsi/on-inhand-left.png
# Resources/Textures/Clothing/Head/Hardsuits/ERThelmets/ertleader.rsi/on-inhand-right.png
# Resources/Textures/Clothing/Head/Hardsuits/ERThelmets/ertmedical.rsi/meta.json
# Resources/Textures/Clothing/Head/Hardsuits/ERThelmets/ertmedical.rsi/off-inhand-left.png
# Resources/Textures/Clothing/Head/Hardsuits/ERThelmets/ertmedical.rsi/off-inhand-right.png
# Resources/Textures/Clothing/Head/Hardsuits/ERThelmets/ertmedical.rsi/on-equipped-HELMET.png
# Resources/Textures/Clothing/Head/Hardsuits/ERThelmets/ertmedical.rsi/on-inhand-left.png
# Resources/Textures/Clothing/Head/Hardsuits/ERThelmets/ertmedical.rsi/on-inhand-right.png
# Resources/Textures/Clothing/Head/Hardsuits/ERThelmets/ertsecurity.rsi/meta.json
# Resources/Textures/Clothing/Head/Hardsuits/ERThelmets/ertsecurity.rsi/off-inhand-left.png
# Resources/Textures/Clothing/Head/Hardsuits/ERThelmets/ertsecurity.rsi/off-inhand-right.png
# Resources/Textures/Clothing/Head/Hardsuits/ERThelmets/ertsecurity.rsi/on-inhand-left.png
# Resources/Textures/Clothing/Head/Hardsuits/ERThelmets/ertsecurity.rsi/on-inhand-right.png
# Resources/Textures/Clothing/Head/Hardsuits/atmospherics.rsi/inhand-left-light.png
# Resources/Textures/Clothing/Head/Hardsuits/atmospherics.rsi/inhand-left-unshaded.png
# Resources/Textures/Clothing/Head/Hardsuits/atmospherics.rsi/inhand-left.png
# Resources/Textures/Clothing/Head/Hardsuits/atmospherics.rsi/inhand-right-light.png
# Resources/Textures/Clothing/Head/Hardsuits/atmospherics.rsi/inhand-right-unshaded.png
# Resources/Textures/Clothing/Head/Hardsuits/atmospherics.rsi/inhand-right.png
# Resources/Textures/Clothing/Head/Hardsuits/atmospherics.rsi/meta.json
# Resources/Textures/Clothing/Head/Hardsuits/capspace.rsi/meta.json
# Resources/Textures/Clothing/Head/Hardsuits/cburn.rsi/inhand-left-unshaded.png
# Resources/Textures/Clothing/Head/Hardsuits/cburn.rsi/inhand-left.png
# Resources/Textures/Clothing/Head/Hardsuits/cburn.rsi/inhand-right-unshaded.png
# Resources/Textures/Clothing/Head/Hardsuits/cburn.rsi/inhand-right.png
# Resources/Textures/Clothing/Head/Hardsuits/cburn.rsi/meta.json
# Resources/Textures/Clothing/Head/Hardsuits/clown.rsi/meta.json
# Resources/Textures/Clothing/Head/Hardsuits/cybersun.rsi/meta.json
# Resources/Textures/Clothing/Head/Hardsuits/deathsquad.rsi/meta.json
# Resources/Textures/Clothing/Head/Hardsuits/engineering-white.rsi/meta.json
# Resources/Textures/Clothing/Head/Hardsuits/engineering-white.rsi/off-inhand-left.png
# Resources/Textures/Clothing/Head/Hardsuits/engineering-white.rsi/off-inhand-right.png
# Resources/Textures/Clothing/Head/Hardsuits/engineering-white.rsi/on-inhand-left.png
# Resources/Textures/Clothing/Head/Hardsuits/engineering-white.rsi/on-inhand-right.png
# Resources/Textures/Clothing/Head/Hardsuits/engineering.rsi/meta.json
# Resources/Textures/Clothing/Head/Hardsuits/engineering.rsi/off-inhand-left.png
# Resources/Textures/Clothing/Head/Hardsuits/engineering.rsi/off-inhand-right.png
# Resources/Textures/Clothing/Head/Hardsuits/engineering.rsi/on-inhand-left.png
# Resources/Textures/Clothing/Head/Hardsuits/engineering.rsi/on-inhand-right.png
# Resources/Textures/Clothing/Head/Hardsuits/luxury.rsi/meta.json
# Resources/Textures/Clothing/Head/Hardsuits/luxury.rsi/off-inhand-left.png
# Resources/Textures/Clothing/Head/Hardsuits/luxury.rsi/off-inhand-right.png
# Resources/Textures/Clothing/Head/Hardsuits/luxury.rsi/on-inhand-left.png
# Resources/Textures/Clothing/Head/Hardsuits/luxury.rsi/on-inhand-right.png
# Resources/Textures/Clothing/Head/Hardsuits/medical.rsi/meta.json
# Resources/Textures/Clothing/Head/Hardsuits/medical.rsi/off-inhand-left.png
# Resources/Textures/Clothing/Head/Hardsuits/medical.rsi/off-inhand-right.png
# Resources/Textures/Clothing/Head/Hardsuits/medical.rsi/on-inhand-left.png
# Resources/Textures/Clothing/Head/Hardsuits/medical.rsi/on-inhand-right.png
# Resources/Textures/Clothing/Head/Hardsuits/rd.rsi/meta.json
# Resources/Textures/Clothing/Head/Hardsuits/rd.rsi/off-inhand-left.png
# Resources/Textures/Clothing/Head/Hardsuits/rd.rsi/off-inhand-right.png
# Resources/Textures/Clothing/Head/Hardsuits/rd.rsi/on-inhand-left.png
# Resources/Textures/Clothing/Head/Hardsuits/rd.rsi/on-inhand-right.png
# Resources/Textures/Clothing/Head/Hardsuits/salvage.rsi/meta.json
# Resources/Textures/Clothing/Head/Hardsuits/salvage.rsi/off-inhand-left.png
# Resources/Textures/Clothing/Head/Hardsuits/salvage.rsi/off-inhand-right.png
# Resources/Textures/Clothing/Head/Hardsuits/salvage.rsi/on-inhand-left.png
# Resources/Textures/Clothing/Head/Hardsuits/salvage.rsi/on-inhand-right.png
# Resources/Textures/Clothing/Head/Hardsuits/security-red.rsi/meta.json
# Resources/Textures/Clothing/Head/Hardsuits/security-red.rsi/off-inhand-left.png
# Resources/Textures/Clothing/Head/Hardsuits/security-red.rsi/off-inhand-right.png
# Resources/Textures/Clothing/Head/Hardsuits/security-red.rsi/on-inhand-left.png
# Resources/Textures/Clothing/Head/Hardsuits/security-red.rsi/on-inhand-right.png
# Resources/Textures/Clothing/Head/Hardsuits/security-warden.rsi/meta.json
# Resources/Textures/Clothing/Head/Hardsuits/security.rsi/meta.json
# Resources/Textures/Clothing/Head/Hardsuits/security.rsi/off-inhand-left.png
# Resources/Textures/Clothing/Head/Hardsuits/security.rsi/off-inhand-right.png
# Resources/Textures/Clothing/Head/Hardsuits/security.rsi/on-inhand-left.png
# Resources/Textures/Clothing/Head/Hardsuits/security.rsi/on-inhand-right.png
# Resources/Textures/Clothing/Head/Hardsuits/spatiohelm.rsi/inhand-left.png
# Resources/Textures/Clothing/Head/Hardsuits/spatiohelm.rsi/inhand-right-light.png
# Resources/Textures/Clothing/Head/Hardsuits/spatiohelm.rsi/inhand-right.png
# Resources/Textures/Clothing/Head/Hardsuits/spatiohelm.rsi/meta.json
# Resources/Textures/Clothing/Head/Hardsuits/syndicate.rsi/meta.json
# Resources/Textures/Clothing/Head/Hardsuits/syndicate.rsi/off-inhand-left.png
# Resources/Textures/Clothing/Head/Hardsuits/syndicate.rsi/off-inhand-right.png
# Resources/Textures/Clothing/Head/Hardsuits/syndicate.rsi/on-inhand-left.png
# Resources/Textures/Clothing/Head/Hardsuits/syndicate.rsi/on-inhand-right.png
# Resources/Textures/Clothing/Head/Hardsuits/syndiecommander.rsi/meta.json
# Resources/Textures/Clothing/Head/Hardsuits/syndiecommander.rsi/off-inhand-left.png
# Resources/Textures/Clothing/Head/Hardsuits/syndiecommander.rsi/off-inhand-right.png
# Resources/Textures/Clothing/Head/Hardsuits/syndiecommander.rsi/on-inhand-left.png
# Resources/Textures/Clothing/Head/Hardsuits/syndiecommander.rsi/on-inhand-right.png
# Resources/Textures/Clothing/Head/Hardsuits/syndieelite.rsi/meta.json
# Resources/Textures/Clothing/Head/Hardsuits/syndieelite.rsi/off-inhand-left.png
# Resources/Textures/Clothing/Head/Hardsuits/syndieelite.rsi/off-inhand-right.png
# Resources/Textures/Clothing/Head/Hardsuits/syndieelite.rsi/on-inhand-left.png
# Resources/Textures/Clothing/Head/Hardsuits/syndieelite.rsi/on-inhand-right.png
# Resources/Textures/Clothing/Head/Hardsuits/syndiemedic.rsi/meta.json
# Resources/Textures/Clothing/Head/Hardsuits/syndiemedic.rsi/off-inhand-left.png
# Resources/Textures/Clothing/Head/Hardsuits/syndiemedic.rsi/off-inhand-right.png
# Resources/Textures/Clothing/Head/Hardsuits/syndiemedic.rsi/on-inhand-left.png
# Resources/Textures/Clothing/Head/Hardsuits/syndiemedic.rsi/on-inhand-right.png
# Resources/Textures/Clothing/Head/Hardsuits/wizard.rsi/meta.json
# Resources/Textures/Clothing/Head/Hardsuits/wizard.rsi/off-inhand-left.png
# Resources/Textures/Clothing/Head/Hardsuits/wizard.rsi/off-inhand-right.png
# Resources/Textures/Clothing/Head/Hardsuits/wizard.rsi/on-inhand-left.png
# Resources/Textures/Clothing/Head/Hardsuits/wizard.rsi/on-inhand-right.png
# Resources/Textures/Clothing/Head/Helmets/atmos_firehelmet.rsi/meta.json
# Resources/Textures/Clothing/Head/Helmets/light_riot.rsi/meta.json
# Resources/Textures/Clothing/Head/Helmets/security.rsi/meta.json
# Resources/Textures/Clothing/Head/Helmets/spaceninja.rsi/meta.json
# Resources/Textures/Clothing/OuterClothing/Armor/bulletproof.rsi/meta.json
# Resources/Textures/Clothing/OuterClothing/Armor/captain_carapace.rsi/meta.json
# Resources/Textures/Clothing/OuterClothing/Armor/riot.rsi/meta.json
# Resources/Textures/Clothing/OuterClothing/Armor/security.rsi/meta.json
# Resources/Textures/Clothing/OuterClothing/Coats/hos_trenchcoat.rsi/meta.json
# Resources/Textures/Clothing/OuterClothing/Coats/labcoat.rsi/meta.json
# Resources/Textures/Clothing/OuterClothing/Coats/labcoat_chem.rsi/meta.json
# Resources/Textures/Clothing/OuterClothing/Coats/labcoat_cmo.rsi/meta.json
# Resources/Textures/Clothing/OuterClothing/Coats/labcoat_gene.rsi/meta.json
# Resources/Textures/Clothing/OuterClothing/Coats/labcoat_sci.rsi/meta.json
# Resources/Textures/Clothing/OuterClothing/Coats/labcoat_viro.rsi/meta.json
# Resources/Textures/Clothing/OuterClothing/Hardsuits/ERTSuits/ertengineer.rsi/meta.json
# Resources/Textures/Clothing/OuterClothing/Hardsuits/ERTSuits/ertjanitor.rsi/meta.json
# Resources/Textures/Clothing/OuterClothing/Hardsuits/ERTSuits/ertleader.rsi/meta.json
# Resources/Textures/Clothing/OuterClothing/Hardsuits/ERTSuits/ertmedical.rsi/meta.json
# Resources/Textures/Clothing/OuterClothing/Hardsuits/ERTSuits/ertsecurity.rsi/meta.json
# Resources/Textures/Clothing/OuterClothing/Hardsuits/atmospherics.rsi/meta.json
# Resources/Textures/Clothing/OuterClothing/Hardsuits/capspace.rsi/meta.json
# Resources/Textures/Clothing/OuterClothing/Hardsuits/cburn.rsi/meta.json
# Resources/Textures/Clothing/OuterClothing/Hardsuits/clown.rsi/meta.json
# Resources/Textures/Clothing/OuterClothing/Hardsuits/cybersun.rsi/meta.json
# Resources/Textures/Clothing/OuterClothing/Hardsuits/deathsquad.rsi/meta.json
# Resources/Textures/Clothing/OuterClothing/Hardsuits/engineering-white.rsi/meta.json
# Resources/Textures/Clothing/OuterClothing/Hardsuits/engineering.rsi/meta.json
# Resources/Textures/Clothing/OuterClothing/Hardsuits/luxury.rsi/meta.json
# Resources/Textures/Clothing/OuterClothing/Hardsuits/medical.rsi/meta.json
# Resources/Textures/Clothing/OuterClothing/Hardsuits/paramed.rsi/meta.json
# Resources/Textures/Clothing/OuterClothing/Hardsuits/piratecaptain.rsi/meta.json
# Resources/Textures/Clothing/OuterClothing/Hardsuits/pirateeva.rsi/meta.json
# Resources/Textures/Clothing/OuterClothing/Hardsuits/rd.rsi/meta.json
# Resources/Textures/Clothing/OuterClothing/Hardsuits/salvage.rsi/meta.json
# Resources/Textures/Clothing/OuterClothing/Hardsuits/security-red.rsi/meta.json
# Resources/Textures/Clothing/OuterClothing/Hardsuits/security-warden.rsi/meta.json
# Resources/Textures/Clothing/OuterClothing/Hardsuits/security.rsi/meta.json
# Resources/Textures/Clothing/OuterClothing/Hardsuits/spatio.rsi/meta.json
# Resources/Textures/Clothing/OuterClothing/Hardsuits/syndicate.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/Hardsuits/syndiemedic.rsi/meta.json
# Resources/Textures/Clothing/OuterClothing/Hardsuits/wizard.rsi/meta.json
# Resources/Textures/Clothing/OuterClothing/Misc/cardborg.rsi/meta.json
# Resources/Textures/Clothing/OuterClothing/Suits/bombsuit.rsi/meta.json
# Resources/Textures/Clothing/OuterClothing/Suits/eva_emergency.rsi/meta.json
# Resources/Textures/Clothing/OuterClothing/Suits/monkey.rsi/meta.json
# Resources/Textures/Clothing/OuterClothing/Suits/rad.rsi/meta.json
# Resources/Textures/Clothing/OuterClothing/Vests/detvest.rsi/meta.json
# Resources/Textures/Clothing/OuterClothing/Vests/hazard.rsi/meta.json
# Resources/Textures/Clothing/Uniforms/Jumpskirt/senior_officer.rsi/equipped-INNERCLOTHING.png
2024-05-09 13:28:43 +03:00
no
630a7a78ed
Add ghost role raffles ( #26629 )
...
* Add ghost role raffles
* GRR: Fix dialogue sizing, fix merge
* GRR: Add raffle deciders (winner picker)
* GRR: Make settings prototype based with option to override
* GRR: Use Raffles folder and namespace
* GRR: DataFieldify and TimeSpanify
* GRR: Don't actually DataFieldify HashSet<ICommonSession>s
* GRR: add GetGhostRoleCount() + docs
* update engine on branch
* Ghost role raffles: docs, fix window size, cleanup, etc
* GRR: Admin UI
* GRR: Admin UI: Display initial/max/ext of selected raffle settings proto
* GRR: Make a ton of roles raffled
2024-05-06 18:48:16 -07:00
Morb0
c44d509701
Merge remote-tracking branch 'upstream/master' into upstream-sync
...
# Conflicts:
# Content.Client/VoiceMask/VoiceMaskBoundUserInterface.cs
# Content.Client/VoiceMask/VoiceMaskNameChangeWindow.xaml
# Content.Client/VoiceMask/VoiceMaskNameChangeWindow.xaml.cs
# Content.Server/VoiceMask/VoiceMaskSystem.Equip.cs
# Content.Server/VoiceMask/VoiceMaskSystem.cs
# Content.Server/VoiceMask/VoiceMaskerComponent.cs
# Content.Shared/VoiceMask/SharedVoiceMaskSystem.cs
# Resources/Prototypes/Catalog/Fills/Lockers/security.yml
# Resources/Textures/Interface/Alerts/essence_counter.rsi/essence0.png
# Resources/Textures/Interface/Alerts/essence_counter.rsi/essence16.png
2024-03-29 11:43:30 +03:00
Tayrtahn
794a447bb7
Separate "thank you" messages from general ads ( #25867 )
...
* Separated "thank you" messages from general ads
* Moved MessagePackPrototype to shared, cleaned up AdvertiseComponent, and actually killed AdvertisementsPackPrototype.
+More suggests changes.
* Rename PackPrototypeID to Pack in both components.
2024-03-28 17:46:26 +11:00
Morb0
8daf4b3f32
Merge remote-tracking branch 'upstream/master' into upstream-sync
...
# Conflicts:
# Resources/Prototypes/Datasets/tips.yml
# Resources/Prototypes/StatusIcon/antag.yml
# Resources/ServerInfo/Guidebook/Engineering/TEG.xml
# Resources/ServerInfo/Guidebook/Science/ArtifactReports.xml
# Resources/Textures/Structures/Furniture/chairs.rsi/meta.json
# Resources/Textures/Structures/stairs.rsi/meta.json
2024-03-21 01:15:13 +03:00
Leon Friedrich
646f7e07a8
Add reckless replay load button ( #26212 )
...
* Add reckless replay load button
* A
* More descriptive button
2024-03-18 18:31:36 +11:00
deltanedas
7561bef6a7
Move faction exception and everything it needs to shared ( #25154 )
...
* move faction prototype to shared
* move faction exception and member stuff to shared
* fix breaking changes for random stuff
* move pettable friend stuff to shared
* mostly fix
* final fixy
* dragonops
* final fixy II
* use querys and fix warpspeed fish (probably)
* fixer
* Rrrr!
---------
Co-authored-by: deltanedas <@deltanedas:kde.org>
Co-authored-by: metalgearsloth <comedian_vs_clown@hotmail.com >
2024-03-18 18:23:25 +11:00
Morb0
b70efe1fa8
Merge remote-tracking branch 'upstream/master' into upstream-sync
...
# Conflicts:
# Content.Client/Audio/ContentAudioSystem.cs
# Content.Server/GameTicking/GameTicker.RoundFlow.cs
# Resources/Prototypes/Catalog/Fills/Lockers/security.yml
# Resources/Prototypes/Catalog/VendingMachines/Inventories/lawdrobe.yml
# Resources/Prototypes/Datasets/Names/first_male.yml
# Resources/Prototypes/Entities/Clothing/Shoes/specific.yml
# Resources/Prototypes/Entities/Mobs/NPCs/pets.yml
# Resources/Prototypes/GameRules/roundstart.yml
# Resources/Textures/Clothing/OuterClothing/Hardsuits/syndicate.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/diagonal.png
# Resources/Textures/Decals/Overlays/greyscale.rsi/diagonal_checker_a.png
# Resources/Textures/Decals/Overlays/greyscale.rsi/diagonal_checker_b.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/herringbone.png
# Resources/Textures/Decals/Overlays/greyscale.rsi/meta.json
# Resources/Textures/Decals/Overlays/greyscale.rsi/minitile.png
# Resources/Textures/Decals/Overlays/greyscale.rsi/minitile_checker_a.png
# Resources/Textures/Decals/Overlays/greyscale.rsi/minitile_checker_b.png
# Resources/Textures/Decals/Overlays/greyscale.rsi/minitile_diagonal.png
# Resources/Textures/Decals/Overlays/greyscale.rsi/minitile_diagonal_a.png
# Resources/Textures/Decals/Overlays/greyscale.rsi/minitile_diagonal_b.png
# Resources/Textures/Decals/Overlays/greyscale.rsi/mono.png
# Resources/Textures/Decals/Overlays/greyscale.rsi/offset.png
# Resources/Textures/Decals/Overlays/greyscale.rsi/offset_checker_a.png
# Resources/Textures/Decals/Overlays/greyscale.rsi/offset_checker_b.png
# Resources/Textures/Decals/Overlays/greyscale.rsi/pavement.png
# Resources/Textures/Decals/Overlays/greyscale.rsi/pavement_checker_a.png
# Resources/Textures/Decals/Overlays/greyscale.rsi/pavement_checker_b.png
# Resources/Textures/Decals/Overlays/greyscale.rsi/pavement_vertical.png
# Resources/Textures/Decals/Overlays/greyscale.rsi/pavement_vertical_checker_a.png
# Resources/Textures/Decals/Overlays/greyscale.rsi/pavement_vertical_checker_b.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/Objects/Materials/Sheets/glass.rsi/meta.json
# Resources/Textures/Structures/Furniture/chairs.rsi/meta.json
# Resources/Textures/Structures/Wallmounts/signs.rsi/meta.json
# Resources/Textures/Structures/Windows/directional.rsi/meta.json
2024-03-08 16:05:59 +03:00
LordCarve
c47391011d
Refactor AME to use ItemSlot for Fuel ( #25558 )
...
* 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.
2024-02-29 16:44:28 -05:00
Morb0
1048124655
Ignore server secrets prototypes on client build
2024-02-16 13:41:00 +03:00
Morb0
8a0a435965
Merge remote-tracking branch 'upstream/master' into upstream-sync
...
# Conflicts:
# Resources/Textures/Clothing/Mask/plaguedoctormask.rsi/meta.json
# Resources/Textures/Clothing/Uniforms/Jumpsuit/jester.rsi/meta.json
2024-01-05 00:55:19 +03:00
metalgearsloth
bf79acd127
Salvage magnet revamp ( #23119 )
...
* Generic offering window
* More work
* weh
* Parity
* Progression meter
* magnet
* rona
* PG asteroid work
* code red
* Asteroid spawnings
* clams
* a
* Marker fixes
* More fixes
* Workings of biome asteroids
* A
* Fix this loading code
* a
* Fix masking
* weh
* Fixes
* Magnet claiming
* toe
* petogue
* magnet
* Bunch of fixes
* Fix default
* Fixes
* asteroids
* Fix offerings
* Localisation and a bunch of fixes
* a
* Fixes
* Preliminary draft
* Announcement fixes
* Fixes and bump spawn rate
* Fix asteroid spawns and UI
* More fixes
* Expeditions fix
* fix
* Gravity
* Fix announcement rounding
* a
* Offset tweak
* sus
* jankass
* Fix merge
2024-01-04 14:25:32 +11:00
Morb0
34a8740819
Merge remote-tracking branch 'upstream/master' into upstream-sync
...
# Conflicts:
# .github/workflows/build-test-release.yml
# Content.Client/Humanoid/HumanoidAppearanceSystem.cs
# Content.Shared/Humanoid/HumanoidAppearanceComponent.cs
# Content.Shared/Humanoid/SharedHumanoidAppearanceSystem.cs
# Resources/Prototypes/Entities/Clothing/Shoes/boots.yml
2023-10-02 02:18:19 +03:00
Morb
195c402ef1
[Major] Moving out Queue, Verifications and Sponsors ( #1435 )
2023-10-01 14:59:40 +03:00
Miro Kavaliou
c06586f942
Added a toggle fullscreen button (default F11) ( #20272 )
...
* Added a toggle fullscreen button (default F11)
* Removed un-needed comments
* Review Requested Changes
* Fixed Acidental Spacing Change
* bwoink, removed extraneous code
* nothing, litterally
2023-09-28 18:55:10 -05:00
Morb
5efb0c328f
Cleanup TTS & fix voice preview ( #1458 )
2023-09-27 20:18:18 +03:00
Morb0
58ef40767e
Merge remote-tracking branch 'upstream/master' into upstream-sync2
...
# Conflicts:
# Content.Client/Entry/EntryPoint.cs
# Content.Client/Preferences/ClientPreferencesManager.cs
# Content.Server/GameTicking/Rules/NukeopsRuleSystem.cs
# Resources/Prototypes/Entities/Clothing/Shoes/boots.yml
# Resources/Prototypes/Entities/Mobs/Species/base.yml
2023-09-19 11:41:15 +03:00
c4llv07e
649cd34edc
Fix hud theme selection ( #19106 )
...
* Fix hud theme selection
Signed-off-by: c4llv07e <kseandi@gmail.com >
* Remove iterator indexing in the theme configuration
Signed-off-by: c4llv07e <kseandi@gmail.com >
---------
Signed-off-by: c4llv07e <kseandi@gmail.com >
2023-09-14 22:05:55 -04:00
Morb0
5a6058666e
Merge remote-tracking branch 'upstream/master' into upstream-sync
...
# Conflicts:
# Content.Client/Entry/EntryPoint.cs
# Content.Server/Chat/Managers/ChatManager.cs
# Resources/Textures/Tiles/dark_mono.png
# Resources/Textures/Tiles/steel_mono.png
# Resources/Textures/Tiles/white_mono.png
2023-08-31 20:55:00 +03:00
DrSmugleaf
98b49b8907
Remove redundant prototype ignores ( #19683 )
2023-08-30 21:01:13 -07:00
Morb0
676272809d
Merge remote-tracking branch 'upstream/master' into upstream-sync
2023-08-08 12:54:45 +03:00
metalgearsloth
3b1e6d30e7
Remove GCQueue ( #18820 )
2023-08-07 11:27:46 -06:00
faint
5828dca50b
Merge remote-tracking branch 'wizards/master' into upstream-sync
...
# Conflicts:
# Content.Server/Nuke/NukeSystem.cs
# Content.Server/Xenoarchaeology/XenoArtifacts/ArtifactSystem.cs
# Resources/Prototypes/Catalog/VendingMachines/Inventories/games.yml
# Resources/Prototypes/Entities/Mobs/Player/human.yml
# Resources/Prototypes/Roles/Jobs/Cargo/salvage_specialist.yml
# Resources/Prototypes/Roles/Jobs/Civilian/mime.yml
# Resources/Prototypes/Roles/Jobs/Engineering/atmospheric_technician.yml
# Resources/Prototypes/Roles/Jobs/Engineering/station_engineer.yml
# Resources/Prototypes/Roles/Jobs/Engineering/technical_assistant.yml
# Resources/Prototypes/Roles/Jobs/Medical/chemist.yml
# Resources/Prototypes/Roles/Jobs/Medical/medical_doctor.yml
# Resources/Prototypes/Roles/Jobs/Medical/medical_intern.yml
# Resources/Prototypes/Roles/Jobs/Science/research_assistant.yml
# Resources/Prototypes/Roles/Jobs/Science/scientist.yml
# Resources/Prototypes/Roles/Jobs/Security/detective.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/Prototypes/secret_weights.yml
# Resources/Textures/Objects/Misc/bureaucracy.rsi/meta.json
# Resources/Textures/Objects/Misc/bureaucracy.rsi/stamp-cap.png
# Resources/Textures/Objects/Misc/bureaucracy.rsi/stamp-ce.png
# Resources/Textures/Objects/Misc/bureaucracy.rsi/stamp-cent.png
# Resources/Textures/Objects/Misc/bureaucracy.rsi/stamp-chaplain.png
# Resources/Textures/Objects/Misc/bureaucracy.rsi/stamp-clown.png
# Resources/Textures/Objects/Misc/bureaucracy.rsi/stamp-cmo.png
# Resources/Textures/Objects/Misc/bureaucracy.rsi/stamp-deny.png
# Resources/Textures/Objects/Misc/bureaucracy.rsi/stamp-hop.png
# Resources/Textures/Objects/Misc/bureaucracy.rsi/stamp-hos.png
# Resources/Textures/Objects/Misc/bureaucracy.rsi/stamp-iaa.png
# Resources/Textures/Objects/Misc/bureaucracy.rsi/stamp-mime.png
# Resources/Textures/Objects/Misc/bureaucracy.rsi/stamp-qm.png
# Resources/Textures/Objects/Misc/bureaucracy.rsi/stamp-rd.png
# Resources/Textures/Objects/Misc/bureaucracy.rsi/stamp-syndicate.png
# Resources/Textures/Objects/Misc/bureaucracy.rsi/stamp-warden.png
2023-07-21 16:32:31 +03:00
Leon Friedrich
541eb417e3
Rename Faction to NpcFaction ( #18079 )
2023-07-17 13:51:52 +10:00
Morb0
82b4572421
Merge remote-tracking branch 'upstream/master' into upstream-sync
...
# Conflicts:
# Content.Shared/Chat/SharedChatSystem.cs
# Resources/Prototypes/Entities/Clothing/Head/hardsuit-helmets.yml
# Resources/ServerInfo/Guidebook/Engineering/AME.xml
# Resources/ServerInfo/Guidebook/Science/Xenoarchaeology.xml
# Resources/Textures/Interface/Misc/job_icons.rsi/meta.json
2023-06-28 16:02:06 +03:00
TemporalOroboros
d9de405859
ECS AME ( #16779 )
2023-06-28 08:02:06 -04:00
faint
44dbc63ebc
Merge remote-tracking branch 'wizards/master' into upstream-sync
...
# Conflicts:
# Resources/Prototypes/Catalog/VendingMachines/Inventories/lawdrobe.yml
# Resources/Prototypes/Roles/Jobs/Cargo/cargo_technician.yml
# Resources/Prototypes/Roles/Jobs/Cargo/quartermaster.yml
# Resources/Prototypes/Roles/Jobs/Cargo/salvage_specialist.yml
# Resources/ServerInfo/Guidebook/Controls/Controls.xml
# Resources/ServerInfo/Guidebook/Controls/Radio.xml
# Resources/ServerInfo/Guidebook/Engineering/AME.xml
# Resources/ServerInfo/Guidebook/Engineering/Fires.xml
# Resources/ServerInfo/Guidebook/Engineering/Singularity.xml
# Resources/ServerInfo/Guidebook/Jobs.xml
# Resources/ServerInfo/Guidebook/Science/Science.xml
# Resources/ServerInfo/Guidebook/Security/DNA.xml
# Resources/ServerInfo/Guidebook/Security/Security.xml
# Resources/ServerInfo/Guidebook/SpaceStation14.xml
# Resources/ServerInfo/Guidebook/Survival.xml
# Resources/Textures/Clothing/Uniforms/Jumpskirt/cargotech.rsi/equipped-INNERCLOTHING.png
# Resources/Textures/Clothing/Uniforms/Jumpskirt/cargotech.rsi/icon.png
# Resources/Textures/Clothing/Uniforms/Jumpskirt/qm.rsi/equipped-INNERCLOTHING.png
# Resources/Textures/Clothing/Uniforms/Jumpskirt/qm.rsi/icon.png
# Resources/Textures/Clothing/Uniforms/Jumpsuit/cargotech.rsi/equipped-INNERCLOTHING.png
# Resources/Textures/Clothing/Uniforms/Jumpsuit/cargotech.rsi/icon.png
# Resources/Textures/Clothing/Uniforms/Jumpsuit/qm.rsi/equipped-INNERCLOTHING.png
# Resources/Textures/Clothing/Uniforms/Jumpsuit/qm.rsi/icon.png
# Resources/Textures/Clothing/Uniforms/Jumpsuit/salvage.rsi/equipped-INNERCLOTHING.png
# Resources/Textures/Clothing/Uniforms/Jumpsuit/salvage.rsi/icon.png
2023-06-26 17:34:49 +03:00
Pieter-Jan Briers
bbd8ce8885
Replays: final boss ( #17621 )
...
* Replays: final boss
* Undo formatting change in EntryPoint
2023-06-24 18:56:33 -05:00
Morb0
636bea81df
Merge remote-tracking branch 'upstream/master' into upstream-sync
...
# Conflicts:
# .github/CODEOWNERS
# Content.Client/Entry/EntryPoint.cs
# Content.Server/Arcade/Components/SpaceVillainArcadeComponent.cs
# Content.Server/Zombies/ZombifyOnDeathSystem.cs
# Resources/Prototypes/Corvax/Roles/Jobs/Engineering/chief_engineer.yml
# Resources/Prototypes/Datasets/Names/cargo_shuttle.yml
# Resources/Prototypes/Datasets/tips.yml
# Resources/Prototypes/Entities/Clothing/Head/hardsuit-helmets.yml
# Resources/Prototypes/Entities/Mobs/Species/base.yml
# Resources/Prototypes/Entities/Structures/Doors/Airlocks/base_structureairlocks.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/Medical/chief_medical_officer.yml
# Resources/Prototypes/Roles/Jobs/Science/research_director.yml
# Resources/Prototypes/Roles/Jobs/Security/head_of_security.yml
# Resources/Prototypes/Voice/speech_emotes.yml
# Resources/ServerInfo/Guidebook/Science/Robotics.xml
# Resources/Textures/Clothing/Head/Bandanas/brown.rsi/meta.json
# Resources/Textures/Clothing/Head/Helmets/syndicate.rsi/equipped-HELMET.png
# Resources/Textures/Clothing/Head/Helmets/syndicate.rsi/headlight-equipped-HELMET.png
# Resources/Textures/Clothing/Head/Helmets/syndicate.rsi/headlight-inhand-left.png
# Resources/Textures/Clothing/Head/Helmets/syndicate.rsi/headlight-inhand-right.png
# Resources/Textures/Clothing/Head/Helmets/syndicate.rsi/headlight.png
# Resources/Textures/Clothing/Head/Helmets/syndicate.rsi/icon.png
# Resources/Textures/Clothing/Head/Helmets/syndicate.rsi/inhand-left.png
# Resources/Textures/Clothing/Head/Helmets/syndicate.rsi/inhand-right.png
# Resources/Textures/Clothing/Head/Helmets/syndicate.rsi/meta.json
# Resources/Textures/Clothing/Head/Helmets/syndicate.rsi/visorlit-equipped-HELMET.png
# Resources/Textures/Clothing/Head/Helmets/syndicate.rsi/visorlit-inhand-left.png
# Resources/Textures/Clothing/Head/Helmets/syndicate.rsi/visorlit-inhand-right.png
# Resources/Textures/Clothing/Head/Helmets/syndicate.rsi/visorlit.png
# Resources/Textures/Clothing/OuterClothing/Suits/syndicate.rsi/equipped-OUTERCLOTHING.png
# Resources/Textures/Clothing/OuterClothing/Suits/syndicate.rsi/icon.png
# Resources/Textures/Clothing/OuterClothing/Suits/syndicate.rsi/inhand-left.png
# Resources/Textures/Clothing/OuterClothing/Suits/syndicate.rsi/inhand-right.png
# Resources/Textures/Effects/speech.rsi/meta.json
# Resources/Textures/Objects/Misc/bureaucracy.rsi/meta.json
# Resources/Textures/Objects/Misc/stock_parts.rsi/adv_capacitor.png
# Resources/Textures/Objects/Misc/stock_parts.rsi/advanced_matter_bin.png
# Resources/Textures/Objects/Misc/stock_parts.rsi/bluespace_matter_bin.png
# Resources/Textures/Objects/Misc/stock_parts.rsi/capacitor.png
# Resources/Textures/Objects/Misc/stock_parts.rsi/femto_mani.png
# Resources/Textures/Objects/Misc/stock_parts.rsi/matter_bin.png
# Resources/Textures/Objects/Misc/stock_parts.rsi/micro_mani.png
# Resources/Textures/Objects/Misc/stock_parts.rsi/nano_mani.png
# Resources/Textures/Objects/Misc/stock_parts.rsi/pico_mani.png
# Resources/Textures/Objects/Misc/stock_parts.rsi/quadratic_capacitor.png
# Resources/Textures/Objects/Misc/stock_parts.rsi/super_capacitor.png
# Resources/Textures/Objects/Misc/stock_parts.rsi/super_matter_bin.png
# Resources/Textures/Structures/Furniture/chairs.rsi/meta.json
2023-06-19 21:06:28 +03:00
Leon Friedrich
2ef95a3225
Replay client ( #15001 )
2023-06-05 14:44:09 +10:00
faint
69ddbdd9f4
Merge remote-tracking branch 'wizards/master' into upstream-sync
...
# Conflicts:
# Content.Client/IoC/ClientContentIoC.cs
# Content.Client/Options/UI/Tabs/AudioTab.xaml.cs
# Resources/Prototypes/secret_weights.yml
2023-05-31 03:26:01 +03:00
metalgearsloth
be14380520
Role ban UI updates ( #16736 )
2023-05-27 14:22:22 +10:00
Morb0
c124b716a3
Merge remote-tracking branch 'upstream/master' into upstream-sync
...
# Conflicts:
# Content.Server/Traits/TraitSystem.cs
# Resources/Prototypes/Catalog/Fills/Lockers/heads.yml
# Resources/Prototypes/Catalog/Research/technologies.yml
# Resources/Prototypes/Entities/Objects/Materials/Sheets/other.yml
# Resources/Prototypes/Maps/aspid.yml
# Resources/Prototypes/Maps/bagel.yml
# Resources/Prototypes/Maps/barratry.yml
# Resources/Prototypes/Maps/box.yml
# Resources/Prototypes/Maps/cluster.yml
# Resources/Prototypes/Maps/fland.yml
# Resources/Prototypes/Maps/kettle.yml
# Resources/Prototypes/Maps/marathon.yml
# Resources/Prototypes/Maps/meta.yml
# Resources/Prototypes/Maps/moose.yml
# Resources/Prototypes/Maps/omega.yml
# Resources/Prototypes/Maps/origin.yml
# Resources/Prototypes/Maps/saltern.yml
# Resources/Prototypes/secret_weights.yml
# Resources/Textures/Objects/Weapons/Melee/cleaver.rsi/inhand-left.png
# Resources/Textures/Objects/Weapons/Melee/cleaver.rsi/inhand-right.png
2023-05-20 13:51:12 +03:00
Leon Friedrich
be0d22ad5e
Move upload commands to engine ( #16582 )
2023-05-20 11:53:09 +10:00
Moony
e91fc652a3
Dynamic space world generation and debris. ( #15120 )
...
* World generation (squash)
* Test fixes.
* command
* o
* Access cleanup.
* Documentation touchups.
* Use a prototype serializer for BiomeSelectionComponent
* Struct enumerator in SimpleFloorPlanPopulatorSystem
* Safety margins around PoissonDiskSampler, cookie acquisition methodologies
* Struct enumerating PoissonDiskSampler; internal side
* Struct enumerating PoissonDiskSampler: Finish it
* Update WorldgenConfigSystem.cs
awa
---------
Co-authored-by: moonheart08 <moonheart08@users.noreply.github.com >
Co-authored-by: 20kdc <asdd2808@gmail.com >
2023-05-16 06:36:45 -05:00
