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
Morb0
5e8d55caf8
Merge remote-tracking branch 'upstream/master' into upstream-sync
...
# Conflicts:
# Resources/Prototypes/Maps/saltern.yml
# Resources/ServerInfo/Guidebook/Science/Xenoarchaeology.xml
2023-05-13 10:39:34 +03:00
Leon Friedrich
f1a81d9a8d
Move StylesheetManager initialization to PostInit() ( #16352 )
2023-05-13 00:02:25 +10:00
Morb0
45cde15648
Merge remote-tracking branch 'upstream/master' into upstream-sync
2023-05-07 12:51:16 +03:00
metalgearsloth
ca07522c03
NPC utility queries ( #15843 )
2023-05-01 14:57:11 -04:00
Morbo
47d49bf035
Merge remote-tracking branch 'upstream/master' into upstream-sync
...
# Conflicts:
# Content.Server/Zombies/ZombifyOnDeathSystem.cs
2023-04-11 22:36:33 +03:00
DrSmugleaf
cf19015086
Remove spawn point component references ( #15222 )
2023-04-09 09:52:52 +10:00
Morb
680b8e2e03
Discord linking ( #963 )
2023-04-07 03:25:38 -07:00
Morbo
a33dfe1de8
Merge remote-tracking branch 'upstream/master' into upstream-sync
...
# Conflicts:
# .github/ISSUE_TEMPLATE/config.yml
2023-03-11 07:49:26 +03:00
metalgearsloth
6157dfa3c0
Salvage dungeons ( #14520 )
2023-03-10 16:41:22 +11:00
Morbo
35ea494981
Merge remote-tracking branch 'upstream/master' into upstream-sync
...
# Conflicts:
# Content.Client/Entry/EntryPoint.cs
# Content.Client/IoC/ClientContentIoC.cs
# Content.Server/Doors/Components/AirlockComponent.cs
# Content.Server/Fax/FaxMachineComponent.cs
# Resources/Textures/Objects/Misc/bureaucracy.rsi/meta.json
2023-01-17 22:57:53 +03:00
Leon Friedrich
22d72f56b5
Guidebook Revival ( #13320 )
...
* Fix some bugs in stations and do a little cleanup.
* Begin backporting the guidebook.
* wow that's a lot of work.
* More work, gives the monkey some more interactions.
* disco monkye.
* monky
* jobs entry.
* more writing.
* disco
* im being harassed
* fix spacing.
* i hate writing.
* Update Resources/Prototypes/Entities/Mobs/NPCs/animals.yml
Co-authored-by: Leon Friedrich <60421075+ElectroJr@users.noreply.github.com>
* builds again
* a
* pilfer changes from AL
* fix and remove unused code
* pilfer actual guide changes from AL
* localization
* more error logs & safety checks
* replace controls button with command
* add test
* todos
* pidgin parsing
* remove old parser
* Move files and change tree sorting
* add localization and public methods.
* Add help component/verb
* rename ITag to IDocumentTag
* Fix yml and tweak tooltips
* autoclose tooltip
* Split container
* Fancier-tree
* Hover color
* txt to xml
* oops
* Curse you hidden merge conflicts
* Rename parsing manager
* Stricter arg parsing
tag args must now be of the form key="value"
* Change default args
* Moar tests
* nullable enable
* Even fancier tree
* extremely fancy trees
* better indent icons
* stricter xml and subheadings
* tweak embed margin
* Fix parsing bugs
* quick fixes.
* spain.
* ogh
* hn bmvdsyc
Co-authored-by: moonheart08 <moonheart08@users.noreply.github.com>
2023-01-16 02:42:22 -06:00
Morb
fd9c06a458
TTS (Text-To-Speech) ( #618 )
2023-01-10 18:01:20 -08:00
Morb
af45fa7478
Simple loadout ( #668 )
2022-12-23 09:17:34 -08:00
Morbo
bdd758ea49
Merge remote-tracking branch 'upstream/master' into upstream-sync
...
# Conflicts:
# .github/CODEOWNERS
# Content.Client/Entry/EntryPoint.cs
# Resources/Prototypes/Roles/Jobs/Civilian/librarian.yml
# Resources/Textures/Structures/Machines/microwave.rsi/meta.json
# Resources/Textures/Structures/Machines/microwave.rsi/mw1.png
# Resources/Textures/Structures/Wallmounts/air_monitors.rsi/meta.json
2022-12-21 20:29:22 +03:00
Pieter-Jan Briers
584921b423
Move NetBufferSize override hack to integration tests specifically ( #12795 )
2022-12-20 14:25:03 -08:00
Morb
6ad4a10b29
Repository cleanup ( #631 )
2022-12-10 12:10:27 -08:00
Morb
fb3f24652e
Revert "Revert "Server join queue ( #583 )"" ( #602 )
2022-11-29 06:41:12 -08:00
Morb
e025a5ded1
Rework sponsor markings ( #593 )
2022-11-27 08:13:01 -08:00
Morb
97973e2ed9
Revert "Server join queue ( #583 )"
...
This reverts commit 84605eacb8
2022-11-27 04:09:27 -08:00
Morb
84605eacb8
Server join queue ( #583 )
2022-11-25 23:38:46 -08:00
Morb
9c9af7567e
Sponsors markings ( #552 )
2022-11-15 11:22:06 -08:00
Morbo
06399f4e51
Merge remote-tracking branch 'upstream/master' into upstream-sync
...
# Conflicts:
# Resources/Textures/Objects/Tools/welder.rsi/icon.png
# Resources/Textures/Objects/Tools/welder_experimental.rsi/icon.png
# Resources/Textures/Objects/Tools/welder_experimental.rsi/welder_flame.png
# Resources/Textures/Objects/Tools/welder_industrial.rsi/welder_flame.png
# Resources/Textures/Objects/Tools/welder_industrialadv.rsi/welder_flame.png
2022-11-02 04:55:26 +03:00
Rane
88186f2106
Map pool cvar ( #12313 )
...
* it just works
* nuke votable
* whoops
2022-11-01 20:17:35 -05:00
Morbo
efa9d6561f
Merge remote-tracking branch 'upstream/master' into upstream-sync
...
# Conflicts:
# .github/workflows/build-docfx.yml
2022-10-31 15:36:01 +03:00
Leon Friedrich
f0d02f032a
Content changes for broadphase rejig ( #12290 )
2022-10-31 10:05:34 +11:00
Morbo
8ffba84896
Merge remote-tracking branch 'upstream/master' into upstream-sync
2022-10-21 19:51:57 +03:00
Kara
169ba3106b
Fix #12075 ( #12118 )
2022-10-21 01:54:18 -07:00
Morbo
ae8cb2688c
Merge remote-tracking branch 'upstream/master' into upstream-sync
2022-10-14 07:21:01 +03:00
Jezithyr
571dd4e6d5
Hud refactor ( #7202 )
...
Co-authored-by: DrSmugleaf <DrSmugleaf@users.noreply.github.com>
Co-authored-by: Jezithyr <jmaster9999@gmail.com>
Co-authored-by: Jezithyr <Jezithyr@gmail.com>
Co-authored-by: Visne <39844191+Visne@users.noreply.github.com>
Co-authored-by: wrexbe <wrexbe@protonmail.com>
Co-authored-by: wrexbe <81056464+wrexbe@users.noreply.github.com>
2022-10-12 10:16:23 +02:00
Alex Evgrashin
7d882f22c9
Radiation rework ( #10970 )
2022-10-11 14:09:10 +11:00
Morbo
ee06a9e19a
Merge remote-tracking branch 'upstream/master' into upstream-sync
...
# Conflicts:
# Content.Shared/Interaction/SharedInteractionSystem.cs
# Resources/Locale/en-US/job/job-names.ftl
# Resources/Prototypes/Datasets/Names/revenant.yml
# Resources/Prototypes/Entities/Structures/Machines/gravity_generator.yml
2022-10-07 18:01:36 +03:00
0x6273
0c24f8b69b
ReagentDispenser ECS ( #11418 )
2022-10-03 17:57:32 -07:00
Morbo
759042cf98
Merge remote-tracking branch 'upstream/master' into upstream-sync
2022-09-17 05:10:04 +03:00
