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
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
Whisper
eee056eaf0
lower max firestacks to 10, refactor flammable ( #27159 )
...
* lower max firestacks to 10, refactor flammable
* fix
* uncap fire stack damage, lower fire stack damage
2024-04-23 21:30:01 +10:00
no
94f296f9d6
"make thief" admin action: fix missing icon ( #27119 )
2024-04-19 15:27:36 +10:00
Arthur Asimov
d00640ec58
Fix upstream
2024-04-17 12:49:15 +03: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
Pieter-Jan Briers
9d0dfcf2b9
Game server admin API ( #26880 )
...
* Reapply "Game server api" (#26871 )
This reverts commit 3aee197923
2024-04-14 20:13:29 +10:00
Pieter-Jan Briers
3aee197923
Revert "Game server api" ( #26871 )
...
Revert "Game server api (#24015 )"
This reverts commit 297853929b
2024-04-10 14:19:32 +02:00
Simon
297853929b
Game server api ( #24015 )
...
* Revert "Revert "Game server api (#23129 )""
* Review pt.1
* Reviews pt.2
* Reviews pt. 3
* Reviews pt. 4
2024-04-10 02:37:16 -07: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
c4llv07e
64bb8dbdd5
Add door electronics access configuration menu ( #17778 )
...
* Add door electronics configuration menu
* Use file-scoped namespaces
Signed-off-by: c4llv07e <kseandi@gmail.com>
* Open door electronics configuration menu only with network configurator
Signed-off-by: c4llv07e <kseandi@gmail.com>
* Doors will now try to move their AccessReaderComponent to their door electronics when the map is initialized
Signed-off-by: c4llv07e <kseandi@gmail.com>
* Make the access list in the id card computer a separate control
Signed-off-by: c4llv07e <kseandi@gmail.com>
* Fix merge conflict
Signed-off-by: c4llv07e <kseandi@gmail.com>
* Remove DoorElectronics tag
Signed-off-by: c4llv07e <kseandi@gmail.com>
* Integrate doors with #17927
Signed-off-by: c4llv07e <kseandi@gmail.com>
* Move door electornics ui stuff to the right place
Signed-off-by: c4llv07e <kseandi@gmail.com>
* Some review fixes
Signed-off-by: c4llv07e <kseandi@gmail.com>
* More fixes
Signed-off-by: c4llv07e <kseandi@gmail.com>
* review fix
Signed-off-by: c4llv07e <kseandi@gmail.com>
* move all accesses from airlock prototypes to door electronics
Signed-off-by: c4llv07e <kseandi@gmail.com>
* rework door electronics config access list
Signed-off-by: c4llv07e <kseandi@gmail.com>
* Remove Linq from the door electronics user interface
* [WIP] Add EntityWhitelist to the activatable ui component
Signed-off-by: c4llv07e <kseandi@gmail.com>
* Better interaction system
Signed-off-by: c4llv07e <kseandi@gmail.com>
* Refactor
Signed-off-by: c4llv07e <kseandi@gmail.com>
* Fix some door electronics not working without AccessReaderComponent
Signed-off-by: c4llv07e <kseandi@gmail.com>
* Move AccessReaderComponent update code to the AccessReaderSystem
Signed-off-by: c4llv07e <kseandi@gmail.com>
* Remove unnecesary newlines in the door access prototypes
Signed-off-by: c4llv07e <kseandi@gmail.com>
* Remove unused variables in access level control
Signed-off-by: c4llv07e <kseandi@gmail.com>
* Remove unnecessary method from the door electronics configuration menu
Signed-off-by: c4llv07e <kseandi@gmail.com>
* [WIP] change access type from string to ProtoId<AccessLevelPrototype>
Signed-off-by: c4llv07e <kseandi@gmail.com>
* Remove unused methods
Signed-off-by: c4llv07e <kseandi@gmail.com>
* Newline fix
Signed-off-by: c4llv07e <kseandi@gmail.com>
* Restored to a functional state
Signed-off-by: c4llv07e <kseandi@gmail.com>
* Fix access configurator not working with door electronics AccessReaderComponent
Signed-off-by: c4llv07e <kseandi@gmail.com>
* Replace all string access fields with ProtoId
Signed-off-by: c4llv07e <kseandi@gmail.com>
* move access level control initialization into Populate method
Signed-off-by: c4llv07e <kseandi@gmail.com>
* Review
---------
Signed-off-by: c4llv07e <kseandi@gmail.com>
Co-authored-by: metalgearsloth <comedian_vs_clown@hotmail.com>
2024-04-01 17:06:13 +11:00
Simon
87a56b25c3
Make aghost command work on other players using optional argument ( #26546 )
...
* Translations
* Make aghost command work on other players using optional argument
* Reviews
2024-03-31 13:05:44 +11: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
Jake Huxell
59e46aab93
Reduced Warning Count By 130 For Full Rebuilds ( #26518 )
...
* remove deprecated entity coordinate extension functions. Reduces warning count by approximately 50
* final toCoords Removed
* Remove all unused variables and dead code paths
* remove always true variable, should be a cvar or something instead
* remove superfluous variables from tests
2024-03-29 16:28:16 +11:00
nikthechampiongr
df631ff8a0
Fix Incorrect stealth messages appearing on readmin. ( #26511 )
...
Fix major skill issue/Incorrect stealth messages appearing on readmin.
2024-03-28 20:19:53 +01:00
Morb0
6fc8c1cd54
Merge remote-tracking branch 'upstream/master' into master-syndicate
...
# Conflicts:
# Content.Packaging/ServerPackaging.cs
# Resources/Prototypes/Accents/word_replacements.yml
# Resources/Prototypes/Entities/Clothing/Neck/mantles.yml
# Resources/Prototypes/Entities/Structures/Doors/Airlocks/highsec.yml
# Resources/Prototypes/Maps/marathon.yml
# Resources/Prototypes/Maps/packed.yml
# Resources/Prototypes/Roles/Jobs/Engineering/atmospheric_technician.yml
# Resources/Prototypes/Roles/Jobs/Security/detective.yml
# Resources/Textures/Clothing/Head/Hardsuits/cybersun.rsi/meta.json
# Resources/Textures/Clothing/Head/Hardsuits/spatiohelm.rsi/meta.json
# Resources/Textures/Clothing/Head/Hardsuits/syndiecommander.rsi/meta.json
# Resources/Textures/Clothing/Head/Hardsuits/syndieelite.rsi/meta.json
# Resources/Textures/Clothing/Head/Helmets/atmos_firehelmet.rsi/meta.json
# Resources/Textures/Clothing/Head/Helmets/paramedhelm.rsi/meta.json
# Resources/Textures/Clothing/Mask/plaguedoctormask.rsi/meta.json
# Resources/Textures/Clothing/Neck/Cloaks/capcloakformal.rsi/meta.json
# Resources/Textures/Clothing/Neck/mantles/capmantle.rsi/meta.json
# Resources/Textures/Clothing/Neck/mantles/cemantle.rsi/meta.json
# Resources/Textures/Clothing/Neck/mantles/cmomantle.rsi/meta.json
# Resources/Textures/Clothing/Neck/mantles/hopmantle.rsi/meta.json
# Resources/Textures/Clothing/Neck/mantles/hosmantle.rsi/meta.json
# Resources/Textures/Clothing/Neck/mantles/rdmantle.rsi/meta.json
# Resources/Textures/Clothing/OuterClothing/Armor/lingarmor.rsi/meta.json
# Resources/Textures/Clothing/OuterClothing/Coats/labcoat.rsi/equipped-OUTERCLOTHING.png
# Resources/Textures/Clothing/OuterClothing/Coats/labcoat.rsi/icon-open.png
# Resources/Textures/Clothing/OuterClothing/Coats/labcoat.rsi/icon.png
# Resources/Textures/Clothing/OuterClothing/Coats/labcoat.rsi/inhand-left.png
# Resources/Textures/Clothing/OuterClothing/Coats/labcoat.rsi/inhand-right.png
# Resources/Textures/Clothing/OuterClothing/Coats/labcoat.rsi/meta.json
# Resources/Textures/Clothing/OuterClothing/Coats/labcoat.rsi/open-equipped-OUTERCLOTHING.png
# Resources/Textures/Clothing/OuterClothing/Coats/labcoat.rsi/open-inhand-left.png
# Resources/Textures/Clothing/OuterClothing/Coats/labcoat.rsi/open-inhand-right.png
# Resources/Textures/Clothing/OuterClothing/Coats/labcoat_chem.rsi/equipped-OUTERCLOTHING.png
# Resources/Textures/Clothing/OuterClothing/Coats/labcoat_chem.rsi/icon-open.png
# Resources/Textures/Clothing/OuterClothing/Coats/labcoat_chem.rsi/icon.png
# Resources/Textures/Clothing/OuterClothing/Coats/labcoat_chem.rsi/inhand-left.png
# Resources/Textures/Clothing/OuterClothing/Coats/labcoat_chem.rsi/inhand-right.png
# Resources/Textures/Clothing/OuterClothing/Coats/labcoat_chem.rsi/meta.json
# Resources/Textures/Clothing/OuterClothing/Coats/labcoat_chem.rsi/open-equipped-OUTERCLOTHING.png
# Resources/Textures/Clothing/OuterClothing/Coats/labcoat_chem.rsi/open-inhand-left.png
# Resources/Textures/Clothing/OuterClothing/Coats/labcoat_chem.rsi/open-inhand-right.png
# Resources/Textures/Clothing/OuterClothing/Coats/labcoat_cmo.rsi/equipped-OUTERCLOTHING.png
# Resources/Textures/Clothing/OuterClothing/Coats/labcoat_cmo.rsi/icon-open.png
# Resources/Textures/Clothing/OuterClothing/Coats/labcoat_cmo.rsi/icon.png
# Resources/Textures/Clothing/OuterClothing/Coats/labcoat_cmo.rsi/inhand-left.png
# Resources/Textures/Clothing/OuterClothing/Coats/labcoat_cmo.rsi/inhand-right.png
# Resources/Textures/Clothing/OuterClothing/Coats/labcoat_cmo.rsi/meta.json
# Resources/Textures/Clothing/OuterClothing/Coats/labcoat_cmo.rsi/open-equipped-OUTERCLOTHING.png
# Resources/Textures/Clothing/OuterClothing/Coats/labcoat_gene.rsi/equipped-OUTERCLOTHING.png
# Resources/Textures/Clothing/OuterClothing/Coats/labcoat_gene.rsi/icon.png
# Resources/Textures/Clothing/OuterClothing/Coats/labcoat_gene.rsi/meta.json
# Resources/Textures/Clothing/OuterClothing/Coats/labcoat_robo.rsi/equipped-OUTERCLOTHING.png
# Resources/Textures/Clothing/OuterClothing/Coats/labcoat_robo.rsi/icon.png
# Resources/Textures/Clothing/OuterClothing/Coats/labcoat_robo.rsi/inhand-left.png
# Resources/Textures/Clothing/OuterClothing/Coats/labcoat_robo.rsi/inhand-right.png
# Resources/Textures/Clothing/OuterClothing/Coats/labcoat_robo.rsi/meta.json
# Resources/Textures/Clothing/OuterClothing/Coats/labcoat_sci.rsi/equipped-OUTERCLOTHING-reptilian.png
# Resources/Textures/Clothing/OuterClothing/Coats/labcoat_sci.rsi/meta.json
# Resources/Textures/Clothing/OuterClothing/Coats/labcoat_sci.rsi/open-equipped-OUTERCLOTHING-reptilian.png
# Resources/Textures/Clothing/OuterClothing/Coats/labcoat_viro.rsi/equipped-OUTERCLOTHING.png
# Resources/Textures/Clothing/OuterClothing/Coats/labcoat_viro.rsi/icon.png
# Resources/Textures/Clothing/OuterClothing/Coats/labcoat_viro.rsi/meta.json
# Resources/Textures/Clothing/OuterClothing/Coats/rndcoat.rsi/equipped-OUTERCLOTHING.png
# Resources/Textures/Clothing/OuterClothing/Coats/rndcoat.rsi/icon.png
# Resources/Textures/Clothing/OuterClothing/Hardsuits/cybersun.rsi/meta.json
# Resources/Textures/Clothing/OuterClothing/Hardsuits/paramed.rsi/meta.json
# Resources/Textures/Clothing/OuterClothing/Hardsuits/spatio.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/Suits/atmos_firesuit.rsi/meta.json
# Resources/Textures/Clothing/OuterClothing/WinterCoats/coat.rsi/meta.json
# Resources/Textures/Clothing/OuterClothing/WinterCoats/coatatmos.rsi/meta.json
# Resources/Textures/Clothing/OuterClothing/WinterCoats/coatcap.rsi/meta.json
# Resources/Textures/Clothing/OuterClothing/WinterCoats/coatcargo.rsi/meta.json
# Resources/Textures/Clothing/OuterClothing/WinterCoats/coatce.rsi/meta.json
# Resources/Textures/Clothing/OuterClothing/WinterCoats/coatcentcom.rsi/meta.json
# Resources/Textures/Clothing/OuterClothing/WinterCoats/coatchem.rsi/meta.json
# Resources/Textures/Clothing/OuterClothing/WinterCoats/coatcmo.rsi/meta.json
# Resources/Textures/Clothing/OuterClothing/WinterCoats/coatengi.rsi/meta.json
# Resources/Textures/Clothing/OuterClothing/WinterCoats/coatgen.rsi/meta.json
# Resources/Textures/Clothing/OuterClothing/WinterCoats/coathop.rsi/meta.json
# Resources/Textures/Clothing/OuterClothing/WinterCoats/coathos.rsi/meta.json
# Resources/Textures/Clothing/OuterClothing/WinterCoats/coathydro.rsi/meta.json
# Resources/Textures/Clothing/OuterClothing/WinterCoats/coatjani.rsi/meta.json
# Resources/Textures/Clothing/OuterClothing/WinterCoats/coatmed.rsi/meta.json
# Resources/Textures/Clothing/OuterClothing/WinterCoats/coatmime.rsi/meta.json
# Resources/Textures/Clothing/OuterClothing/WinterCoats/coatminer.rsi/meta.json
# Resources/Textures/Clothing/OuterClothing/WinterCoats/coatparamed.rsi/meta.json
# Resources/Textures/Clothing/OuterClothing/WinterCoats/coatqm.rsi/meta.json
# Resources/Textures/Clothing/OuterClothing/WinterCoats/coatrd.rsi/meta.json
# Resources/Textures/Clothing/OuterClothing/WinterCoats/coatrobo.rsi/meta.json
# Resources/Textures/Clothing/OuterClothing/WinterCoats/coatsci.rsi/meta.json
# Resources/Textures/Clothing/OuterClothing/WinterCoats/coatsec.rsi/meta.json
# Resources/Textures/Clothing/OuterClothing/WinterCoats/coatviro.rsi/meta.json
# Resources/Textures/Clothing/OuterClothing/WinterCoats/coatwarden.rsi/meta.json
# Resources/Textures/Clothing/Shoes/Boots/combatboots.rsi/meta.json
# Resources/Textures/Clothing/Shoes/Specific/bling.rsi/meta.json
# Resources/Textures/Clothing/Uniforms/Jumpskirt/atmosf.rsi/meta.json
# Resources/Textures/Clothing/Uniforms/Jumpskirt/capformaldress.rsi/meta.json
# Resources/Textures/Clothing/Uniforms/Jumpskirt/operative_s.rsi/meta.json
# Resources/Textures/Clothing/Uniforms/Jumpsuit/atmos.rsi/meta.json
# Resources/Textures/Clothing/Uniforms/Jumpsuit/capformal.rsi/meta.json
# Resources/Textures/Clothing/Uniforms/Jumpsuit/centcom_officer.rsi/meta.json
# Resources/Textures/Clothing/Uniforms/Jumpsuit/centcomformal.rsi/meta.json
# Resources/Textures/Clothing/Uniforms/Jumpsuit/hosformal.rsi/meta.json
# Resources/Textures/Clothing/Uniforms/Jumpsuit/journalist.rsi/meta.json
# Resources/Textures/Clothing/Uniforms/Jumpsuit/operative.rsi/meta.json
# Resources/Textures/Clothing/Uniforms/Jumpsuit/psychologist.rsi/meta.json
# Resources/Textures/Clothing/Uniforms/Jumpsuit/reporter.rsi/meta.json
# Resources/Textures/Mobs/Animals/regalrat.rsi/meta.json
# Resources/Textures/Objects/Storage/boxes.rsi/meta.json
# Resources/Textures/Objects/Weapons/Guns/Battery/antiquelasergun.rsi/meta.json
# Resources/Textures/Structures/Doors/Airlocks/Glass/atmospherics.rsi/meta.json
# Resources/Textures/Structures/Doors/Airlocks/Standard/atmospherics.rsi/meta.json
# Resources/Textures/Structures/Doors/Airlocks/highsec/highsec.rsi/meta.json
# Resources/Textures/Structures/Furniture/chairs.rsi/meta.json
# Resources/Textures/Structures/Holo/holofan.rsi/meta.json
# Resources/Textures/Structures/Holo/wetfloor.rsi/meta.json
2024-03-27 01:12:55 +03:00
Tayrtahn
964c6d54ca
Code cleanup: Purge obsoleted SharedPhysicsSystem methods ( #26287 )
...
Updated calls to SharedPhysicsSystem methods
2024-03-25 17:37:25 +11:00
IProduceWidgets
451890b85b
Fix admin verb to set unspawned ballisic ammo count ( #26411 )
...
Don't crash if an invalid value is given.
2024-03-24 17:45:01 -07:00
nikthechampiongr
dca0c6694b
Add stealthmins ( #26263 )
...
* Add stealthmin command.
* Update Content.Server/Administration/Commands/AdminWhoCommand.cs
As suggested by CE.
Co-authored-by: Chief-Engineer <119664036+Chief-Engineer@users.noreply.github.com>
* Add admin notifications for admins toggling stealthmin.
* Localize stealthmin command
---------
Co-authored-by: Chief-Engineer <119664036+Chief-Engineer@users.noreply.github.com>
2024-03-24 10:39:53 -05:00
Pieter-Jan Briers
a1817a12db
Add Prometheus stats for admin count ( #26284 )
...
* Add Prometheus stats for admin count
Fixes #20828
Reports time series for admin count. Counts are separated by state (active, AFK, or deadminned) and admin rank.
* Use static constructor instead of static readonly for the metric
Docs recommend this due to inconsistent execution of C# static constructors.
* Remove static usage, use IoC IMeterFactory.
---------
Co-authored-by: metalgearsloth <comedian_vs_clown@hotmail.com>
2024-03-24 14:48:04 +11:00
metalgearsloth
65960facf5
Fix playglobalsound autocompletion ( #26167 )
2024-03-24 14:15:26 +11:00
Pieter-Jan Briers
d776c4b392
Improve admin message seen/dismiss state. ( #26223 )
...
Fixes #26211
Admin messages now have separate "seen" and "dismissed" fields. The idea is that an admin should be able to tell whether a user pressed the "dismiss for now" button. Instead of using "seen" as "show this message to players when they join", "dismissed" is now used for this.
Existing notes in the database will automatically be marked as dismissed on migration. A note cannot be dismissed without being seen (enforced via constraint in the database too, aren't I fancy).
As part of this, it has become impossible for a player to play without dismissing the message in some form. Instead of a shitty popup window, the popup is now a fullscreen overlay that blocks clicks behind it, making the game unplayable. Also, if a user somehow has multiple messages they will be combined into one popup.
Also I had enough respect for the codebase to make it look better and clean up the code somewhat. Yippee.
2024-03-21 16:15:46 +01: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
Tayrtahn
4a83c36585
Code cleanup: Dirty(Comp) ( #26238 )
...
* Replaced uses of Dirty(Component) with Dirty(Uid, Component)
Modified some systems (notably pulling-related) to use uids.
* Missed a few
* Revert changes to pulling
* No
2024-03-19 23:27:02 -04:00
Morb0
a751abc778
Merge remote-tracking branch 'upstream/master' into upstream-sync
...
# Conflicts:
# Content.Server/Connection/ConnectionManager.cs
# Resources/ServerInfo/Guidebook/Medical/Cryogenics.xml
2024-03-17 14:01:54 +03:00
LordCarve
7d275a4b5e
Obsolete Logger cleanup for EntitySystems part 2 ( #26159 )
...
* Kill the static InRangeUnOccluded
* Adjusted 4 more EntitySystems that were missed.
2024-03-17 18:31:09 +11:00
Morb0
837a7f9b0d
Merge remote-tracking branch 'upstream/master' into upstream-sync
2024-03-13 17:02:47 +03:00
SlamBamActionman
0da09db99a
Enable multiple Solution Editor windows ( #26005 )
...
* More solution edit windows
* Fix error when closing euis after round restart
---------
Co-authored-by: ShadowCommander <10494922+ShadowCommander@users.noreply.github.com>
2024-03-12 05:10:09 -07:00
Morb0
4f43e73d14
Merge remote-tracking branch 'upstream/master' into upstream-sync
...
# Conflicts:
# Content.Shared/Humanoid/Prototypes/SpeciesPrototype.cs
# Resources/Prototypes/Roles/Jobs/Security/detective.yml
# Resources/Prototypes/SoundCollections/NukeMusic.yml
2024-03-11 08:37:54 +03:00
Arendian
60b9d89e4d
Criminal record hud icons ( #25192 )
...
* Security hud shows icon based on criminal record status
* Criminal status now linked to name instead of identity
* parole loc
* Test fix
* review changes
* Check station records instead of storing names on criminal record consoles.
* cleanup
* more cleanup
* review changes
* change outdated comments
* rename
* review changes
* remove event subscription
* replaced event with trycomp
* default value
2024-03-11 14:12:52 +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
metalgearsloth
a9502be29e
Revert "Fix chat bubbles ( #25643 )" ( #25645 )
...
* Revert "Fix chat bubbles (#25643 )"
This reverts commit 23d2c4d924#25256 )"
This reverts commit f284b43ff6
2024-02-28 00:51:20 +11:00
TemporalOroboros
f284b43ff6
Fixes obsolete Transform warnings in Content. ( #25256 )
...
* Fix TransformComponent.MapPosition warnings in Content.Client
* Fix TransformComponent.MapPosition warnings in Content.IntegrationTests
* Fix TransformComponent.MapPosition warnings in Content.Shared
* Fix TransformComponent.MapPosition warnings in Content.Server
* Fix TransformComponent.WorldPosition warnings in Content.Shared
* Fix TransformComponent.WorldPosition warnings in Content.Client
Excepts ClickableComponent b/c that needs to be ECS'd entirely later
* Fix TransformComponent.WorldPosition warnings in Content.Server
* Fix TransformComponent.WorldRotation warnings in Content.*
* Fix TransformComponent.MapPosition warnings I missed
* Fix TransformComponent.WorldMatrix warnings in Content.*
* Fix TransformComponent.InvWorldMatrix warnings in Content.*
* Fix TransformComponent.GetWorldPositionRotationMatrixWithInv warnings in Content.*
* Fix TransformComponent.GetWorldPositionRotationMatrix warnings in Content.*
* Fix TransformComponent.GetWorldPositionRotation warnings in Content.*
* Fix TransformComponent.Anchored.set warnings in Content.*
* Fix TransformComponent.Coordinates.set warnings in Content.*
* Fix TransformComponent.LocalPosition.set warnings in Content.*
* Fix TransformComponent.AttachToGridOrMap warnings in Content.*
* Fix TransformComponent.AttachParent warnings in Content.*
* Preempt TransformComponent.LocalRotation.set warnings in Content.Shared
* Preempt TransformComponent.LocalRotation.set warnings in Content.Client
* Preempt TransformComponent.LocalRotation.set warnings in Content.IntegrationTests
* Preempt TransformComponent.LocalRotation.set warnings in Content.Server
* Fix/Preempt the remaining obsolete TransformComponent properties/methods in Content.*
* ECS ClickableComponent
* Fix obsolete SharedTransformSystem methods in Content.*
* Fix ExplosionOverlay `SharedTransformSystem` dependency
* Maybe fix null eye position breaking tests
* MGS requested changes
2024-02-27 12:06:20 +11:00
Morb0
fe48e6deda
Merge remote-tracking branch 'upstream/master' into upstream-sync
...
# Conflicts:
# Content.Client/Preferences/ClientPreferencesManager.cs
# Content.Server/Connection/ConnectionManager.cs
# Content.Server/Preferences/Managers/ServerPreferencesManager.cs
# Content.Shared/Preferences/HumanoidCharacterProfile.cs
# Content.Shared/Preferences/ICharacterProfile.cs
# Resources/Prototypes/Catalog/VendingMachines/Inventories/janidrobe.yml
# Resources/Prototypes/Datasets/Names/fortunes.yml
# Resources/Prototypes/Entities/Clothing/Shoes/specific.yml
# Resources/Textures/Structures/Wallmounts/posters.rsi/meta.json
# SpaceStation14.sln
2024-02-26 15:14:44 +03:00
Nemanja
ce0a51fc29
Predict doors and airlocks ( #25419 )
...
* predict doors and airlocks
* prying, too
* ack
* eek
2024-02-23 10:01:31 +11:00
Morb0
4ee0df9498
Merge remote-tracking branch 'upstream/master' into master-syndie
...
# Conflicts:
# Content.Shared/Preferences/HumanoidCharacterProfile.cs
# Resources/Prototypes/Catalog/Fills/Lockers/heads.yml
# Resources/Prototypes/Roles/Jobs/Security/security_cadet.yml
# Resources/Prototypes/Voice/speech_emotes.yml
# Resources/Textures/Structures/stairs.rsi/meta.json
# Resources/Textures/Structures/stairs.rsi/stairs.png
# Resources/Textures/Structures/stairs.rsi/stairs_stage.png
2024-02-22 13:19:02 +03:00
metalgearsloth
79c6385ca7
Fix bwoink sounds ( #25441 )
...
* Fix bwoink sounds
Didn't get a chance to test with 2 clients as I'm about to sleep but otherwise I'll check tomorrow.
* a
2024-02-21 16:14:57 -06:00
dffdff2423
a3c93b0bd7
Add option for admins to disable bwoink ( #25008 )
...
* Add option for admins to disable bwoink
In a vain attempt to get people to ahelp more, provide the possibility
for admins to not play the bwoink sound if they don't want to scare the
player.
* Add silent indicator to discord relay
* Use string interpolation
2024-02-20 23:52:03 -07:00
Pieter-Jan Briers
2e6eaa45c5
Fix admin notes and database time nonsense. ( #25280 )
...
God bloody christ. There's like three layers of shit here.
So firstly, apparently we were still using Npgsql.EnableLegacyTimestampBehavior. This means that time values (which are stored UTC in the database) were converted to local time when read out. This meant they were passed around as kind Local to clients (instead of UTC in the case of SQLite). That's easy enough to fix just turn off the flag and fix the couple spots we're passing a local DateTime ez.
Oh but it turns out there's a DIFFERENT problem with SQLite: See SQLite we definitely store the DateTimes as UTC, but when Microsoft.Data.Sqlite reads them it reads them as Kind Unspecified instead of Utc.
Why are these so bad? Because the admin notes system passes DateTime instances from EF Core straight to the rest of the game code. And that means it's a PAIN IN THE ASS to run the necessary conversions to fix the DateTime instances. GOD DAMNIT now I have to make a whole new set of "Record" entities so we avoid leaking the EF Core model entities. WAAAAAAA.
Fixes #19897
2024-02-20 10:13:31 +01:00
Morb0
92bd0148fe
Merge remote-tracking branch 'upstream/master' into upstream-sync
...
# Conflicts:
# Content.Server/Administration/Systems/AdminSystem.cs
# Resources/Locale/en-US/chat/sanitizer-replacements.ftl
# Resources/Prototypes/Entities/Structures/Power/Generation/Singularity/emitter.yml
# Resources/Prototypes/StatusIcon/antag.yml
# Resources/Textures/Clothing/Uniforms/Jumpskirt/security.rsi/equipped-INNERCLOTHING.png
# Resources/Textures/Clothing/Uniforms/Jumpskirt/security.rsi/icon.png
# Resources/Textures/Effects/speech.rsi/meta.json
# Resources/Textures/Objects/Devices/nuke.rsi/nuclearbomb_deployed.png
# Resources/Textures/Objects/Devices/nuke.rsi/nuclearbomb_exploding.png
# Resources/Textures/Objects/Devices/nuke.rsi/nuclearbomb_timing.png
2024-02-17 12:43:04 +03:00
Pieter-Jan Briers
68ce53ae17
Random spontaneous cleanup PR ( #25131 )
...
* Use new Subs.CVar helper
Removes manual config OnValueChanged calls, removes need to remember to manually unsubscribe.
This both reduces boilerplate and fixes many issues where subscriptions weren't removed on entity system shutdown.
* Fix a bunch of warnings
* More warning fixes
* Use new DateTime serializer to get rid of ISerializationHooks in changelog code.
* Get rid of some more ISerializationHooks for enums
* And a little more
* Apply suggestions from code review
Co-authored-by: 0x6273 <0x40@keemail.me>
---------
Co-authored-by: 0x6273 <0x40@keemail.me>
2024-02-13 16:48:39 -05:00
Morb0
70e63172f7
Merge remote-tracking branch 'upstream/master' into upstream-sync
...
# Conflicts:
# Content.Shared/Preferences/HumanoidCharacterProfile.cs
# README.md
# Resources/Prototypes/Entities/Structures/Machines/lathe.yml
# Resources/ServerInfo/Guidebook/Cargo/Cargo.xml
# Resources/ServerInfo/Guidebook/Medical/Cloning.xml
# Resources/ServerInfo/Guidebook/Survival.xml
# Resources/Textures/Clothing/Head/Hats/beret_qm.rsi/meta.json
# Resources/Textures/Objects/Tools/t-ray.rsi/meta.json
# Resources/Textures/Objects/Tools/t-ray.rsi/tray-off.png
# Resources/Textures/Objects/Tools/t-ray.rsi/tray-on.png
# Resources/Textures/Structures/Doors/Airlocks/Glass/cargo.rsi/open.png
2024-02-12 12:53:34 +03:00
crazybrain23
f77550dc83
fix follow comannd help locale ( #25032 )
2024-02-08 18:13:06 -05:00
deltanedas
683591ab04
criminal records revival ( #22510 )
2024-02-04 19:29:35 -04:00
Morb0
32a8d1a21e
Merge remote-tracking branch 'upstream/master' into upstream-sync
...
# Conflicts:
# Content.Client/Preferences/UI/HumanoidProfileEditor.xaml
# Content.Server/Power/Generator/GeneratorSystem.cs
# Content.Shared/Preferences/HumanoidCharacterProfile.cs
# Resources/Prototypes/Entities/Mobs/NPCs/silicon.yml
# Resources/Prototypes/Entities/Objects/Misc/paper.yml
# Resources/Prototypes/Voice/speech_emotes.yml
# Resources/Textures/Effects/speech.rsi/meta.json
# Resources/Textures/Structures/Doors/Airlocks/Glass/centcomm.rsi/assembly.png
# Resources/Textures/Structures/Doors/Airlocks/Glass/external.rsi/assembly.png
# Resources/Textures/Structures/Doors/Airlocks/Glass/glass.rsi/assembly.png
# Resources/Textures/Structures/Doors/Airlocks/Glass/syndicate.rsi/assembly.png
# Resources/Textures/Structures/Doors/Airlocks/Standard/external.rsi/assembly.png
# Resources/Textures/Structures/Doors/Airlocks/Standard/syndicate.rsi/assembly.png
2024-02-03 03:38:29 +03:00
Repo
0084121706
Fix aHelp relay to detect AFK Admins ( #24482 )
...
* Add AFK detection for aHelp relay and admin specific afk time.
* Correct query to new refactor
* Change AFK timeout to 10min or else Pancake closes my PR 😭
* It wasnt a bug it was a feature, way less aHelps that way.
* aHelp Colors arn't real!
* Update Content.Shared/CCVar/CCVars.cs
---------
Co-authored-by: metalgearsloth <31366439+metalgearsloth@users.noreply.github.com>
2024-02-02 00:03:49 +11:00
AJCM-git
b8f0ed3975
Cleanups PolymorphSystem/Components/Prototypes ( #23721 )
...
* Cleanups PolymorphSystem
* forgot this
* Nah
* Fix test
---------
Co-authored-by: metalgearsloth <31366439+metalgearsloth@users.noreply.github.com>
2024-02-01 23:17:02 +11:00
Morb0
ec5d3e98b6
Merge remote-tracking branch 'upstream/master' into upstream-sync
...
# Conflicts:
# Resources/Audio/Weapons/Guns/Gunshots/attributions.yml
# Resources/Prototypes/Maps/aspid.yml
# Resources/Prototypes/Maps/gemini.yml
# Resources/Prototypes/Roles/Jobs/Civilian/detective.yml
# Tools/actions_changelogs_since_last_run.py
2024-01-31 00:23:19 +03:00
