Charlotte Tezuka
284bc8ecf3
Merge remote-tracking branch 'dimo2/fix-something' into upstream30.04
2026-05-10 23:22:37 +02:00
Pieter-Jan Briers and GitHub
5168b5f3d4
IoC source gen compatibility ( #43863 )
...
* IoC source gen compatibility
Can be merged before or after https://github.com/space-wizards/RobustToolbox/pull/6549 doesn't really matter.
* Missed a spot
2026-05-09 03:29:58 +00:00
Charlotte Tezuka
cd02250325
Upstream 10.04.26
2026-04-10 22:16:32 +02:00
Charlotte Tezuka
d5e69e73e5
Upstream from corvax/master 19.09
2025-09-19 00:42:32 +02:00
Dmitry
7e19548e2a
upstream master sync 18/08
2025-08-18 21:41:38 +07:00
slarticodefast and GitHub
2743dcf67f
Move mind role components to shared ( #39606 )
2025-08-13 12:51:46 +02:00
ssdaniel24
6591aabe4f
Merge remote-tracking branch 'corvax/master' into upstream-07-23
2025-07-23 22:35:40 +03:00
Dmitry
60c835f02c
master 21.7 syns
2025-07-21 00:27:46 +07:00
Dmitry
4948a136f1
stable upstream syns
2025-07-17 14:36:21 +07:00
Crude Oil and GitHub
9ebf6a24c4
Parroting Parrots part 1: Help maints! SQUAWK! Maints! ( #38243 )
...
* parrots have ears. add poly
* high tech parrot functionality
* adjust times
* add accent to radio message
* don't spam everything all at once probably
* learn about the existence of prob(float)
* actually use Prob(float) correctly
* newline
* add pet spawner for poly
* move chance to talk on radio to component
* missing comment
* minor edits and doc additions
* the reviewerrrrrrr
* parrot can't learn when crit or dead
* increase default memory
* rename poly to polly
* crude way to ignore whispers. chatcode please
* This is Polly. It is set to broadcast over the engineering frequency
* add missing initialize
* add displacement map for parrot ears
* review comments - Errant
* minor things
* large rework
* fix attempting to talk when entity has no channels
* use list of active radios again to track channels
* fix bad return, some comments
* fix long learn cooldown
* minor adjustments
* use FromMinutes
* the voices told me to make these changes
* remove default reassignment
* Review changes
* remove polly's accent
* decouple radio stuff from parrotsystem
* minor stuff
* split vocalization and parroting
* minor review work
* re-add missing check
* add admin verb for clearing parrot messages
* minor action icon update
* oops
* increase icon number text size
* Admin erase parrot messages associated with players
* part 1 beck review
* add whitelist and blacklist for parrots
* Downgrade missing component error to warning
* Add comment
* add some missing comments
* Remove active radio entity tracking, use all inventory slots
* Minor changes
* small review stuff
* review radio stuff
* swap ears displacement to invisible death displacement
* remove syncsprite
* vscode why do yo have to hurt my feelings
* review changes
* use checkboth
2025-07-09 12:04:57 -07:00
Tayrtahn and GitHub
75db49f9c0
Clean up all missing EntitySystem proxy method uses ( #38353 )
2025-06-26 16:50:49 -07:00
Pieter-Jan Briers and GitHub
73df3b1593
Stop network serializing prototypes ( #38602 )
...
* Stop network serializing prototypes
Send the damn proto ID instead.
* Fix sandbox violation
2025-06-26 19:27:23 -04:00
524725d378
HandsSystem Refactor ( #38438 )
...
* checkpoint
* pt 2
* pt... i forgot
* pt 4
* patch
* More test fixes
* optimization!!!
* the REAL hand system
* fix RetractableItemActionSystem.cs oversight
* the review
* test
* remove test usage of body prototype
* Update Content.IntegrationTests/Tests/Interaction/InteractionTest.cs
Co-authored-by: Tayrtahn <tayrtahn@gmail.com >
* hellcode
* hellcode 2
* Minor cleanup
* test
* Chasing the last of the bugs
* changes
---------
Co-authored-by: Tayrtahn <tayrtahn@gmail.com >
2025-06-25 15:13:03 +02:00
ssdaniel24
d399099102
Merge remote-tracking branch 'corvax/master' into wl-upstream-sync-try-2
...
Conflicts:
Content.Client/Humanoid/HumanoidAppearanceSystem.cs
Content.Client/LateJoin/LateJoinGui.cs
Content.Client/Stylesheets/StyleNano.cs
Content.Server/Administration/Systems/AdminVerbSystem.Tools.cs
Content.Server/Fax/FaxSystem.cs
Content.Server/GameTicking/GameTicker.Spawning.cs
Content.Server/Objectives/Systems/KillPersonConditionSystem.cs
Content.Server/Station/Systems/StationSpawningSystem.cs
Content.Shared.Database/LogType.cs
Content.Shared/Ghost/GhostComponent.cs
Content.Shared/Humanoid/SharedHumanoidAppearanceSystem.cs
Content.Shared/Preferences/HumanoidCharacterProfile.cs
Content.Shared/Roles/SharedRoleSystem.cs
README.md
Resources/ConfigPresets/Corvax/common.toml
Resources/Credits/GitHub.txt
Resources/Locale/ru-RU/ss14-ru/prototypes/entities/mobs/cyborgs/base_borg_chassis.ftl
Resources/Maps/Shuttles/trading_outpost.yml
Resources/Prototypes/Corvax/Roles/Jobs/Command/iaa.yml
Resources/Prototypes/Corvax/Roles/Jobs/Security/brigmedic.yml
Resources/Prototypes/Corvax/Roles/Jobs/Security/pilot.yml
Resources/Prototypes/Entities/Clothing/OuterClothing/base_clothingouter.yml
Resources/Prototypes/Entities/Mobs/Customization/Markings/reptilian.yml
Resources/Prototypes/Entities/Mobs/Cyborgs/base_borg_chassis.yml
Resources/Prototypes/Entities/Objects/Weapons/Guns/Battery/battery_guns.yml
Resources/Prototypes/Entities/Objects/Weapons/Melee/sword.yml
Resources/Prototypes/Entities/Structures/Machines/chem_master.yml
Resources/Prototypes/Entities/Structures/Power/substation.yml
Resources/Prototypes/GameRules/cargo_gifts.yml
Resources/Prototypes/GameRules/events.yml
Resources/Prototypes/GameRules/meteorswarms.yml
Resources/Prototypes/Maps/bagel.yml
Resources/Prototypes/Reagents/Consumable/Drink/drinks.yml
Resources/Prototypes/Reagents/chemicals.yml
Resources/Prototypes/Reagents/medicine.yml
Resources/Prototypes/Reagents/pyrotechnic.yml
Resources/Prototypes/Reagents/toxins.yml
Resources/Prototypes/Recipes/Cooking/meal_recipes.yml
Resources/Prototypes/Roles/Jobs/Cargo/quartermaster.yml
Resources/Prototypes/Roles/Jobs/Command/captain.yml
Resources/Prototypes/Roles/Jobs/Command/head_of_personnel.yml
Resources/Prototypes/Roles/Jobs/Engineering/chief_engineer.yml
Resources/Prototypes/Roles/Jobs/Medical/chief_medical_officer.yml
Resources/Prototypes/Roles/Jobs/Medical/paramedic.yml
Resources/Prototypes/Roles/Jobs/Science/research_director.yml
Resources/Prototypes/Roles/Jobs/Security/detective.yml
Resources/Prototypes/Roles/Jobs/Security/head_of_security.yml
Resources/Prototypes/Roles/Jobs/Security/security_officer.yml
Resources/Prototypes/Roles/Jobs/Security/warden.yml
Resources/Prototypes/Voice/disease_emotes.yml
Resources/Prototypes/Voice/speech_emotes.yml
Resources/Prototypes/radio_channels.yml
Resources/Textures/Effects/speech.rsi/meta.json
Resources/Textures/Interface/Default/Slots/id.png
Resources/Textures/Interface/Minimalist/Slots/pda.png
Resources/Textures/Mobs/Customization/reptilian_parts.rsi/meta.json
Resources/Textures/Mobs/Silicon/chassis.rsi/meta.json
RobustToolbox
2025-06-02 12:30:02 +03:00
+71
25c5e59248
Upstream ( #3172 )
...
Signed-off-by: Prole <172158352+Prole0@users.noreply.github.com >
Co-authored-by: PJBot <pieterjan.briers+bot@gmail.com >
Co-authored-by: ScarKy0 <106310278+ScarKy0@users.noreply.github.com >
Co-authored-by: Samuka-C <47865393+Samuka-C@users.noreply.github.com >
Co-authored-by: ArtisticRoomba <145879011+ArtisticRoomba@users.noreply.github.com >
Co-authored-by: Partmedia <kevinz5000@gmail.com >
Co-authored-by: slarticodefast <161409025+slarticodefast@users.noreply.github.com >
Co-authored-by: themias <89101928+themias@users.noreply.github.com >
Co-authored-by: Victor Shen <71985089+Vexerot@users.noreply.github.com >
Co-authored-by: Ed <96445749+TheShuEd@users.noreply.github.com >
Co-authored-by: Milon <milonpl.git@proton.me >
Co-authored-by: Kirus59 <145689588+Kirus59@users.noreply.github.com >
Co-authored-by: Nemanja <98561806+EmoGarbage404@users.noreply.github.com >
Co-authored-by: Stomf <5dorkydorks@gmail.com >
Co-authored-by: drakewill-CRL <46307022+drakewill-CRL@users.noreply.github.com >
Co-authored-by: PraxisMapper <praxismapper@gmail.com >
Co-authored-by: EmoGarbage404 <retron404@gmail.com >
Co-authored-by: lzk <124214523+lzk228@users.noreply.github.com >
Co-authored-by: Princess Cheeseballs <66055347+Pronana@users.noreply.github.com >
Co-authored-by: IProduceWidgets <107586145+IProduceWidgets@users.noreply.github.com >
Co-authored-by: TytosB <54259736+TytosB@users.noreply.github.com >
Co-authored-by: abadaba695 <spacestation13thingy@gmail.com >
Co-authored-by: kosticia <kosticia46@gmail.com >
Co-authored-by: Thinbug <101073555+Thinbug0@users.noreply.github.com >
Co-authored-by: pathetic meowmeow <uhhadd@gmail.com >
Co-authored-by: SlamBamActionman <83650252+SlamBamActionman@users.noreply.github.com >
Co-authored-by: Boaz1111 <149967078+Boaz1111@users.noreply.github.com >
Co-authored-by: ActiveMammmoth <140334666+ActiveMammmoth@users.noreply.github.com >
Co-authored-by: Myra <vasilis@pikachu.systems >
Co-authored-by: Whatstone <166147148+whatston3@users.noreply.github.com >
Co-authored-by: Pieter-Jan Briers <pieterjan.briers+git@gmail.com >
Co-authored-by: K-Dynamic <20566341+K-Dynamic@users.noreply.github.com >
Co-authored-by: Gentleman-Bird <dcgreen406@gmail.com >
Co-authored-by: metalgearsloth <31366439+metalgearsloth@users.noreply.github.com >
Co-authored-by: BIGZi0348 <svalker0348@gmail.com >
Co-authored-by: LaCumbiaDelCoronavirus <90893484+LaCumbiaDelCoronavirus@users.noreply.github.com >
Co-authored-by: imatsoup <93290208+imatsoup@users.noreply.github.com >
Co-authored-by: Matthew Herber <32679887+happyrobot33@users.noreply.github.com >
Co-authored-by: Ertanic <36124833+Ertanic@users.noreply.github.com >
Co-authored-by: MissKay1994 <15877268+MissKay1994@users.noreply.github.com >
Co-authored-by: Errant <35878406+Errant-4@users.noreply.github.com >
Co-authored-by: eoineoineoin <helloworld@eoinrul.es >
Co-authored-by: Tiniest Shark <head.rebel@yahoo.com >
Co-authored-by: nikitosych <boriszyn@gmail.com >
Co-authored-by: Tayrtahn <tayrtahn@gmail.com >
Co-authored-by: Perry Fraser <perryprog@users.noreply.github.com >
Co-authored-by: YoungThug <ramialanbagy@gmail.com >
Co-authored-by: beck-thompson <107373427+beck-thompson@users.noreply.github.com >
Co-authored-by: metalgearsloth <comedian_vs_clown@hotmail.com >
Co-authored-by: Southbridge <7013162+southbridge-fur@users.noreply.github.com >
Co-authored-by: Vladislav Suchkov <20380250+murolem@users.noreply.github.com >
Co-authored-by: Prole <172158352+Prole0@users.noreply.github.com >
Co-authored-by: Unkn0wn_Gh0st <shadowstalkermll@gmail.com >
Co-authored-by: 3nderall <101940324+3nderall@users.noreply.github.com >
Co-authored-by: Radezolid <snappednexus@gmail.com >
Co-authored-by: J <billsmith116@gmail.com >
Co-authored-by: Ghagliiarghii <68826635+Ghagliiarghii@users.noreply.github.com >
Co-authored-by: chromiumboy <50505512+chromiumboy@users.noreply.github.com >
Co-authored-by: youtissoum <51883137+youtissoum@users.noreply.github.com >
Co-authored-by: Minemoder5000 <minemoder50000@gmail.com >
Co-authored-by: Spanky <scott@wearejacob.com >
Co-authored-by: Spessmann <156740760+Spessmann@users.noreply.github.com >
Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
Co-authored-by: brainfood1183 <113240905+brainfood1183@users.noreply.github.com >
Co-authored-by: Deerstop <edainturner@gmail.com >
Co-authored-by: B_Kirill <153602297+B-Kirill@users.noreply.github.com >
Co-authored-by: archee1 <archee3@hotmail.co.uk >
Co-authored-by: Cojoke <83733158+Cojoke-dot@users.noreply.github.com >
Co-authored-by: Quantum-cross <7065792+Quantum-cross@users.noreply.github.com >
Co-authored-by: poklj <compgeek223@gmail.com >
Co-authored-by: Krunklehorn <42424291+Krunklehorn@users.noreply.github.com >
Co-authored-by: OnyxTheBrave <131422822+OnyxTheBrave@users.noreply.github.com >
Co-authored-by: UpAndLeaves <92269094+Alpha-Two@users.noreply.github.com >
Co-authored-by: Flareguy <78941145+Flareguy@users.noreply.github.com >
Co-authored-by: Zalycon <84675130+Zalycon@users.noreply.github.com >
Co-authored-by: deltanedas <39013340+deltanedas@users.noreply.github.com >
Co-authored-by: Verm <32827189+Vermidia@users.noreply.github.com >
Co-authored-by: nikthechampiongr <32041239+nikthechampiongr@users.noreply.github.com >
Co-authored-by: ScarKy0 <scarky0@onet.eu >
Co-authored-by: Dmitry <57028746+dimm00n@users.noreply.github.com >
2025-05-24 11:00:17 +03:00
Milon and GitHub
3fc9bcbbbe
remove Session from MindComponent ( #34753 )
...
* yummy
* fix tests
2025-04-19 00:23:01 +02:00
Errant and GitHub
fb388d2265
Role subtypes ( #35359 )
2025-04-16 19:04:48 +02:00
LEVELcat
790070d410
Merge branch 'master' of https://github.com/space-syndicate/space-station-14 into upstreamAgain
...
# Resolved Conflicts:
# .github/workflows/publish.yml
# Content.IntegrationTests/Tests/Commands/SuicideCommandTests.cs
# Content.Server/Administration/Systems/BwoinkSystem.cs
# Content.Server/Corvax/StationGoal/StationGoalPaperSystem.cs
# Content.Server/DetailExaminable/DetailExaminableystem.cs
# Content.Server/GameTicking/GameTicker.Spawning.cs
# Content.Server/Ghost/GhostSystem.cs
# Content.Server/Light/EntitySystems/PoweredLightSystem.cs
# Content.Server/Station/Systems/StationSpawningSystem.cs
# Content.Server/Store/Systems/StoreSystem.Listings.cs
# Content.Server/Store/Systems/StoreSystem.Ui.cs
# Content.Shared.Database/LogType.cs
# Content.Shared/Damage/Systems/StaminaSystem.cs
# Content.Shared/Eye/VisibilityFlags.cs
# Content.Shared/Humanoid/Markings/MarkingCategories.cs
# Content.Shared/Humanoid/NamingSystem.cs
# Content.Shared/Humanoid/Prototypes/SpeciesPrototype.cs
# Content.Shared/Humanoid/SharedHumanoidAppearanceSystem.cs
# Directory.Packages.props
# Resources/Audio/Lobby/attributions.yml
# Resources/Credits/GitHub.txt
# Resources/Locale/ru-RU/ghost/roles/ghost-role-component.ftl
# Resources/Prototypes/Corvax/Reagents/Consumable/Drink/alcohol.yml
# Resources/Prototypes/Corvax/lobbyscreens.yml
# Resources/Prototypes/Entities/Mobs/Species/base.yml
# Resources/Prototypes/Entities/Mobs/Species/moth.yml
# Resources/Prototypes/Entities/Objects/Tools/toolbox.yml
# Resources/Prototypes/Entities/Objects/Weapons/Melee/sledgehammer.yml
# Resources/Prototypes/Entities/Structures/Shuttles/cannons.yml
# Resources/Prototypes/GameRules/events.yml
# Resources/Prototypes/Reagents/medicine.yml
# Resources/Prototypes/Roles/Jobs/Security/warden.yml
# Resources/Prototypes/SoundCollections/lobby.yml
# Resources/Prototypes/Species/arachnid.yml
# Resources/Prototypes/Species/diona.yml
# Resources/Prototypes/Species/moth.yml
# Resources/Prototypes/Species/reptilian.yml
# Resources/Prototypes/Species/vox.yml
# Resources/Prototypes/Voice/speech_emotes.yml
# Resources/Prototypes/game_presets.yml
# Resources/Prototypes/secret_weights.yml
# Resources/Textures/Corvax/LobbyScreens/attributions.yml
# Resources/Textures/Interface/Misc/job_icons.rsi/meta.json
2025-04-06 08:43:40 +03:00
LEVELcat
1d4ba544cc
Merge branch 'fixUPWL3' of https://github.com/Litogin/Ho
...
# Resolved Conflicts:
# Content.Client/Sprite/ContentSpriteSystem.cs
# Content.Server/Corvax/StationGoal/StationGoalCommand.cs
# Content.Server/Corvax/StationGoal/StationGoalPaperSystem.cs
# Content.Server/GameTicking/GameTicker.Spawning.cs
# Content.Server/Humanoid/Systems/HumanoidAppearanceSystem.cs
# Content.Server/Silicons/Borgs/BorgSystem.cs
# Content.Shared.Database/LogType.cs
# Content.Shared/Preferences/HumanoidCharacterProfile.cs
# Resources/Audio/Magic/attributions.yml
# Resources/Changelog/ChangelogSyndie.yml
# Resources/Credits/GitHub.txt
# Resources/Locale/ru-RU/guidebook/guides.ftl
# Resources/Prototypes/Actions/types.yml
# Resources/Prototypes/Catalog/VendingMachines/Inventories/games.yml
# Resources/Prototypes/Entities/Structures/Machines/base_structuremachines.yml
# Resources/Prototypes/Entities/Structures/Machines/lathe.yml
# Resources/Prototypes/Entities/Structures/Power/apc.yml
# Resources/Prototypes/Entities/Structures/Power/substation.yml
# Resources/Prototypes/Research/experimental.yml
# Resources/Prototypes/Roles/Jobs/Cargo/cargo_technician.yml
# Resources/Textures/Clothing/Head/Hoods/Coat/hoodbartender.rsi/equipped-HELMET.png
# Resources/Textures/Clothing/Head/Hoods/Coat/hoodbartender.rsi/icon.png
# Resources/Textures/Clothing/Head/Hoods/Coat/hoodbartender.rsi/meta.json
# Resources/Textures/Clothing/Head/Hoods/Coat/hoodcaptain.rsi/equipped-HELMET.png
# Resources/Textures/Clothing/Head/Hoods/Coat/hoodcaptain.rsi/icon.png
# Resources/Textures/Clothing/Head/Hoods/Coat/hoodcaptain.rsi/meta.json
# Resources/Textures/Clothing/Head/Hoods/Coat/hoodcargo.rsi/equipped-HELMET.png
# Resources/Textures/Clothing/Head/Hoods/Coat/hoodcargo.rsi/icon.png
# Resources/Textures/Clothing/Head/Hoods/Coat/hoodcargo.rsi/meta.json
# Resources/Textures/Clothing/Head/Hoods/Coat/hoodce.rsi/equipped-HELMET.png
# Resources/Textures/Clothing/Head/Hoods/Coat/hoodce.rsi/icon.png
# Resources/Textures/Clothing/Head/Hoods/Coat/hoodce.rsi/meta.json
# Resources/Textures/Clothing/Head/Hoods/Coat/hoodcentcom.rsi/equipped-HELMET.png
# Resources/Textures/Clothing/Head/Hoods/Coat/hoodcentcom.rsi/icon.png
# Resources/Textures/Clothing/Head/Hoods/Coat/hoodcentcom.rsi/meta.json
# Resources/Textures/Clothing/Head/Hoods/Coat/hoodchemist.rsi/equipped-HELMET.png
# Resources/Textures/Clothing/Head/Hoods/Coat/hoodchemist.rsi/icon.png
# Resources/Textures/Clothing/Head/Hoods/Coat/hoodchemist.rsi/meta.json
# Resources/Textures/Clothing/Head/Hoods/Coat/hoodcmo.rsi/equipped-HELMET.png
# Resources/Textures/Clothing/Head/Hoods/Coat/hoodcmo.rsi/icon.png
# Resources/Textures/Clothing/Head/Hoods/Coat/hoodcmo.rsi/meta.json
# Resources/Textures/Clothing/Head/Hoods/Coat/hooddefault.rsi/equipped-HELMET.png
# Resources/Textures/Clothing/Head/Hoods/Coat/hooddefault.rsi/icon.png
# Resources/Textures/Clothing/Head/Hoods/Coat/hooddefault.rsi/meta.json
# Resources/Textures/Clothing/Head/Hoods/Coat/hoodengi.rsi/equipped-HELMET.png
# Resources/Textures/Clothing/Head/Hoods/Coat/hoodengi.rsi/icon.png
# Resources/Textures/Clothing/Head/Hoods/Coat/hoodengi.rsi/meta.json
# Resources/Textures/Clothing/Head/Hoods/Coat/hoodhop.rsi/equipped-HELMET.png
# Resources/Textures/Clothing/Head/Hoods/Coat/hoodhop.rsi/icon.png
# Resources/Textures/Clothing/Head/Hoods/Coat/hoodhop.rsi/meta.json
# Resources/Textures/Clothing/Head/Hoods/Coat/hoodhos.rsi/equipped-HELMET.png
# Resources/Textures/Clothing/Head/Hoods/Coat/hoodhos.rsi/icon.png
# Resources/Textures/Clothing/Head/Hoods/Coat/hoodhos.rsi/meta.json
# Resources/Textures/Clothing/Head/Hoods/Coat/hoodhydro.rsi/equipped-HELMET.png
# Resources/Textures/Clothing/Head/Hoods/Coat/hoodhydro.rsi/icon.png
# Resources/Textures/Clothing/Head/Hoods/Coat/hoodhydro.rsi/meta.json
# Resources/Textures/Clothing/Head/Hoods/Coat/hoodjani.rsi/equipped-HELMET.png
# Resources/Textures/Clothing/Head/Hoods/Coat/hoodjani.rsi/icon.png
# Resources/Textures/Clothing/Head/Hoods/Coat/hoodjani.rsi/meta.json
# Resources/Textures/Clothing/Head/Hoods/Coat/hoodmed.rsi/equipped-HELMET.png
# Resources/Textures/Clothing/Head/Hoods/Coat/hoodmed.rsi/icon.png
# Resources/Textures/Clothing/Head/Hoods/Coat/hoodmed.rsi/meta.json
# Resources/Textures/Clothing/Head/Hoods/Coat/hoodminer.rsi/equipped-HELMET.png
# Resources/Textures/Clothing/Head/Hoods/Coat/hoodminer.rsi/icon.png
# Resources/Textures/Clothing/Head/Hoods/Coat/hoodminer.rsi/meta.json
# Resources/Textures/Clothing/Head/Hoods/Coat/hoodpara.rsi/equipped-HELMET.png
# Resources/Textures/Clothing/Head/Hoods/Coat/hoodpara.rsi/icon.png
# Resources/Textures/Clothing/Head/Hoods/Coat/hoodpara.rsi/meta.json
# Resources/Textures/Clothing/Head/Hoods/Coat/hoodqm.rsi/equipped-HELMET.png
# Resources/Textures/Clothing/Head/Hoods/Coat/hoodqm.rsi/icon.png
# Resources/Textures/Clothing/Head/Hoods/Coat/hoodqm.rsi/meta.json
# Resources/Textures/Clothing/Head/Hoods/Coat/hoodrd.rsi/equipped-HELMET.png
# Resources/Textures/Clothing/Head/Hoods/Coat/hoodrd.rsi/icon.png
# Resources/Textures/Clothing/Head/Hoods/Coat/hoodrd.rsi/meta.json
# Resources/Textures/Clothing/Head/Hoods/Coat/hoodrobo.rsi/equipped-HELMET.png
# Resources/Textures/Clothing/Head/Hoods/Coat/hoodrobo.rsi/icon.png
# Resources/Textures/Clothing/Head/Hoods/Coat/hoodrobo.rsi/meta.json
# Resources/Textures/Clothing/Head/Hoods/Coat/hoodsci.rsi/equipped-HELMET.png
# Resources/Textures/Clothing/Head/Hoods/Coat/hoodsci.rsi/icon.png
# Resources/Textures/Clothing/Head/Hoods/Coat/hoodsci.rsi/meta.json
# Resources/Textures/Clothing/Head/Hoods/Coat/hoodsec.rsi/equipped-HELMET.png
# Resources/Textures/Clothing/Head/Hoods/Coat/hoodsec.rsi/icon.png
# Resources/Textures/Clothing/Head/Hoods/Coat/hoodsec.rsi/meta.json
# Resources/Textures/Clothing/Head/Hoods/Coat/hoodsyndicate.rsi/equipped-HELMET.png
# Resources/Textures/Clothing/Head/Hoods/Coat/hoodsyndicate.rsi/icon.png
# Resources/Textures/Clothing/Head/Hoods/Coat/hoodsyndicate.rsi/meta.json
# Resources/Textures/Clothing/OuterClothing/WinterCoats/coat.rsi/ATMOS-equipped-OUTERCLOTHING.png
# Resources/Textures/Clothing/OuterClothing/WinterCoats/coat.rsi/BAR-equipped-OUTERCLOTHING.png
# Resources/Textures/Clothing/OuterClothing/WinterCoats/coat.rsi/BAR-icon.png
# Resources/Textures/Clothing/OuterClothing/WinterCoats/coat.rsi/CAP-equipped-OUTERCLOTHING.png
# Resources/Textures/Clothing/OuterClothing/WinterCoats/coat.rsi/CARGO-equipped-OUTERCLOTHING.png
# Resources/Textures/Clothing/OuterClothing/WinterCoats/coat.rsi/CE-equipped-OUTERCLOTHING.png
# Resources/Textures/Clothing/OuterClothing/WinterCoats/coat.rsi/CENTCOM-equipped-OUTERCLOTHING.png
# Resources/Textures/Clothing/OuterClothing/WinterCoats/coat.rsi/CHEM-equipped-OUTERCLOTHING.png
# Resources/Textures/Clothing/OuterClothing/WinterCoats/coat.rsi/CMO-equipped-OUTERCLOTHING.png
# Resources/Textures/Clothing/OuterClothing/WinterCoats/coat.rsi/ENGI-equipped-OUTERCLOTHING.png
# Resources/Textures/Clothing/OuterClothing/WinterCoats/coat.rsi/GENE-equipped-OUTERCLOTHING.png
# Resources/Textures/Clothing/OuterClothing/WinterCoats/coat.rsi/HOP-equipped-OUTERCLOTHING.png
# Resources/Textures/Clothing/OuterClothing/WinterCoats/coat.rsi/HYDRO-equipped-OUTERCLOTHING.png
# Resources/Textures/Clothing/OuterClothing/WinterCoats/coat.rsi/JANI-equipped-OUTERCLOTHING.png
# Resources/Textures/Clothing/OuterClothing/WinterCoats/coat.rsi/MED-equipped-OUTERCLOTHING.png
# Resources/Textures/Clothing/OuterClothing/WinterCoats/coat.rsi/MINER-equipped-OUTERCLOTHING.png
# Resources/Textures/Clothing/OuterClothing/WinterCoats/coat.rsi/PARA-equipped-OUTERCLOTHING.png
# Resources/Textures/Clothing/OuterClothing/WinterCoats/coat.rsi/QM-equipped-OUTERCLOTHING.png
# Resources/Textures/Clothing/OuterClothing/WinterCoats/coat.rsi/RD-equipped-OUTERCLOTHING.png
# Resources/Textures/Clothing/OuterClothing/WinterCoats/coat.rsi/ROBO-equipped-OUTERCLOTHING.png
# Resources/Textures/Clothing/OuterClothing/WinterCoats/coat.rsi/SCI-equipped-OUTERCLOTHING.png
# Resources/Textures/Clothing/OuterClothing/WinterCoats/coat.rsi/SYNDIE-equipped-OUTERCLOTHING.png
# Resources/Textures/Clothing/OuterClothing/WinterCoats/coat.rsi/VIRO-equipped-OUTERCLOTHING.png
# Resources/Textures/Clothing/OuterClothing/WinterCoats/coat.rsi/equipped-OUTERCLOTHING.png
2025-04-05 16:17:55 +03:00
JerryImMouse
f76d1edf27
Merge remote-tracking branch 'upstream/master' into upstream
...
# Conflicts:
# Content.Shared/Humanoid/NamingSystem.cs
# Content.Shared/Humanoid/Prototypes/SpeciesPrototype.cs
# Content.Shared/Humanoid/SharedHumanoidAppearanceSystem.cs
# Resources/Prototypes/Entities/Clothing/OuterClothing/specific.yml
# Resources/ServerInfo/Guidebook/Service/Botany.xml
# Resources/Textures/Clothing/Head/Hats/capcap.rsi/inhand-left.png
# Resources/Textures/Clothing/Head/Hats/capcap.rsi/inhand-right.png
# Resources/Textures/Clothing/Head/Hats/capcap.rsi/meta.json
# Resources/Textures/Interface/Misc/job_icons.rsi/meta.json
# Resources/Textures/Objects/Specific/Hydroponics/aloe.rsi/meta.json
# Resources/Textures/Objects/Specific/Hydroponics/aloe.rsi/produce.png
# Resources/Textures/Objects/Specific/Hydroponics/apple.rsi/meta.json
# Resources/Textures/Objects/Specific/Hydroponics/apple.rsi/produce.png
# Resources/Textures/Objects/Specific/Hydroponics/berries.rsi/meta.json
# Resources/Textures/Objects/Specific/Hydroponics/blood_tomato.rsi/meta.json
# Resources/Textures/Objects/Specific/Hydroponics/blood_tomato.rsi/produce.png
# Resources/Textures/Objects/Specific/Hydroponics/blue_tomato.rsi/meta.json
# Resources/Textures/Objects/Specific/Hydroponics/blue_tomato.rsi/produce.png
# Resources/Textures/Objects/Specific/Hydroponics/cabbage.rsi/meta.json
# Resources/Textures/Objects/Specific/Hydroponics/cabbage.rsi/produce.png
# Resources/Textures/Objects/Specific/Hydroponics/carrot.rsi/meta.json
# Resources/Textures/Objects/Specific/Hydroponics/chanterelle.rsi/meta.json
# Resources/Textures/Objects/Specific/Hydroponics/chili.rsi/meta.json
# Resources/Textures/Objects/Specific/Hydroponics/chili.rsi/produce.png
# Resources/Textures/Objects/Specific/Hydroponics/chilly.rsi/meta.json
# Resources/Textures/Objects/Specific/Hydroponics/chilly.rsi/produce.png
# Resources/Textures/Objects/Specific/Hydroponics/corn.rsi/meta.json
# Resources/Textures/Objects/Specific/Hydroponics/corn.rsi/produce.png
# Resources/Textures/Objects/Specific/Hydroponics/cotton.rsi/meta.json
# Resources/Textures/Objects/Specific/Hydroponics/eggplant.rsi/meta.json
# Resources/Textures/Objects/Specific/Hydroponics/eggplant.rsi/produce.png
# Resources/Textures/Objects/Specific/Hydroponics/eggy.rsi/meta.json
# Resources/Textures/Objects/Specific/Hydroponics/fly_amanita.rsi/meta.json
# Resources/Textures/Objects/Specific/Hydroponics/fly_amanita.rsi/produce.png
# Resources/Textures/Objects/Specific/Hydroponics/galaxythistle.rsi/meta.json
# Resources/Textures/Objects/Specific/Hydroponics/garlic.rsi/meta.json
# Resources/Textures/Objects/Specific/Hydroponics/garlic.rsi/produce.png
# Resources/Textures/Objects/Specific/Hydroponics/gatfruit.rsi/meta.json
# Resources/Textures/Objects/Specific/Hydroponics/golden_apple.rsi/meta.json
# Resources/Textures/Objects/Specific/Hydroponics/golden_apple.rsi/produce.png
# Resources/Textures/Objects/Specific/Hydroponics/grape.rsi/meta.json
# Resources/Textures/Objects/Specific/Hydroponics/grape.rsi/produce.png
# Resources/Textures/Objects/Specific/Hydroponics/lemon.rsi/meta.json
# Resources/Textures/Objects/Specific/Hydroponics/lemon.rsi/produce.png
# Resources/Textures/Objects/Specific/Hydroponics/lemoon.rsi/meta.json
# Resources/Textures/Objects/Specific/Hydroponics/lily.rsi/meta.json
# Resources/Textures/Objects/Specific/Hydroponics/lily.rsi/produce.png
# Resources/Textures/Objects/Specific/Hydroponics/lime.rsi/meta.json
# Resources/Textures/Objects/Specific/Hydroponics/lime.rsi/produce.png
# Resources/Textures/Objects/Specific/Hydroponics/onion_red.rsi/meta.json
# Resources/Textures/Objects/Specific/Hydroponics/onion_red.rsi/produce.png
# Resources/Textures/Objects/Specific/Hydroponics/orange.rsi/meta.json
# Resources/Textures/Objects/Specific/Hydroponics/orange.rsi/produce.png
# Resources/Textures/Objects/Specific/Hydroponics/poppy.rsi/meta.json
# Resources/Textures/Objects/Specific/Hydroponics/poppy.rsi/produce.png
# Resources/Textures/Objects/Specific/Hydroponics/potato.rsi/meta.json
# Resources/Textures/Objects/Specific/Hydroponics/potato.rsi/produce.png
# Resources/Textures/Objects/Specific/Hydroponics/pyrotton.rsi/meta.json
# Resources/Textures/Objects/Specific/Hydroponics/soybeans.rsi/meta.json
# Resources/Textures/Objects/Specific/Hydroponics/soybeans.rsi/produce.png
# Resources/Textures/Objects/Specific/Hydroponics/steelcap.rsi/meta.json
# Resources/Textures/Objects/Specific/Hydroponics/sugarcane.rsi/meta.json
# Resources/Textures/Objects/Specific/Hydroponics/sugarcane.rsi/produce.png
# Resources/Textures/Objects/Specific/Hydroponics/tomato.rsi/meta.json
# Resources/Textures/Objects/Specific/Hydroponics/tomato.rsi/produce.png
# Resources/Textures/Objects/Specific/Hydroponics/watermelon.rsi/meta.json
# Resources/Textures/Objects/Specific/Hydroponics/watermelon.rsi/produce.png
# Resources/Textures/Objects/Specific/Hydroponics/watermelon.rsi/slice.png
# Resources/Textures/Objects/Weapons/Grenades/flashbang.rsi/meta.json
# Resources/Textures/Objects/Weapons/Grenades/grenade.rsi/meta.json
# Resources/Textures/Objects/Weapons/Grenades/metalfoam.rsi/meta.json
# Resources/Textures/Objects/Weapons/Grenades/modular.rsi/meta.json
# Resources/Textures/Objects/Weapons/Grenades/nukenade.rsi/meta.json
# Resources/Textures/Objects/Weapons/Grenades/pyrogrenade.rsi/meta.json
# Resources/Textures/Objects/Weapons/Grenades/shrapnelgrenade.rsi/meta.json
# Resources/Textures/Objects/Weapons/Grenades/singularitygrenade.rsi/meta.json
# Resources/Textures/Objects/Weapons/Grenades/stingergrenade.rsi/meta.json
# Resources/Textures/Objects/Weapons/Grenades/syndgrenade.rsi/meta.json
# Resources/Textures/Objects/Weapons/Grenades/whiteholegrenade.rsi/meta.json
# Resources/Textures/Structures/Furniture/rollerbeds.rsi/meta.json
# Resources/Textures/Structures/Wallmounts/posters.rsi/meta.json
2025-03-27 23:01:47 +05:00
72141abf8a
Admin playerlist antag presentation rework ( #35538 )
...
* refactor(src): Minor refactor of Draw in "AdminNameOverlay. And new info about playtime player
* fix(src): Add configure classic admin owerlay
* fix
* antag status indication rework
* the cvars are free, you can just take them
* update playerlist on cvar change
* more overlay options
* tweak(src): Use _antagLabelClassic and tweak style
* tweak(src): Add config display overlay for startingJob and playTime
* tweak(src): Vector2 is replaced by var
* tweak(src): return to the end of the list
* add new option checkboxes
* passing ConfigurationManager through constructor, some format changes
* made sorting values more futureproof
* comments
* labels
* no point commenting this out when the overlay stack PR will uncomment it again anyway
* sorting prototype
* localize symbols because why not
* symmetry
* Revert "localize symbols because why not"
This reverts commit 922d4030300285a45777d62fcfd9c74b25fe7a60.
* layout and formatting stuff
* fix errant space
---------
Co-authored-by: Schrödinger <132720404+Schrodinger71@users.noreply.github.com >
2025-03-25 17:03:59 +01:00
Zekins
7d6f564344
Merge remote-tracking branch 'upstream/master' into upstream
2025-03-18 02:40:46 +03:00
Errant and GitHub
6f23e10495
Players with unknown playtimes now are tagged as new players, take 2 ( #35648 )
...
* your commit? our commit.
* skreee
* show joined players before lobby players; comments
* comments
* playerinfo retains playtime data after disconnect
* new connection status symbols
2025-03-05 08:25:42 -08:00
lzk228
0af3e04fd8
Merge commit '3551eb04115854cdbbf1841f5960c3cdbc508583' into 02-19-upstream
...
# Conflicts:
# Content.Server/Administration/Systems/AdminSystem.cs
# Content.Server/Doors/Systems/AirlockSystem.cs
# Content.Server/Holopad/HolopadSystem.cs
# Content.Server/Humanoid/Systems/HumanoidAppearanceSystem.cs
# Resources/Prototypes/Catalog/Fills/Lockers/heads.yml
# Resources/Prototypes/Catalog/VendingMachines/Inventories/curadrobe.yml
# Resources/Prototypes/Datasets/Names/borg.yml
# Resources/Prototypes/Datasets/ion_storm.yml
# Resources/Prototypes/Entities/Clothing/Head/hardsuit-helmets.yml
# Resources/Prototypes/Entities/Clothing/Neck/mantles.yml
# Resources/Prototypes/Entities/Objects/Weapons/Guns/Shotguns/shotguns.yml
# Resources/Prototypes/Entities/Stations/base.yml
# Resources/Prototypes/Entities/Structures/Machines/lathe.yml
# Resources/Prototypes/Maps/amber.yml
# Resources/Prototypes/Maps/box.yml
# Resources/Prototypes/Maps/convex.yml
# Resources/Prototypes/Maps/fland.yml
# Resources/Prototypes/Maps/meta.yml
# Resources/Prototypes/Maps/plasma.yml
# Resources/ServerInfo/Guidebook/Engineering/AME.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/RTG.xml
# Resources/ServerInfo/Guidebook/Engineering/Shuttlecraft.xml
# Resources/ServerInfo/Guidebook/Engineering/Singularity.xml
# Resources/ServerInfo/Guidebook/Engineering/TEG.xml
# Resources/ServerInfo/Guidebook/NewPlayer/Controls/Controls.xml
# Resources/Textures/Clothing/Head/Helmets/paramedhelm.rsi/icon.png
# Resources/Textures/Clothing/Head/Helmets/paramedhelm.rsi/inhand-left.png
# Resources/Textures/Clothing/Head/Helmets/paramedhelm.rsi/inhand-right.png
# Resources/Textures/Clothing/OuterClothing/Hardsuits/goliath.rsi/meta.json
# Resources/Textures/Clothing/OuterClothing/Hardsuits/paramed.rsi/meta.json
# Resources/Textures/Clothing/OuterClothing/Vests/hazard.rsi/equipped-OUTERCLOTHING.png
# Resources/Textures/Clothing/OuterClothing/Vests/hazard.rsi/icon.png
# Resources/Textures/Clothing/OuterClothing/Vests/hazard.rsi/meta.json
# Resources/Textures/Clothing/Uniforms/Jumpsuit/ancient.rsi/meta.json
# Resources/Textures/Clothing/Uniforms/Jumpsuit/security_trooper.rsi/inhand-right.png
# Resources/Textures/Interface/Actions/actions_fakemindshield.rsi/icon-on.png
# Resources/Textures/Objects/Storage/Briefcases/briefcase_brown.rsi/icon.png
# Resources/Textures/Objects/Storage/Briefcases/briefcase_brown.rsi/meta.json
# Resources/Textures/Objects/Storage/boxes.rsi/beaker.png
# Resources/Textures/Objects/Storage/boxes.rsi/bodybags.png
# Resources/Textures/Objects/Storage/boxes.rsi/bottle.png
# Resources/Textures/Objects/Storage/boxes.rsi/box.png
# Resources/Textures/Objects/Storage/boxes.rsi/box_hug.png
# Resources/Textures/Objects/Storage/boxes.rsi/box_of_doom.png
# Resources/Textures/Objects/Storage/boxes.rsi/box_of_doom_big.png
# Resources/Textures/Objects/Storage/boxes.rsi/box_science.png
# Resources/Textures/Objects/Storage/boxes.rsi/box_security.png
# Resources/Textures/Objects/Storage/boxes.rsi/boxwide.png
# Resources/Textures/Objects/Storage/boxes.rsi/boxwidetoy.png
# Resources/Textures/Objects/Storage/boxes.rsi/candle.png
# Resources/Textures/Objects/Storage/boxes.rsi/circuit.png
# Resources/Textures/Objects/Storage/boxes.rsi/clown.png
# Resources/Textures/Objects/Storage/boxes.rsi/darts.png
# Resources/Textures/Objects/Storage/boxes.rsi/disk.png
# Resources/Textures/Objects/Storage/boxes.rsi/emergencytank.png
# Resources/Textures/Objects/Storage/boxes.rsi/encryptokey.png
# Resources/Textures/Objects/Storage/boxes.rsi/evidence_markers.png
# Resources/Textures/Objects/Storage/boxes.rsi/extendedtank.png
# Resources/Textures/Objects/Storage/boxes.rsi/flare.png
# Resources/Textures/Objects/Storage/boxes.rsi/flashbang.png
# Resources/Textures/Objects/Storage/boxes.rsi/forensic.png
# Resources/Textures/Objects/Storage/boxes.rsi/glasses.png
# Resources/Textures/Objects/Storage/boxes.rsi/handcuff.png
# Resources/Textures/Objects/Storage/boxes.rsi/headset.png
# Resources/Textures/Objects/Storage/boxes.rsi/heart.png
# Resources/Textures/Objects/Storage/boxes.rsi/holo.png
# Resources/Textures/Objects/Storage/boxes.rsi/implant.png
# Resources/Textures/Objects/Storage/boxes.rsi/inflatable.png
# Resources/Textures/Objects/Storage/boxes.rsi/internals.png
# Resources/Textures/Objects/Storage/boxes.rsi/latex.png
# Resources/Textures/Objects/Storage/boxes.rsi/light.png
# Resources/Textures/Objects/Storage/boxes.rsi/lightmixed.png
# Resources/Textures/Objects/Storage/boxes.rsi/lighttube.png
# Resources/Textures/Objects/Storage/boxes.rsi/magazine.png
# Resources/Textures/Objects/Storage/boxes.rsi/meson.png
# Resources/Textures/Objects/Storage/boxes.rsi/meta.json
# Resources/Textures/Objects/Storage/boxes.rsi/mousetraps.png
# Resources/Textures/Objects/Storage/boxes.rsi/nitrile.png
# Resources/Textures/Objects/Storage/boxes.rsi/omegacart.png
# Resources/Textures/Objects/Storage/boxes.rsi/pda.png
# Resources/Textures/Objects/Storage/boxes.rsi/pillbox.png
# Resources/Textures/Objects/Storage/boxes.rsi/sechud.png
# Resources/Textures/Objects/Storage/boxes.rsi/shellbeanbag.png
# Resources/Textures/Objects/Storage/boxes.rsi/shellflare.png
# Resources/Textures/Objects/Storage/boxes.rsi/shellflash.png
# Resources/Textures/Objects/Storage/boxes.rsi/shellincendiary.png
# Resources/Textures/Objects/Storage/boxes.rsi/shelllethal.png
# Resources/Textures/Objects/Storage/boxes.rsi/shellpractice.png
# Resources/Textures/Objects/Storage/boxes.rsi/shellslug.png
# Resources/Textures/Objects/Storage/boxes.rsi/shelltoy.png
# Resources/Textures/Objects/Storage/boxes.rsi/solution_trays.png
# Resources/Textures/Objects/Storage/boxes.rsi/sterile.png
# Resources/Textures/Objects/Storage/boxes.rsi/swab.png
# Resources/Textures/Objects/Storage/boxes.rsi/syringe.png
# Resources/Textures/Objects/Storage/boxes.rsi/trashbag.png
# Resources/Textures/Objects/Storage/boxes.rsi/vials.png
# Resources/Textures/Objects/Storage/boxes.rsi/writing.png
# Resources/Textures/Objects/Storage/boxes.rsi/writing_of_doom.png
# Resources/Textures/Objects/Storage/boxes.rsi/ziptie.png
# Resources/Textures/Objects/Tiles/tile.rsi/meta.json
# Resources/Textures/Objects/Weapons/Grenades/empgrenade.rsi/icon.png
# Resources/Textures/Objects/Weapons/Grenades/empgrenade.rsi/meta.json
# Resources/Textures/Objects/Weapons/Grenades/empgrenade.rsi/primed.png
# Resources/Textures/Objects/Weapons/Grenades/flashbang.rsi/icon.png
# Resources/Textures/Objects/Weapons/Grenades/flashbang.rsi/meta.json
# Resources/Textures/Objects/Weapons/Grenades/flashbang.rsi/primed.png
# Resources/Textures/Objects/Weapons/Grenades/stingergrenade.rsi/icon.png
# Resources/Textures/Objects/Weapons/Grenades/stingergrenade.rsi/meta.json
# Resources/Textures/Objects/Weapons/Grenades/stingergrenade.rsi/primed.png
# Resources/Textures/Objects/Weapons/Guns/Battery/antiquelasergun.rsi/base.png
# Resources/Textures/Objects/Weapons/Guns/Battery/antiquelasergun.rsi/icon.png
# Resources/Textures/Objects/Weapons/Guns/Battery/antiquelasergun.rsi/mag-unshaded-1.png
# Resources/Textures/Objects/Weapons/Guns/Battery/antiquelasergun.rsi/mag-unshaded-2.png
# Resources/Textures/Objects/Weapons/Guns/Battery/antiquelasergun.rsi/mag-unshaded-3.png
# Resources/Textures/Objects/Weapons/Guns/Battery/antiquelasergun.rsi/mag-unshaded-4.png
# Resources/Textures/Objects/Weapons/Guns/Battery/antiquelasergun.rsi/meta.json
# Resources/Textures/Objects/Weapons/Guns/Rifles/lecter.rsi/equipped-BACKPACK.png
# Resources/Textures/Objects/Weapons/Guns/SMGs/vector.rsi/equipped-BACKPACK.png
# Resources/Textures/Objects/Weapons/Guns/Shotguns/pump.rsi/equipped-BACKPACK.png
2025-02-19 03:00:13 +01:00
Zachary Higgs and GitHub
1c8e7443ae
Move DnaComponent to shared ( #35012 )
...
* Move DnaComponent to shared
- Add Using statements to AdminSystem and StationRecordsSystem to point
to Content.Shared.Forensics
* Proper namespacing
* Revert an un-intended change
* Add Networking to DNA Component
* CR - Remove ("dna")
* CR - add back ("dna") tag
2025-02-10 04:36:01 +01:00
Pupchansky
1c7c8dd82b
Полный фикс ошибок апстрима + АПСТРИМ
2025-02-03 08:48:35 +05:00
Errant and GitHub
ae213066b1
HOTFIX Admin playerlist character update fix ( #34560 )
...
fix IdentityChangedEvent subscription
2025-01-21 23:48:07 +01:00
Morb0
996b761d80
Merge remote-tracking branch 'wizards/master' into upstream-sync
...
# Conflicts:
# Content.Packaging/ClientPackaging.cs
# Content.Server/Administration/Systems/AdminSystem.cs
# Content.Server/GameTicking/GameTicker.StatusShell.cs
# Content.Shared/Preferences/HumanoidCharacterProfile.cs
# Resources/Prototypes/Entities/Stations/base.yml
# Resources/Prototypes/Entities/Structures/Machines/lathe.yml
# Resources/Textures/Interface/Misc/job_icons.rsi/meta.json
# Resources/Textures/Structures/Power/Generation/Singularity/singularity_1.rsi/meta.json
# Resources/Textures/Structures/Power/Generation/Singularity/singularity_2.rsi/meta.json
# Resources/Textures/Structures/Power/Generation/Singularity/singularity_3.rsi/meta.json
# Resources/Textures/Structures/Power/Generation/Singularity/singularity_4.rsi/meta.json
# Resources/Textures/Structures/Power/Generation/Singularity/singularity_5.rsi/meta.json
# Resources/Textures/Structures/Power/Generation/Singularity/singularity_6.rsi/meta.json
2025-01-16 13:37:26 +03:00
Myra and GitHub
6041c828de
Remove baby jail ( #34443 )
...
* Remove baby jail
Closes #33893
* Test fail fix.
2025-01-15 22:08:15 +01:00
Morb0
6c09b978a3
Merge remote-tracking branch 'wizards/master' into upstream-sync
...
# Conflicts:
# Content.IntegrationTests/Tests/PostMapInitTest.cs
# Content.Server/Telephone/TelephoneSystem.cs
# LICENSE.TXT
# Resources/Prototypes/Datasets/ion_storm.yml
# Resources/Prototypes/Entities/Structures/Machines/lathe.yml
# Resources/Prototypes/Guidebook/rules.yml
# Resources/Prototypes/Maps/meta.yml
# Resources/Prototypes/SoundCollections/NukeMusic.yml
# Resources/ServerInfo/Guidebook/Chemicals.xml
# Resources/Textures/Structures/Wallmounts/posters.rsi/meta.json
# Resources/Textures/Structures/Wallmounts/signs.rsi/meta.json
2025-01-12 19:59:31 +03:00
46d58bf22a
Role Types ( #33420 )
...
* mindcomponent namespace
* wip MindRole stuff
* admin player tab
* mindroletype comment
* mindRolePrototype redesign
* broken param
* wip RoleType implementation
* basic role type switching for antags
* traitor fix
* fix AdminPanel update
* the renameningTM
* cleanup
* feature uncreeping
* roletypes on mind roles
* update MindComponent.RoleType when MindRoles change
* ghostrole configuration
* ghostrole config improvements
* live update of roleType on the character window
* logging stuff and notes
* remove thing no one asked for
* weh
* Mind Role Entities wip
* headrev count fix
* silicon stuff, cleanup
* exclusive antag config, cleanup
* jobroleadd overwerite
* logging stuff
* MindHasRole cleanup, admin log stuff
* last second cleanup
* ocd
* move roletypeprototype to its own file, minor note stuff
* remove Roletype.Created
* log stuff
* roletype setup for ghostroles and autotraitor reinforcements
* ghostrole type configs
* adjustable admin overlay
* cleanup
* fix this in its own PR
* silicon antagonist
* borg stuff
* mmi roletype handling
* spawnable borg roletype handling
* weh
* ghost role cleanup
* weh
* RoleEvent update
* polish
* log stuff
* admin overlay config
* ghostrolecomponent cleanup
* weh
* admin overlay code cleanup
* minor cleanup
* Obsolete MindRoleAddedEvent
* comment
* minor code cleanup
* MindOnDoGreeting fix
* Role update message
* fix duplicate job greeting for cyborgs
* fix emag job message dupe
* nicer-looking role type update
* crew aligned
* syndicate assault borg role fix
* fix test fail
* fix a merge mistake
* fix LoneOp role type
* Update Content.Client/Administration/AdminNameOverlay.cs
Co-authored-by: slarticodefast <161409025+slarticodefast@users.noreply.github.com >
* Update Content.Shared/Roles/SharedRoleSystem.cs
Co-authored-by: slarticodefast <161409025+slarticodefast@users.noreply.github.com >
* comment formatting
Co-authored-by: slarticodefast <161409025+slarticodefast@users.noreply.github.com >
* change logging category
Co-authored-by: slarticodefast <161409025+slarticodefast@users.noreply.github.com >
* fix a space
Co-authored-by: slarticodefast <161409025+slarticodefast@users.noreply.github.com >
* use MindAddRoles
Co-authored-by: slarticodefast <161409025+slarticodefast@users.noreply.github.com >
* get MindComponent from TryGetMind
Co-authored-by: slarticodefast <161409025+slarticodefast@users.noreply.github.com >
* move var declaration outside loop
* remove TryComp
* take RoleEnum behind the barn
* don't use ensurecomp unnecessarily
* cvar comments
* toggleableghostrolecomponent documentation
* skrek
* use EntProtoId
* mindrole config
* merge baserolecomponent into basemindrolecomponent
* ai and borg silicon role tweaks
* formatting
Co-authored-by: slarticodefast <161409025+slarticodefast@users.noreply.github.com >
* I will end you (the color)
Co-authored-by: slarticodefast <161409025+slarticodefast@users.noreply.github.com >
* use LocId type for a locale id
* update RoleEvent documentation
* update RoleEvent documentation
* remove obsolete MindRoleAddedEvent
* refine MindRolesUpdate()
* use dependency
Co-authored-by: slarticodefast <161409025+slarticodefast@users.noreply.github.com >
* inject dependency
Co-authored-by: slarticodefast <161409025+slarticodefast@users.noreply.github.com >
* roleType.Name no longer required
* reformatted draw code logic
* GhostRoleMarkerRoleComponent comment
* minor SharedRoleSystem cleanup
* StartingMindRoleComponent, unhardcode roundstart silicon
* Update Content.Shared/Roles/SharedRoleSystem.cs
* remove a whitespace
---------
Co-authored-by: slarticodefast <161409025+slarticodefast@users.noreply.github.com >
2025-01-11 22:17:26 +01:00
Morb0
6106783f01
Merge remote-tracking branch 'wizards/master' into upstream-sync
...
# Conflicts:
# .github/CODEOWNERS
# .github/labeler.yml
# Content.Server/Connection/ConnectionManager.cs
# Resources/Prototypes/Datasets/Names/ai.yml
# Resources/Prototypes/Datasets/Names/arachnid_first.yml
# Resources/Prototypes/Datasets/Names/diona.yml
# Resources/Prototypes/Datasets/Names/fake_human_first.yml
# Resources/Prototypes/Datasets/Names/fake_human_last.yml
# Resources/Prototypes/Datasets/Names/last.yml
# Resources/Prototypes/Datasets/Names/vox.yml
# Resources/Prototypes/Entities/Clothing/Shoes/specific.yml
# Resources/Prototypes/Entities/Structures/Machines/lathe.yml
# Resources/Prototypes/Loadouts/role_loadouts.yml
# Resources/Prototypes/Maps/bagel.yml
# Resources/Prototypes/SoundCollections/NukeMusic.yml
# Resources/Prototypes/Voice/speech_emotes.yml
# Resources/ServerInfo/Guidebook/Mobs/Vox.xml
# Resources/ServerInfo/Guidebook/Science/APE.xml
# Resources/Textures/Clothing/Head/Hats/warden.rsi/inhand-left.png
# Resources/Textures/Clothing/Head/Hats/warden.rsi/inhand-right.png
# Resources/Textures/Clothing/Head/Hats/warden.rsi/meta.json
2024-12-26 00:30:02 +03:00
slarticodefast and GitHub
e7294bdf4f
Only disable panicbunker for admins with AdminFlags.Admin ( #33879 )
...
* Only disable panicbunker for admins with AdminFlags.Admin
* nicer curly braces
2024-12-18 14:15:04 +01:00
Pupchansky
12856b9330
Апстрим
2024-09-21 22:08:48 +05:00
Morb0
34d3cf6293
Merge remote-tracking branch 'refs/remotes/wizards/master' into upstream-sync
...
# Conflicts:
# .github/workflows/publish.yml
# Resources/Prototypes/Datasets/Names/ai.yml
# Resources/Prototypes/Entities/Mobs/Player/admin_ghost.yml
# Resources/ServerInfo/Guidebook/Engineering/PortableGenerator.xml
# Resources/ServerInfo/Guidebook/Security/Defusal.xml
# Resources/ServerInfo/Guidebook/Service/FoodRecipes.xml
2024-09-19 10:30:01 +03:00
nikthechampiongr and GitHub
ee434e397d
Rename fix ( #31654 )
...
* Localize RenameCommand and delegate most of the process to MetaDataSystem.SetEntityName()
* Make renaming rely on the EntityRenamedEvent. Fix issue where renaming would keep old Examine text
Requires engine change
* Fix localisation strings
* Make PDA search be based on a renamed entity's Uid instead of its old name
To do this the pda component now has an PdaOwner field which gets
assigned when it is given as a loadout to a player
* Fix bad merge???
huh
* Use AllEntityQuery
2024-09-15 11:55:03 +10:00
Pupchansky
eeac48430f
ups
2024-09-06 11:35:40 +05:00
Morb0
06709810c9
Merge remote-tracking branch 'refs/remotes/wizards/master' into upstream-sync
2024-08-31 14:55:55 +03:00
nikthechampiongr and GitHub
9a63144636
Allow for respawn and erase verb to be used on offline players. Also minor rewrite on respawn command and new erase command ( #30433 )
...
* Localize respawn command, allow for it to use userids, and make it use [Dependency] attributes
* Make respawn verb available for offline players
* Make erase available for offline players
A thousand admins rejoice
* Reorder verbs in code
* Add erase command
* Fix localisation for erase command
* Address reviews and add completion to respawn command
* Complete reviews which I forgor
2024-08-31 21:38:03 +10:00
Pupchansky
5c05c21dfc
Ещё немного послеапстримских фиксов
2024-08-21 14:09:03 +05:00
Pupchansky
2239d847ef
Апстрим
2024-08-21 13:32:48 +05:00
Morb0
a0bce916fb
Merge remote-tracking branch 'refs/remotes/upstream/master' into upstream-sync
...
# Conflicts:
# Content.Server/Administration/Systems/AdminSystem.cs
# Content.Server/Chat/Managers/ChatManager.cs
# Resources/Prototypes/Entities/Objects/Consumable/Food/produce.yml
# Resources/Prototypes/Entities/Objects/Weapons/Melee/e_sword.yml
# Resources/Prototypes/Guidebook/rules.yml
# Resources/Prototypes/Maps/cluster.yml
# Resources/Prototypes/Maps/europa.yml
# Resources/Prototypes/Maps/origin.yml
2024-08-16 14:29:08 +03:00
40b9fd4ea3
Namespace cleanup around Mind Roles ( #30965 )
...
* namespaces
* Comment does not need a semicolon
---------
Co-authored-by: Vasilis <vascreeper@yahoo.com >
2024-08-15 20:26:57 +02:00
Pupchansky
47219854c5
Апстрим, ура
2024-07-22 10:56:38 +05:00
Morb0
8ffde2eea4
Merge remote-tracking branch 'refs/remotes/upstream/master' into upstream-sync
...
# Conflicts:
# .github/workflows/publish.yml
# .github/workflows/test-packaging.yml
# Content.Server/Administration/Systems/AdminSystem.cs
# Resources/Prototypes/Entities/Clothing/Hands/gloves.yml
# Resources/Textures/Clothing/Head/Hardhats/blue.rsi/icon.png
# Resources/Textures/Clothing/Head/Hardhats/blue.rsi/light-icon.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/red.rsi/icon.png
# Resources/Textures/Clothing/Head/Hardhats/red.rsi/light-icon.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/yellow.rsi/icon.png
# Resources/Textures/Clothing/Head/Hardhats/yellow.rsi/light-icon.png
# Tools/gen_build_info.py
2024-07-14 12:15:16 +03:00
mosleyos
fe583f66bb
upstream-sync
2024-07-13 18:39:47 +03:00
Chief-Engineer and GitHub
6371a04621
Fix baby jail ( #29896 )
...
* Revert "Revert Baby Jail (#29891 )"
This reverts commit 24a2866747
2024-07-11 15:14:01 +10:00
Morb0
6d1173b8f3
Merge remote-tracking branch 'refs/remotes/upstream/master' into upstream-sync
...
# Conflicts:
# .github/labeler.yml
# Content.Server/Administration/Systems/AdminSystem.cs
# Content.Shared/Chat/TypingIndicator/TypingChangedEvent.cs
2024-07-11 04:43:23 +03:00
Vasilis and GitHub
24a2866747
Revert Baby Jail ( #29891 )
...
* Revert "SS14-28662 Add Baby Jail: a Jail for Babies (inverse panic bunker) (#28763 )"
This reverts commit 3ceb92a0c4
2024-07-11 10:33:47 +10:00
Pupchansky
5ce2c1da92
Синх с апстримом, юху
2024-06-17 16:02:30 +05:00
