Morb0
1b513f0c1a
Merge remote-tracking branch 'upstream/master' into upstream-sync
...
# Conflicts:
# .github/workflows/publish.yml
# Content.Server/Chat/Managers/ChatManager.cs
# Content.Server/Chat/Systems/ChatSystem.cs
# Content.Server/GameTicking/GameTicker.RoundFlow.cs
# Content.Server/GameTicking/GameTicker.Spawning.cs
# Content.Server/GameTicking/Rules/NukeopsRuleSystem.cs
# Content.Server/Zombies/ZombieSystem.Transform.cs
# Resources/Prototypes/Entities/Objects/Weapons/Guns/Projectiles/projectiles.yml
# Resources/Prototypes/Maps/bagel.yml
# Resources/Prototypes/Maps/box.yml
# Resources/Prototypes/Maps/fland.yml
# Resources/Prototypes/Maps/marathon.yml
# Resources/Prototypes/Maps/meta.yml
# Resources/Prototypes/Roles/Jobs/Security/detective.yml
# Resources/Textures/Tiles/attributions.yml
2023-08-29 05:58:14 +03:00
DrSmugleaf
15c0211fb2
Refactor minds to be entities with components, make roles components ( #19591 )
...
Co-authored-by: ShadowCommander <10494922+ShadowCommander@users.noreply.github.com>
Co-authored-by: DrSmugleaf <DrSmugleaf@users.noreply.github.com>
2023-08-28 16:53:24 -07:00
DrSmugleaf
913c80db4a
Add round end Discord pings, discord webhook API ( #19468 )
2023-08-24 16:50:07 -05:00
Morb0
5277dceed2
Merge remote-tracking branch 'upstream/master' into upstream-sync
...
# Conflicts:
# .github/CODEOWNERS
# Content.Shared/Humanoid/Prototypes/SpeciesPrototype.cs
2023-08-24 22:01:46 +03:00
Moony
3d3c9e3348
Toolshed part 2 ( #18997 )
...
* fixe
* Save work.
* Rune-aware parser.
* oogh
* pass tests pass tests pass tests pass tests pass tests pass tests pass tests pass tests pass tests pass tests pass tests pass tests pass tests pass tests pass tests pass tests pass tests pass tests pass tests pass tests pass tests pass tests pass tests pass tests pass tests pass tests pass tests pass tests pass tests pass tests pass tests pass tests pass tests pass tests pass tests pass tests pass tests pass tests pass tests pass tests pass tests pass tests pass tests pass tests pass tests pass tests pass tests pass tests pass tests pass tests pass tests pass tests pass tests pass tests pass tests pass tests pass tests pass tests pass tests pass tests pass tests pass tests pass tests pass tests pass tests pass tests
* Publicizes a lot of common generic commands, so custom toolshed envs can include them.
* i think i might implode
* Tests.
* a
* b
* awa
---------
Co-authored-by: moonheart08 <moonheart08@users.noreply.github.com>
2023-08-23 16:03:41 -05:00
Morb0
afcb4ea5f3
Merge remote-tracking branch 'upstream/master' into upstream-sync
2023-08-03 02:32:11 +03:00
Moony
e2b22a4cd8
Toolshed ( #17895 )
...
* ogh
* i should save my work
* ogh
* hhcdfhjbghshbxdfhghshc
- lots of bugs in parsing still
- invocation is a stub
* expr parsing works
* awawa
* Saving work
* Improve APIs a bit all around, add shortcuts.
* awa
* awa
* AAAAAA
* save work
* Move shit to engine
* lord
* bql is kill
* forgot the fucking bike rack
* bql is kill for real
* pjb will kill me
* aughfhbdj
* adgddf
* gdsgvfvxshngfgh
* b
* hfsjhghj
* a
* tf you mean i have to document it
* follow C# standards
* Assorted cleanup and documentation pass, minor bugfix in ValueRefParser.
* Start porting old commands, remove that pesky prefix in favor of integrating with the shell.
* bw
* Fix valueref up a bit, improve autocomplete for it.
* awa
* fix tests
* git shut up
* Arithmetic commands.
* parse improvements
* Update engine.
---------
Co-authored-by: moonheart08 <moonheart08@users.noreply.github.com>
2023-08-02 16:09:08 -05: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
Riggle
579913b617
Better notes and bans ( #14228 )
...
Co-authored-by: Chief-Engineer <119664036+Chief-Engineer@users.noreply.github.com>
2023-07-21 13:38:52 +02: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
Morbo
1b79af1fc2
Merge remote-tracking branch 'upstream/master' into upstream-sync
...
# Conflicts:
# Content.Client/Changelog/ChangelogManager.cs
# Content.Client/Doors/AirlockVisualizer.cs
# Content.Client/Humanoid/SingleMarkingPicker.xaml.cs
# Resources/Prototypes/Entities/Clothing/Shoes/boots.yml
# Resources/Prototypes/Entities/Structures/Doors/Airlocks/base_structureairlocks.yml
# Resources/Prototypes/Entities/Structures/Doors/Firelocks/firelock.yml
2023-04-23 16:02:09 +03:00
metalgearsloth
122350f19c
Salvage expeditions ( #12745 )
2023-04-20 10:43:13 +10:00
Morb
680b8e2e03
Discord linking ( #963 )
2023-04-07 03:25:38 -07:00
Morbo
82a466f4ff
Merge remote-tracking branch 'upstream/master' into upstream-sync
...
# Conflicts:
# Content.Client/Preferences/UI/HumanoidProfileEditor.xaml.cs
# Content.Shared/Humanoid/HumanoidAppearanceComponent.cs
# Content.Shared/Humanoid/HumanoidCharacterAppearance.cs
# Resources/Audio/Announcements/license.txt
# Resources/Prototypes/Entities/Mobs/Customization/Markings/cat_parts.yml
# Resources/Textures/Objects/Storage/boxes.rsi/meta.json
2023-03-07 18:54:29 +03:00
Leon Friedrich
b148bebd60
Equipment verbs & admin inventory access. ( #14315 )
2023-03-06 04:12:08 +11:00
Morb
fd9c06a458
TTS (Text-To-Speech) ( #618 )
2023-01-10 18:01:20 -08:00
Morb
37451fc974
Revert "Join min playtime ( #604 )" ( #615 )
2022-12-03 05:14:08 -08:00
Morbo
612d79c8fa
Merge remote-tracking branch 'upstream/master' into upstream-sync
...
# Conflicts:
# Content.Client/Links/UILinks.cs
# Content.Server/Entry/EntryPoint.cs
# Content.Server/IoC/ServerContentIoC.cs
# Content.Shared/CCVar/CCVars.cs
# Resources/Textures/Clothing/Head/Hardhats/blue.rsi/icon.png
# Resources/Textures/Clothing/Head/Hardhats/blue.rsi/off-equipped-HELMET.png
# Resources/Textures/Clothing/Head/Hardhats/blue.rsi/off-inhand-left.png
# Resources/Textures/Clothing/Head/Hardhats/blue.rsi/off-inhand-right.png
# Resources/Textures/Clothing/Head/Hardhats/blue.rsi/on-equipped-HELMET.png
# Resources/Textures/Clothing/Head/Hardhats/blue.rsi/on-inhand-left.png
# Resources/Textures/Clothing/Head/Hardhats/blue.rsi/on-inhand-right.png
# Resources/Textures/Clothing/Head/Hardhats/orange.rsi/icon.png
# Resources/Textures/Clothing/Head/Hardhats/orange.rsi/light-icon.png
# Resources/Textures/Clothing/Head/Hardhats/orange.rsi/off-equipped-HELMET.png
# Resources/Textures/Clothing/Head/Hardhats/orange.rsi/off-inhand-left.png
# Resources/Textures/Clothing/Head/Hardhats/orange.rsi/off-inhand-right.png
# Resources/Textures/Clothing/Head/Hardhats/orange.rsi/on-equipped-HELMET.png
# Resources/Textures/Clothing/Head/Hardhats/orange.rsi/on-inhand-left.png
# Resources/Textures/Clothing/Head/Hardhats/orange.rsi/on-inhand-right.png
# Resources/Textures/Clothing/Head/Hardhats/red.rsi/icon.png
# Resources/Textures/Clothing/Head/Hardhats/red.rsi/off-equipped-HELMET.png
# Resources/Textures/Clothing/Head/Hardhats/red.rsi/off-inhand-left.png
# Resources/Textures/Clothing/Head/Hardhats/red.rsi/off-inhand-right.png
# Resources/Textures/Clothing/Head/Hardhats/red.rsi/on-equipped-HELMET.png
# Resources/Textures/Clothing/Head/Hardhats/red.rsi/on-inhand-left.png
# Resources/Textures/Clothing/Head/Hardhats/red.rsi/on-inhand-right.png
# Resources/Textures/Clothing/Head/Hardhats/white.rsi/icon.png
# Resources/Textures/Clothing/Head/Hardhats/white.rsi/light-icon.png
# Resources/Textures/Clothing/Head/Hardhats/white.rsi/off-equipped-HELMET.png
# Resources/Textures/Clothing/Head/Hardhats/white.rsi/off-inhand-left.png
# Resources/Textures/Clothing/Head/Hardhats/white.rsi/off-inhand-right.png
# Resources/Textures/Clothing/Head/Hardhats/white.rsi/on-equipped-HELMET.png
# Resources/Textures/Clothing/Head/Hardhats/white.rsi/on-inhand-left.png
# Resources/Textures/Clothing/Head/Hardhats/white.rsi/on-inhand-right.png
# Resources/Textures/Clothing/Head/Hardhats/yellow.rsi/icon.png
# Resources/Textures/Clothing/Head/Hardhats/yellow.rsi/off-equipped-HELMET.png
# Resources/Textures/Clothing/Head/Hardhats/yellow.rsi/off-inhand-left.png
# Resources/Textures/Clothing/Head/Hardhats/yellow.rsi/off-inhand-right.png
# Resources/Textures/Clothing/Head/Hardhats/yellow.rsi/on-equipped-HELMET.png
# Resources/Textures/Clothing/Head/Hardhats/yellow.rsi/on-inhand-left.png
# Resources/Textures/Clothing/Head/Hardhats/yellow.rsi/on-inhand-right.png
# Resources/Textures/Clothing/OuterClothing/Suits/fire.rsi/equipped-OUTERCLOTHING.png
# Resources/Textures/Clothing/Uniforms/Jumpsuit/atmos.rsi/equipped-INNERCLOTHING.png
# Resources/Textures/Clothing/Uniforms/Jumpsuit/ce.rsi/equipped-INNERCLOTHING.png
# Resources/Textures/Clothing/Uniforms/Jumpsuit/engineering.rsi/equipped-INNERCLOTHING.png
# Resources/Textures/Clothing/Uniforms/Jumpsuit/engineering_hazard.rsi/equipped-INNERCLOTHING.png
2022-12-03 07:09:10 +03:00
Pieter-Jan Briers
a6045e4538
Launcher info links. ( #12781 )
2022-12-02 17:23:43 -08:00
Morb
2409fea950
Join min playtime ( #604 )
2022-11-29 20:15:56 -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
57d8a459bb
Merge remote-tracking branch 'upstream/master' into upstream-sync
...
# Conflicts:
# Content.Shared/Humanoid/Sex.cs
# Resources/Prototypes/Roles/Jobs/Civilian/librarian.yml
2022-10-16 02:03:26 +03:00
Vera Aguilera Puerto
ebff854c55
Removes unused "ModuleManager" ( #11918 )
2022-10-14 13:11:19 -07:00
Morb
7ae33c14b3
Sponsor cat marking reward ( #437 )
2022-10-09 17:59:41 -07:00
Morb
b49688dc01
Награды спонсорам ( #402 )
2022-09-19 11:16:58 -07:00
metalgearsloth
0286b88388
NPC refactor ( #10122 )
...
Co-authored-by: metalgearsloth <metalgearsloth@gmail.com>
2022-09-06 00:28:23 +10:00
Pieter-Jan Briers
e852ada6c8
Play time tracking: Job timers 3: more titles: when the ( #9978 )
...
Co-authored-by: Veritius <veritiusgaming@gmail.com>
Co-authored-by: metalgearsloth <comedian_vs_clown@hotmail.com>
2022-08-07 16:00:42 +10:00
metalgearsloth
aad6a22a6a
ECS NPCs ( #9941 )
...
* ECS
* A
* parity
* Remove dummy update
* abs
* thanks rider
2022-07-25 14:57:33 +10:00
Pieter-Jan Briers
5f9f319d5a
Fix server update restarts when server paused. ( #8509 )
2022-05-30 01:09:50 -07:00
wrexbe
1e0babbd50
Make AdminLogsSystem an IoC manager ( #8492 )
...
* Make log not entity system
* Fixes
2022-05-28 23:41:17 -07:00
Pieter-Jan Briers
ebfe5e888f
Kick mines (real) ( #8056 )
...
Co-authored-by: metalgearsloth <comedian_vs_clown@hotmail.com>
2022-05-18 14:07:35 +10:00
wrexbe
bc68ac96dd
Cleanup the namespaces ( #8132 )
2022-05-13 17:59:03 +10:00
DrSmugleaf
5227d1a023
Admin notes ( #7259 )
...
Co-authored-by: metalgearsloth <31366439+metalgearsloth@users.noreply.github.com>
2022-04-16 20:57:50 +02:00
Vera Aguilera Puerto
eb54f4b224
Adds Network Resource Uploading for admins. ( #6904 )
...
Co-authored-by: Pieter-Jan Briers <pieterjan.briers@gmail.com>
Co-authored-by: Pieter-Jan Briers <pieterjan.briers+git@gmail.com>
2022-03-26 12:46:37 +01:00
Leon Friedrich
ff7d4ed9f6
Patched Actions Rework ( #6899 )
...
* Rejig Actions
* fix merge errors
* lambda-b-gon
* fix PAI, add innate actions
* Revert "fix PAI, add innate actions"
This reverts commit 4b501ac083e979e31ebd98d7b98077e0dbdd344b.
* Just fix by making nullable.
if only require: true actually did something somehow.
* Make AddActions() ensure an actions component
and misc comments
* misc cleanup
* Limit range even when not checking for obstructions
* remove old guardian code
* rename function and make EntityUid nullable
* fix magboot bug
* fix action search menu
* make targeting toggle all equivalent actions
* fix combat popups (enabling <-> disabling)
* fix networking
* Allow action locking
* prevent telepathy
2022-02-25 23:24:08 -06:00
Leon Friedrich
49ae383f06
Revert "Actions Rework" ( #6888 )
2022-02-25 16:55:18 +11:00
Leon Friedrich
5ac5dd6a64
Actions Rework ( #6791 )
...
* Rejig Actions
* fix merge errors
* lambda-b-gon
* fix PAI, add innate actions
* Revert "fix PAI, add innate actions"
This reverts commit 4b501ac083e979e31ebd98d7b98077e0dbdd344b.
* Just fix by making nullable.
if only require: true actually did something somehow.
* Make AddActions() ensure an actions component
and misc comments
* misc cleanup
* Limit range even when not checking for obstructions
* remove old guardian code
* rename function and make EntityUid nullable
* fix magboot bug
* fix action search menu
* make targeting toggle all equivalent actions
* fix combat popups (enabling <-> disabling)
2022-02-24 22:12:29 -06:00
metalgearsloth
bee627ac6a
Turn SandboxManager into a system ( #6867 )
2022-02-23 17:00:30 -07:00
ShadowCommander
4825142210
Role bans ( #6703 )
2022-02-21 23:11:39 +01:00
Acruid
5b1cd2dd96
ECSatize AlertsSystem ( #5559 )
2022-01-05 19:19:23 +11:00
ShadowCommander
ca8d673fad
Add ShowRules commmand ( #5908 )
2021-12-29 18:31:18 +11:00
Moony
caad34eecb
Mid-game prototype loading for game admins ( #5675 )
2021-12-11 16:28:16 -07:00
Moony
4cd09c23f5
Removes smilies from existence. (kinda) ( #5649 )
2021-12-03 01:49:19 +01:00
Moony
eb6d24abd0
Makes map vote and roundstart smart about player count. ( #5418 )
...
* Makes map vote and roundstart smart about player count.
No more Saltern with 30 players, or Knight Ship with 50.
* a typo
* Address reviews.
* Localized.
2021-11-20 11:32:07 -07:00
