Morb0
d37412672c
Fix
2024-04-26 11:57:52 +03:00
Morb0
3e015c6f67
Merge remote-tracking branch 'refs/remotes/wizards/master' into upstream-sync
...
# Conflicts:
# Content.Server/GameTicking/Rules/NukeopsRuleSystem.cs
# Resources/Prototypes/Catalog/VendingMachines/Inventories/detdrobe.yml
# Resources/Prototypes/Entities/Clothing/Masks/specific.yml
# Resources/Prototypes/Entities/Mobs/NPCs/slimes.yml
# Resources/Prototypes/GameRules/midround.yml
# Resources/Prototypes/Roles/Jobs/Security/head_of_security.yml
# Resources/Prototypes/Roles/Jobs/Security/warden.yml
# Resources/Prototypes/StatusEffects/health.yml
# Resources/Prototypes/StatusIcon/antag.yml
# Resources/ServerInfo/Guidebook/Antagonist/Antagonists.xml
# Resources/ServerInfo/Guidebook/Antagonist/SpaceNinja.xml
# Resources/ServerInfo/Guidebook/Engineering/AME.xml
# Resources/ServerInfo/Guidebook/Engineering/AccessConfigurator.xml
# Resources/ServerInfo/Guidebook/Engineering/AirlockSecurity.xml
# Resources/ServerInfo/Guidebook/Engineering/Atmospherics.xml
# Resources/ServerInfo/Guidebook/Engineering/Construction.xml
# Resources/ServerInfo/Guidebook/Engineering/Engineering.xml
# Resources/ServerInfo/Guidebook/Engineering/Fires.xml
# Resources/ServerInfo/Guidebook/Engineering/NetworkConfigurator.xml
# Resources/ServerInfo/Guidebook/Engineering/Networking.xml
# Resources/ServerInfo/Guidebook/Engineering/PortableGenerator.xml
# Resources/ServerInfo/Guidebook/Engineering/Power.xml
# Resources/ServerInfo/Guidebook/Engineering/Shuttlecraft.xml
# Resources/ServerInfo/Guidebook/Engineering/Singularity.xml
# Resources/ServerInfo/Guidebook/Engineering/TEG.xml
# Resources/ServerInfo/Guidebook/Science/ArtifactReports.xml
# Resources/ServerInfo/Guidebook/Science/TraversalDistorter.xml
# Resources/ServerInfo/Guidebook/Science/Xenoarchaeology.xml
# Resources/ServerInfo/Guidebook/Security/Forensics.xml
# Resources/Textures/Objects/Specific/Hydroponics/chili.rsi/produce.png
2024-04-26 11:19:50 +03:00
Nemanja
a0b3a6b679
fix antag bugs ( #27319 )
...
* fix antag bugs
* Update NukeopsRuleComponent.cs
2024-04-25 17:25:57 -07:00
Nemanja
161fd6c83c
Mega Antag Refactor ( #25786 )
...
* Mega Antag Refactor
* last minute delta save
* more workshopping
* more shit
* ok tested this for once
* okkkkk sure
* generic delays for starting rules
* well darn
* nukies partially
* ouagh
* ballin' faded and smonkin wed
* obliterated the diff
* Spread my arms and soak up congratulations
* I've got plenty of love, but nothing to show for it
* but there’s too much sunlight
Shining on my laptop monitor, so I
Can’t see anything with any amount of clarity
* ok this junk
* OOK!
* fubar
* most of sloth's review
* oh boy
* eek
* hell yea!
* ASDFJASDJFvsakcvjkzjnhhhyh
2024-04-25 11:31:45 +10:00
Arthur Asimov
0b621a7b7e
Merge remote-tracking branch 'refs/remotes/wizards/master' into upstream-sync
...
# Conflicts:
# Content.Client/Preferences/ClientPreferencesManager.cs
# Content.Client/Preferences/UI/CharacterSetupGui.xaml.cs
# Content.Client/Preferences/UI/HumanoidProfileEditor.xaml.cs
# Content.Server/Preferences/Managers/ServerPreferencesManager.cs
# Content.Server/Station/Systems/StationSpawningSystem.cs
# Content.Shared/Preferences/HumanoidCharacterProfile.cs
# Content.Shared/Preferences/ICharacterProfile.cs
# Resources/Prototypes/Roles/Jobs/Security/head_of_security.yml
# Resources/Prototypes/Roles/Jobs/Security/security_cadet.yml
# Resources/Prototypes/Roles/Jobs/Security/security_officer.yml
# Resources/Prototypes/Roles/Jobs/Security/warden.yml
# Resources/Prototypes/Roles/Jobs/Wildcards/psychologist.yml
# Resources/Textures/Clothing/Hands/Gloves/Color/blue.rsi/inhand-left.png
# Resources/Textures/Clothing/Hands/Gloves/Color/blue.rsi/inhand-right.png
# Resources/Textures/Clothing/Hands/Gloves/Color/brown.rsi/icon.png
# Resources/Textures/Clothing/Hands/Gloves/Color/brown.rsi/inhand-left.png
# Resources/Textures/Clothing/Hands/Gloves/Color/brown.rsi/inhand-right.png
# Resources/Textures/Clothing/Hands/Gloves/Color/brown.rsi/meta.json
# Resources/Textures/Clothing/Hands/Gloves/Color/color.rsi/meta.json
# Resources/Textures/Clothing/Hands/Gloves/Color/gray.rsi/icon.png
# Resources/Textures/Clothing/Hands/Gloves/Color/gray.rsi/inhand-left.png
# Resources/Textures/Clothing/Hands/Gloves/Color/gray.rsi/inhand-right.png
# Resources/Textures/Clothing/Hands/Gloves/Color/gray.rsi/meta.json
# Resources/Textures/Clothing/Hands/Gloves/Color/green.rsi/equipped-HAND.png
# Resources/Textures/Clothing/Hands/Gloves/Color/green.rsi/icon.png
# Resources/Textures/Clothing/Hands/Gloves/Color/green.rsi/meta.json
# Resources/Textures/Clothing/Hands/Gloves/Color/lightbrown.rsi/icon.png
# Resources/Textures/Clothing/Hands/Gloves/Color/lightbrown.rsi/inhand-left.png
# Resources/Textures/Clothing/Hands/Gloves/Color/lightbrown.rsi/inhand-right.png
# Resources/Textures/Clothing/Hands/Gloves/Color/lightbrown.rsi/meta.json
# Resources/Textures/Clothing/Hands/Gloves/Color/orange.rsi/equipped-HAND.png
# Resources/Textures/Clothing/Hands/Gloves/Color/orange.rsi/icon.png
# Resources/Textures/Clothing/Hands/Gloves/Color/orange.rsi/inhand-left.png
# Resources/Textures/Clothing/Hands/Gloves/Color/orange.rsi/inhand-right.png
# Resources/Textures/Clothing/Hands/Gloves/Color/orange.rsi/meta.json
# Resources/Textures/Clothing/Hands/Gloves/Color/purple.rsi/equipped-HAND.png
# Resources/Textures/Clothing/Hands/Gloves/Color/purple.rsi/icon.png
# Resources/Textures/Clothing/Hands/Gloves/Color/purple.rsi/inhand-left.png
# Resources/Textures/Clothing/Hands/Gloves/Color/purple.rsi/inhand-right.png
# Resources/Textures/Clothing/Hands/Gloves/Color/purple.rsi/meta.json
# Resources/Textures/Clothing/Hands/Gloves/Color/red.rsi/equipped-HAND.png
# Resources/Textures/Clothing/Hands/Gloves/Color/red.rsi/icon.png
# Resources/Textures/Clothing/Hands/Gloves/Color/red.rsi/inhand-left.png
# Resources/Textures/Clothing/Hands/Gloves/Color/red.rsi/inhand-right.png
# Resources/Textures/Clothing/Hands/Gloves/Color/red.rsi/meta.json
# Resources/Textures/Clothing/Hands/Gloves/Color/white.rsi/icon.png
# Resources/Textures/Clothing/Hands/Gloves/Color/white.rsi/meta.json
# Resources/Textures/Clothing/Shoes/Color/black.rsi/meta.json
# Resources/Textures/Clothing/Shoes/Color/blue.rsi/meta.json
# Resources/Textures/Clothing/Shoes/Color/brown.rsi/meta.json
# Resources/Textures/Clothing/Shoes/Color/green.rsi/meta.json
# Resources/Textures/Clothing/Shoes/Color/orange.rsi/meta.json
# Resources/Textures/Clothing/Shoes/Color/purple.rsi/meta.json
# Resources/Textures/Clothing/Shoes/Color/red.rsi/meta.json
# Resources/Textures/Clothing/Shoes/Color/white.rsi/meta.json
# Resources/Textures/Clothing/Shoes/Color/yellow.rsi/meta.json
# Resources/Textures/Clothing/Uniforms/Jumpskirt/color.rsi/equipped-INNERCLOTHING-reptilian.png
# Resources/Textures/Clothing/Uniforms/Jumpskirt/color.rsi/meta.json
# Resources/Textures/Clothing/Uniforms/Jumpsuit/Color/black.rsi/meta.json
# Resources/Textures/Clothing/Uniforms/Jumpsuit/Color/blue.rsi/meta.json
# Resources/Textures/Clothing/Uniforms/Jumpsuit/Color/brown.rsi/meta.json
# Resources/Textures/Clothing/Uniforms/Jumpsuit/Color/darkblue.rsi/meta.json
# Resources/Textures/Clothing/Uniforms/Jumpsuit/Color/darkgreen.rsi/meta.json
# Resources/Textures/Clothing/Uniforms/Jumpsuit/Color/green.rsi/meta.json
# Resources/Textures/Clothing/Uniforms/Jumpsuit/Color/lightbrown.rsi/meta.json
# Resources/Textures/Clothing/Uniforms/Jumpsuit/Color/lightpurple.rsi/meta.json
# Resources/Textures/Clothing/Uniforms/Jumpsuit/Color/maroon.rsi/meta.json
# Resources/Textures/Clothing/Uniforms/Jumpsuit/Color/orange.rsi/meta.json
# Resources/Textures/Clothing/Uniforms/Jumpsuit/Color/pink.rsi/meta.json
# Resources/Textures/Clothing/Uniforms/Jumpsuit/Color/red.rsi/meta.json
# Resources/Textures/Clothing/Uniforms/Jumpsuit/Color/teal.rsi/meta.json
# Resources/Textures/Clothing/Uniforms/Jumpsuit/Color/white.rsi/meta.json
# Resources/Textures/Clothing/Uniforms/Jumpsuit/Color/yellow.rsi/meta.json
# Resources/Textures/Clothing/Uniforms/Jumpsuit/prisoner.rsi/meta.json
2024-04-17 11:57:44 +03:00
metalgearsloth
12766fe6e3
Loadouts redux ( #25715 )
...
* Loadouts redux
* Loadout window mockup
* More workout
* rent
* validation
* Developments
* bcs
* More cleanup
* Rebuild working
* Fix model and loading
* obsession
* efcore
* We got a stew goin
* Cleanup
* Optional + SeniorEngineering fix
* Fixes
* Update science.yml
* add
add
* Automatic naming
* Update nukeops
* Coming together
* Right now
* stargate
* rejig the UI
* weh
* Loadouts tweaks
* Merge conflicts + ordering fix
* yerba mate
* chocolat
* More updates
* Add multi-selection support
* test
h
* fikss
* a
* add tech assistant and hazard suit
* huh
* Latest changes
* add medical loadouts
* and science
* finish security loadouts
* cargo
* service done
* added wildcards
* add command
* Move restrictions
* Finalising
* Fix existing work
* Localise next batch
* clothing fix
* Fix storage names
* review
* the scooping room
* Test fixes
* Xamlify
* Xamlify this too
* Update Resources/Prototypes/Loadouts/Jobs/Medical/paramedic.yml
Co-authored-by: Mr. 27 <45323883+Dutch-VanDerLinde@users.noreply.github.com>
* Update Resources/Prototypes/Loadouts/loadout_groups.yml
Co-authored-by: Mr. 27 <45323883+Dutch-VanDerLinde@users.noreply.github.com>
* Update Resources/Prototypes/Loadouts/Jobs/Civilian/clown.yml
Co-authored-by: Mr. 27 <45323883+Dutch-VanDerLinde@users.noreply.github.com>
* Update Resources/Prototypes/Loadouts/Jobs/Civilian/clown.yml
Co-authored-by: Mr. 27 <45323883+Dutch-VanDerLinde@users.noreply.github.com>
* Update Resources/Prototypes/Loadouts/loadout_groups.yml
Co-authored-by: Mr. 27 <45323883+Dutch-VanDerLinde@users.noreply.github.com>
* Update Resources/Prototypes/Loadouts/Jobs/Security/detective.yml
Co-authored-by: Mr. 27 <45323883+Dutch-VanDerLinde@users.noreply.github.com>
* Update Resources/Prototypes/Loadouts/loadout_groups.yml
Co-authored-by: Mr. 27 <45323883+Dutch-VanDerLinde@users.noreply.github.com>
* ben
* Margins
---------
Co-authored-by: Firewatch <54725557+musicmanvr@users.noreply.github.com>
Co-authored-by: Mr. 27 <koolthunder019@gmail.com>
Co-authored-by: Mr. 27 <45323883+Dutch-VanDerLinde@users.noreply.github.com>
2024-04-16 22:57:43 +10:00
Morb0
860f045b08
Merge remote-tracking branch 'upstream/master' into upstream-sync
...
# Conflicts:
# Resources/Audio/Machines/attributions.yml
# Resources/Prototypes/Catalog/Fills/Books/bookshelf.yml
# Resources/Prototypes/Catalog/Fills/Lockers/security.yml
# Resources/Prototypes/Catalog/VendingMachines/Inventories/curadrobe.yml
# Resources/Prototypes/Catalog/VendingMachines/Inventories/lawdrobe.yml
# Resources/Prototypes/Entities/Objects/Specific/Medical/hypospray.yml
# Resources/Prototypes/Roles/Jobs/Security/security_officer.yml
# Resources/Prototypes/Roles/Jobs/Security/warden.yml
# Resources/Prototypes/Voice/speech_emotes.yml
# Resources/Textures/Clothing/OuterClothing/Coats/labcoat_cmo.rsi/open-inhand-left.png
# Resources/Textures/Clothing/OuterClothing/Coats/labcoat_cmo.rsi/open-inhand-right.png
# Resources/Textures/Objects/Magic/spellbooks.rsi/bookfireball.png
# Resources/Textures/Objects/Magic/spellbooks.rsi/bookforcewall.png
# Resources/Textures/Objects/Magic/spellbooks.rsi/bookknock.png
# Resources/Textures/Objects/Magic/spellbooks.rsi/meta.json
# Resources/Textures/Objects/Magic/spellbooks.rsi/spellbook.png
# Resources/Textures/Objects/Misc/books.rsi/book0.png
# Resources/Textures/Objects/Misc/books.rsi/book1.png
# Resources/Textures/Objects/Misc/books.rsi/book2.png
# Resources/Textures/Objects/Misc/books.rsi/book3.png
# Resources/Textures/Objects/Misc/books.rsi/book4.png
# Resources/Textures/Objects/Misc/books.rsi/book5.png
# Resources/Textures/Objects/Misc/books.rsi/book6.png
# Resources/Textures/Objects/Misc/books.rsi/book7.png
# Resources/Textures/Objects/Misc/books.rsi/book8.png
# Resources/Textures/Objects/Misc/books.rsi/book_bar.png
# Resources/Textures/Objects/Misc/books.rsi/book_boneworking.png
# Resources/Textures/Objects/Misc/books.rsi/book_borg.png
# Resources/Textures/Objects/Misc/books.rsi/book_chemistry.png
# Resources/Textures/Objects/Misc/books.rsi/book_cooking.png
# Resources/Textures/Objects/Misc/books.rsi/book_demonomicon.png
# Resources/Textures/Objects/Misc/books.rsi/book_detective.png
# Resources/Textures/Objects/Misc/books.rsi/book_engineering.png
# Resources/Textures/Objects/Misc/books.rsi/book_engineering2.png
# Resources/Textures/Objects/Misc/books.rsi/book_fish.png
# Resources/Textures/Objects/Misc/books.rsi/book_hacking.png
# Resources/Textures/Objects/Misc/books.rsi/book_hydroponics_pod_people.png
# Resources/Textures/Objects/Misc/books.rsi/book_infections.png
# Resources/Textures/Objects/Misc/books.rsi/book_nuclear.png
# Resources/Textures/Objects/Misc/books.rsi/book_origami.png
# Resources/Textures/Objects/Misc/books.rsi/book_particle_accelerator.png
# Resources/Textures/Objects/Misc/books.rsi/book_space_law.png
# Resources/Textures/Objects/Misc/books.rsi/meta.json
2024-04-02 11:32:48 +03:00
Wrexbe (Josh)
6d1511124f
Auto DeAdmin sooner ( #26551 )
...
Co-authored-by: wrexbe <wrexbe@protonmail.com>
2024-03-31 16:49:51 -04: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
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
f135b32a88
Merge remote-tracking branch 'upstream/master' into upstream-sync
...
# Conflicts:
# Content.Server/GameTicking/Rules/NukeopsRuleSystem.cs
# Resources/Prototypes/Datasets/tips.yml
# Resources/ServerInfo/Guidebook/Jobs.xml
# Resources/Textures/Structures/Windows/directional.rsi/meta.json
2024-02-29 12:28:26 +03:00
Rainfey
4e6c59cfe5
Refactor antag rule code ( #23445 )
...
* Initial Pass, Rev, Thief
* Zombie initial pass
* Rebase, Traitor
* Nukeops, More overloads
* Revert RevolutionaryRuleComponent
* Use TryRoundStartAttempt, Rewrite nukie spawning
* Comments, Add task scheduler to GameRuleSystem
* Zombie initial testing done
* Sort methods, rework GameRuleTask
* Add CCVar, Initial testing continues
* Might as well get rid of the obsolete logging
* Oops, i dont know how to log apparently
* Suggested formatting fixes
* Suggested changes
* Fix merge issues
* Minor optimisation
* Allowed thief to choose other antags
* Review changes
* Spawn items on floor first, then inserting
* minor tweaks
* Shift as much as possible to ProtoId<>
* Remove unneeded
* Add exclusive antag attribute
* Fix merge issues
* Minor formatting fix
* Convert to struct
* Cleanup
* Review cleanup (need to test a lot)
* Some fixes, (mostly) tested
* oop
* Pass tests (for real)
---------
Co-authored-by: Rainfall <rainfey0+git@gmail.com>
Co-authored-by: AJCM <AJCM@tutanota.com>
2024-02-29 17:25:10 +11:00
Morb0
1e0bee212f
Merge remote-tracking branch 'upstream/master' into upstream-sync
...
# Conflicts:
# .github/workflows/publish.yml
# Content.Server/GameTicking/GameTicker.RoundFlow.cs
# Content.Server/GameTicking/Rules/NukeopsRuleSystem.cs
# Resources/Prototypes/Datasets/tips.yml
# Resources/Prototypes/Maps/barratry.yml
# Resources/ServerInfo/Gameplay.txt
# Resources/ServerInfo/Guidebook/Antagonist/MinorAntagonists.xml
# Resources/ServerInfo/Guidebook/Engineering/Power.xml
# Resources/ServerInfo/Guidebook/Engineering/Singularity.xml
# Resources/ServerInfo/Guidebook/Jobs.xml
# Resources/ServerInfo/Guidebook/Science/MachineUpgrading.xml
# Resources/Textures/Clothing/Mask/bat.rsi/meta.json
# Resources/Textures/Clothing/Mask/bear.rsi/meta.json
# Resources/Textures/Clothing/Mask/bee.rsi/meta.json
# Resources/Textures/Clothing/Mask/breath.rsi/meta.json
# Resources/Textures/Clothing/Mask/clown.rsi/meta.json
# Resources/Textures/Clothing/Mask/cluwne.rsi/meta.json
# Resources/Textures/Clothing/Mask/ert.rsi/meta.json
# Resources/Textures/Clothing/Mask/fox.rsi/meta.json
# Resources/Textures/Clothing/Mask/gas.rsi/meta.json
# Resources/Textures/Clothing/Mask/gascaptain.rsi/meta.json
# Resources/Textures/Clothing/Mask/gascentcom.rsi/meta.json
# Resources/Textures/Clothing/Mask/gasexplorer.rsi/meta.json
# Resources/Textures/Clothing/Mask/gassecurity.rsi/meta.json
# Resources/Textures/Clothing/Mask/gassyndicate.rsi/meta.json
# Resources/Textures/Clothing/Mask/jackal.rsi/meta.json
# Resources/Textures/Clothing/Mask/joy.rsi/meta.json
# Resources/Textures/Clothing/Mask/medical.rsi/meta.json
# Resources/Textures/Clothing/Mask/medicalsecurity.rsi/meta.json
# Resources/Textures/Clothing/Mask/merc.rsi/meta.json
# Resources/Textures/Clothing/Mask/mime.rsi/meta.json
# Resources/Textures/Clothing/Mask/muzzle.rsi/meta.json
# Resources/Textures/Clothing/Mask/rat.rsi/meta.json
# Resources/Textures/Clothing/Mask/raven.rsi/meta.json
# Resources/Textures/Clothing/Mask/sadmime.rsi/meta.json
# Resources/Textures/Clothing/Mask/scaredmime.rsi/meta.json
# Resources/Textures/Clothing/Mask/sexyclown.rsi/meta.json
# Resources/Textures/Clothing/Mask/sexymime.rsi/meta.json
# Resources/Textures/Clothing/Mask/squadron.rsi/meta.json
# Resources/Textures/Clothing/Mask/sterile.rsi/meta.json
# Resources/Textures/Clothing/Mask/swat.rsi/meta.json
2024-01-10 00:23:02 +03:00
LankLTE
993793f162
Fix deadmin on join cvar for nukies ( #20198 )
...
* fix
* oops
2024-01-06 20:29:53 +11:00
dolgovmi
7ff348f1bc
Fix player rolling agent and operative at the same time ( #23568 )
...
Update NukeopsRuleSystem.cs
Probably fix the double pick bug by removing the picked agent from the Operative list
2024-01-05 21:19:11 -07:00
Morb0
8ba54ec466
Merge remote-tracking branch 'upstream/master' into upstream-sync
...
# Conflicts:
# Content.Client/Audio/ContentAudioSystem.cs
# Content.Client/Options/UI/Tabs/AudioTab.xaml
# Content.Client/Options/UI/Tabs/AudioTab.xaml.cs
# Content.Server/GameTicking/Rules/Components/ThiefRuleComponent.cs
# Resources/Prototypes/Datasets/ion_storm.yml
# Resources/ServerInfo/Guidebook/Security/Forensics.xml
# Resources/Textures/Clothing/Head/Hats/brownfedora.rsi/equipped-HELMET.png
# Resources/Textures/Clothing/Head/Hats/brownfedora.rsi/icon.png
# Resources/Textures/Objects/Misc/bureaucracy.rsi/meta.json
# Resources/Textures/Structures/Doors/Airlocks/Glass/atmospherics.rsi/assembly.png
# Resources/Textures/Structures/Doors/Airlocks/Glass/basic.rsi/assembly.png
# Resources/Textures/Structures/Doors/Airlocks/Glass/cargo.rsi/assembly.png
# Resources/Textures/Structures/Doors/Airlocks/Glass/command.rsi/assembly.png
# Resources/Textures/Structures/Doors/Airlocks/Glass/engineering.rsi/assembly.png
# Resources/Textures/Structures/Doors/Airlocks/Glass/maint.rsi/assembly.png
# Resources/Textures/Structures/Doors/Airlocks/Glass/medical.rsi/assembly.png
# Resources/Textures/Structures/Doors/Airlocks/Glass/science.rsi/assembly.png
# Resources/Textures/Structures/Doors/Airlocks/Glass/security.rsi/assembly.png
# Resources/Textures/Structures/Doors/Airlocks/Glass/virology.rsi/assembly.png
# Resources/Textures/Structures/Doors/Airlocks/Standard/atmospherics.rsi/assembly.png
# Resources/Textures/Structures/Doors/Airlocks/Standard/basic.rsi/assembly.png
# Resources/Textures/Structures/Doors/Airlocks/Standard/cargo.rsi/assembly.png
# Resources/Textures/Structures/Doors/Airlocks/Standard/command.rsi/assembly.png
# Resources/Textures/Structures/Doors/Airlocks/Standard/engineering.rsi/assembly.png
# Resources/Textures/Structures/Doors/Airlocks/Standard/freezer.rsi/assembly.png
# Resources/Textures/Structures/Doors/Airlocks/Standard/maint.rsi/assembly.png
# Resources/Textures/Structures/Doors/Airlocks/Standard/medical.rsi/assembly.png
# Resources/Textures/Structures/Doors/Airlocks/Standard/science.rsi/assembly.png
# Resources/Textures/Structures/Doors/Airlocks/Standard/security.rsi/assembly.png
# Resources/Textures/Structures/Doors/Airlocks/Standard/virology.rsi/assembly.png
2023-12-29 16:58:52 +03:00
Dakamakat
ff77e830d3
Fix Admin-spawned Nukies not counting as dead ( #23103 )
...
fix(NukeopsRuleSystem): admin created nukeops not count as dead
2023-12-28 12:16:04 -05:00
Morb0
e3f6082c58
Merge remote-tracking branch 'upstream/master' into upstream-sync
...
# Conflicts:
# Content.Server/RoundEnd/RoundEndSystem.cs
# Resources/Prototypes/Roles/Jobs/Security/security_officer.yml
# Resources/Prototypes/Roles/Jobs/Security/warden.yml
# Resources/Textures/Clothing/Hands/Gloves/captain.rsi/equipped-HAND.png
# Resources/Textures/Clothing/Hands/Gloves/captain.rsi/icon.png
# Resources/Textures/Clothing/Head/Hardsuits/cybersun.rsi/equipped-HELMET.png
# Resources/Textures/Clothing/Head/Hats/capcap.rsi/equipped-HELMET.png
# Resources/Textures/Clothing/Head/Hats/capcap.rsi/icon.png
# Resources/Textures/Clothing/Head/Hats/capcap.rsi/meta.json
# Resources/Textures/Clothing/Head/Hats/captain.rsi/equipped-HELMET.png
# Resources/Textures/Clothing/Head/Hats/captain.rsi/icon.png
# Resources/Textures/Clothing/Head/Hats/captain.rsi/meta.json
# Resources/Textures/Clothing/Mask/gascaptain.rsi/equipped-MASK.png
# Resources/Textures/Clothing/Mask/gascaptain.rsi/icon.png
# Resources/Textures/Clothing/Mask/gascaptain.rsi/meta.json
# Resources/Textures/Clothing/Neck/Cloaks/capcloakformal.rsi/equipped-NECK.png
# Resources/Textures/Clothing/Neck/Cloaks/capcloakformal.rsi/icon.png
# Resources/Textures/Clothing/Neck/Cloaks/capcloakformal.rsi/meta.json
# Resources/Textures/Clothing/OuterClothing/Armor/captain_carapace.rsi/equipped-OUTERCLOTHING.png
# Resources/Textures/Clothing/OuterClothing/Armor/captain_carapace.rsi/icon.png
# Resources/Textures/Clothing/OuterClothing/Armor/captain_carapace.rsi/meta.json
# Resources/Textures/Clothing/Uniforms/Jumpskirt/captain.rsi/equipped-INNERCLOTHING.png
# Resources/Textures/Clothing/Uniforms/Jumpskirt/captain.rsi/icon.png
# Resources/Textures/Clothing/Uniforms/Jumpsuit/capformal.rsi/equipped-INNERCLOTHING.png
# Resources/Textures/Clothing/Uniforms/Jumpsuit/capformal.rsi/icon.png
# Resources/Textures/Clothing/Uniforms/Jumpsuit/capformal.rsi/meta.json
# Resources/Textures/Clothing/Uniforms/Jumpsuit/captain.rsi/equipped-INNERCLOTHING.png
# Resources/Textures/Clothing/Uniforms/Jumpsuit/captain.rsi/icon.png
# Resources/Textures/Clothing/Uniforms/Jumpsuit/captain.rsi/inhand-left.png
# Resources/Textures/Clothing/Uniforms/Jumpsuit/captain.rsi/inhand-right.png
# Resources/Textures/Clothing/Uniforms/Jumpsuit/captain.rsi/meta.json
# Resources/Textures/Interface/Alerts/human_alive.rsi/health4.png
# Tools/actions_changelogs_since_last_run.py
2023-12-21 03:03:30 +03:00
Leon Friedrich
ca90a2819f
Add more centcomm spawning logs ( #22726 )
2023-12-19 12:35:31 +11:00
Arthur Asimov
f8d4eea0dc
Merge remote-tracking branch 'wizards/master' into upstream-sync
...
# Conflicts:
# Content.Client/Options/UI/Tabs/AudioTab.xaml.cs
# Content.Server/Chat/Managers/ChatManager.cs
# Content.Server/Chat/Systems/ChatSystem.cs
# Content.Server/GameTicking/GameTicker.StatusShell.cs
# Content.Server/RoundEnd/RoundEndSystem.cs
# Resources/Prototypes/Datasets/Names/Operation_suffix.yml
# Resources/Prototypes/Entities/Mobs/Cyborgs/base_borg_chassis.yml
# Resources/Prototypes/Maps/core.yml
# Resources/ServerInfo/Guidebook/Cargo/Salvage.xml
# Resources/ServerInfo/Guidebook/Science/Robotics.xml
2023-12-03 15:10:26 +03:00
metalgearsloth
269c93245d
Unrevert audio ( #21330 )
...
Co-authored-by: Pieter-Jan Briers <pieterjan.briers@gmail.com>
2023-11-27 22:12:34 +11:00
Morb0
804c99fcc5
Merge remote-tracking branch 'upstream/master' into upstream-sync
...
# Conflicts:
# Content.Shared/CCVar/CCVars.cs
# Resources/Prototypes/Datasets/Names/borg.yml
# Resources/Prototypes/Entities/Mobs/Cyborgs/base_borg_chassis.yml
# Resources/Prototypes/Entities/Structures/Machines/vending_machines.yml
# Resources/Prototypes/SoundCollections/lobby.yml
# Resources/ServerInfo/Guidebook/Engineering/Singularity.xml
# Resources/Textures/Structures/Piping/disposal.rsi/meta.json
# Resources/Textures/Tiles/attributions.yml
# Resources/Textures/Tiles/steel.png
2023-11-22 20:22:45 +03:00
2013HORSEMEATSCANDAL
23b54dae79
Operations ( #21154 )
...
* Creates an operation name when Nukies spawn.
* Fixed each nukie getting a different name
* Fixed it again for real this time
* commit name
* Revert "fix (#20719 )"
This reverts commit bfa301b53e
2023-11-16 14:04:50 -07:00
metalgearsloth
5b8f3c48c4
Revert "Update submodule to 175.0.0 ( #21318 )" ( #21319 )
2023-10-29 15:29:30 +11:00
metalgearsloth
9b1b3e03ed
Content audio ( #20862 )
2023-10-29 14:58:23 +11:00
Morb0
681762aca7
Merge remote-tracking branch 'upstream/master' into upstream-sync
...
# Conflicts:
# Content.Server/GameTicking/GameTicker.Player.cs
# Content.Server/GameTicking/GameTicker.RoundFlow.cs
# Content.Server/Preferences/Managers/ServerPreferencesManager.cs
# Content.Server/Shuttles/Systems/EmergencyShuttleSystem.Console.cs
# Resources/Prototypes/Objectives/objectiveGroups.yml
2023-10-28 14:14:36 +03:00
Leon Friedrich
1844ad23a3
Fix namespace error ( #21298 )
2023-10-28 14:24:37 +11:00
faint
59176f7613
Fix nukies sound not played ( #21268 )
...
* Play sound and sending greeting message works for nukies now!!!!!
* oops
* silly change
2023-10-27 22:28:20 -04:00
Leon Friedrich
e685cb626b
Un-revert IPlayerManager refactor ( #21244 )
2023-10-28 09:59:53 +11:00
metalgearsloth
a2bbda43cc
Revert "Update submodule to 172.0.0 ( #21222 )" ( #21225 )
2023-10-24 21:55:20 +11:00
Leon Friedrich
7ba0ea2926
IPlayerManager refactor ( #21215 )
2023-10-24 20:19:08 +11:00
Morb0
2af666368b
Merge remote-tracking branch 'upstream/master' into upstream-sync
...
# Conflicts:
# Content.Server/MassMedia/Systems/NewsSystem.cs
# Resources/Prototypes/Catalog/uplink_catalog.yml
# Resources/Textures/Clothing/Uniforms/Jumpsuit/atmos_casual.rsi/meta.json
# Resources/Textures/Objects/Storage/boxes.rsi/meta.json
2023-10-20 01:50:09 +03:00
DrSmugleaf
f560f88eb5
Remove 700 usages of Component.Owner ( #21100 )
2023-10-19 12:34:31 -07: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
DrSmugleaf
2f4b2cc887
Add active and ended game rule components, generic TryRoundStartAttempt and minPlayers field ( #20564 )
...
* Improve active game rule querying, add generic try round start attempt method, move minPlayers to GameRuleComponent
* Nukeops todo and cleanup
* Remove Active field
* Add EndedGameRuleComponent
2023-09-28 10:48:59 -04:00
Morb0
111f0cd628
Merge remote-tracking branch 'upstream/master' into upstream-sync
...
# Conflicts:
# Content.Server/RoundEnd/RoundEndSystem.cs
2023-09-25 00:14:43 +03:00
csqrb
7bb3dd09c7
After killing all nuclear operatives, shuttle will be called instead of instant round end ( #19850 )
...
* ☢️ 🕵️ 💀 🚫 📄 🚀
* 🚀 📢 ❌ 📥 📜
* 🔧 🐛 📢 🚹 🚉 ➡👑 👑
* 😪
* 🧱
* 🚀 🛬 🕔 ➡️ 🕙
* ☢️ ⚙️ 🔵 🔚 🔨 ➡️ 🔵 🔚 ⚙️
these commit names are literally evil who tf does this
2023-09-24 16:16:33 -04:00
Morb0
13b3bfa217
Merge remote-tracking branch 'upstream/master' into upstream-sync
...
# Conflicts:
# .github/CODEOWNERS
# .github/workflows/update-wiki.yml
# Content.Client/Preferences/UI/HumanoidProfileEditor.xaml.cs
# Content.Shared/Humanoid/HumanoidCharacterAppearance.cs
# Content.Shared/Humanoid/Markings/MarkingPrototype.cs
# Content.Shared/Preferences/HumanoidCharacterProfile.cs
# Resources/Prototypes/Entities/Clothing/Hands/gloves.yml
# Resources/ServerInfo/Guidebook/Engineering/AME.xml
# Resources/ServerInfo/Guidebook/Engineering/Atmospherics.xml
# Resources/manifest.yml
2023-09-24 12:56:24 +03:00
Repo
16b70ca8f6
Fix declaration of war ( #20399 )
2023-09-23 12:00:12 -08: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
deltanedas
621e102c93
refactor nukeops rule a bit ( #19792 )
...
Co-authored-by: deltanedas <@deltanedas:kde.org>
2023-09-16 21:48:42 +10: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
3f3ba6ac62
Move minds, roles, jobs and objectives to shared ( #19679 )
2023-08-30 21:46:11 -07:00
Morb0
2968d856bf
Merge remote-tracking branch 'upstream/master' into upstream-sync
...
# Conflicts:
# Content.Server/GameTicking/Rules/NukeopsRuleSystem.cs
# Resources/Textures/Structures/Furniture/chairs.rsi/meta.json
2023-08-30 20:42:46 +03:00
Morb
c99e365ce7
Give nukies the ability to declare war for a TC boost ( #19291 )
...
Co-authored-by: Kevin Zheng <kevinz5000@gmail.com>
2023-08-29 23:56:20 -08:00
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
Visne
b88c2cbb49
Remove usages of obsolete MetaDataComponent setters ( #19582 )
2023-08-28 19:20:31 +10: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
Visne
c7b21b631b
Remove unused dependencies ( #19490 )
2023-08-24 09:55:15 -08:00
