Vigers Ray
84c607c84a
Merge remote-tracking branch 'space-wizards/master'
...
# Conflicts:
# Content.Client/Administration/UI/Tabs/PlayerTab/PlayerTab.xaml.cs
# Content.Client/Administration/UI/Tabs/PlayerTab/PlayerTabEntry.xaml
# Content.Client/Administration/UI/Tabs/PlayerTab/PlayerTabEntry.xaml.cs
# Content.Client/Administration/UI/Tabs/PlayerTab/PlayerTabHeader.xaml
# Content.Client/Administration/UI/Tabs/PlayerTab/PlayerTabHeader.xaml.cs
# Content.Server/Administration/Systems/AdminSystem.cs
# Content.Server/Administration/Systems/AdminVerbSystem.Antags.cs
# Content.Server/Ghost/GhostSystem.cs
# Resources/Locale/en-US/_strings/administration/antag.ftl
# Resources/Locale/en-US/_strings/administration/commands/adminnotes.ftl
# Resources/Locale/en-US/_strings/construction/components/block-anchor-component.ftl
# Resources/Locale/en-US/_strings/power/commands.ftl
# Resources/Prototypes/Catalog/VendingMachines/Inventories/clothesmate.yml
# Resources/Textures/Interface/Misc/job_icons.rsi/meta.json
# Resources/Textures/Objects/Specific/Hydroponics/aloe.rsi/produce.png
# Resources/Textures/Objects/Specific/Hydroponics/apple.rsi/produce.png
# Resources/Textures/Objects/Specific/Hydroponics/chili.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/eggplant.rsi/produce.png
# Resources/Textures/Objects/Specific/Hydroponics/eggy.rsi/meta.json
# Resources/Textures/Objects/Specific/Hydroponics/lemon.rsi/produce.png
# Resources/Textures/Objects/Specific/Hydroponics/onion_red.rsi/produce.png
# Resources/Textures/Objects/Specific/Hydroponics/potato.rsi/produce.png
# Resources/Textures/Objects/Specific/Hydroponics/sugarcane.rsi/produce.png
# Resources/Textures/Objects/Specific/Hydroponics/tomato.rsi/produce.png
2025-03-27 20:37:49 +03:00
Errant
e4a5043d4e
Overlay stack sorting fix ( #36103 )
...
* round float before sorting
* weh
2025-03-26 21:40:13 +01:00
Errant
c82d531a8f
Admin Overlay stacking and ghost hiding ( #35622 )
...
* ghostbuster mouse and overlay stacks
* variable adjustment
* use map coords for distance check
* vertical stack ordering, and cvars
* skreee
* fix stack merge 'sidedness' issue
* overlays no longer try to stack to overlays at the wrong coordinates
* options slider for stack merge distance
* admin option sliders for ghost fade/hide
* Update AdminOptionsTab.xaml.cs
---------
Co-authored-by: ScarKy0 <scarky0@onet.eu>
2025-03-25 21:15:22 +01:00
Errant
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
Vigers Ray
d0f5e8d361
Merge remote-tracking branch 'space-wizards/master'
...
# Conflicts:
# .github/workflows/validate-rgas.yml
# .github/workflows/validate-rsis.yml
# Content.Client/Changelog/ChangelogTab.xaml.cs
# Content.Client/Humanoid/HumanoidAppearanceSystem.cs
# Content.Client/Options/UI/OptionsMenu.xaml.cs
# Content.Client/SubFloor/SubFloorHideSystem.cs
# Content.Client/UserInterface/Systems/Ghost/Widgets/GhostGui.xaml.cs
# Content.Server/Advertise/EntitySystems/SpeakOnUIClosedSystem.cs
# Content.Server/Antag/AntagSelectionSystem.cs
# Content.Server/Arcade/SpaceVillainGame/SpaceVillainArcadeSystem.cs
# Content.Server/Explosion/EntitySystems/TriggerSystem.cs
# Content.Server/Mindshield/MindShieldSystem.cs
# Content.Server/Objectives/Systems/KillPersonConditionSystem.cs
# Content.Server/Standing/StandingStateSystem.cs
# Content.Server/Station/Systems/StationJobsSystem.Roundstart.cs
# Content.Server/VendingMachines/VendingMachineSystem.cs
# Content.Server/Zombies/ZombieSystem.Transform.cs
# Content.Server/Zombies/ZombieSystem.cs
# Content.Shared/Damage/Systems/DamageableSystem.cs
# Content.Shared/Humanoid/HumanoidAppearanceComponent.cs
# Content.Shared/Humanoid/Markings/MarkingManager.cs
# Content.Shared/Humanoid/NamingSystem.cs
# Content.Shared/Humanoid/Prototypes/SpeciesPrototype.cs
# Content.Shared/Humanoid/SharedHumanoidAppearanceSystem.cs
# Content.Shared/Implants/Components/SubdermalImplantComponent.cs
# Content.Shared/Standing/StandingStateSystem.cs
# Content.Shared/VendingMachines/SharedVendingMachineSystem.cs
# Content.Shared/VendingMachines/VendingMachineComponent.cs
# Resources/Audio/Lobby/attributions.yml
# Resources/Locale/en-US/_strings/administration/commands/forceghost.ftl
# Resources/Locale/en-US/_strings/clothing/components/fire-protection-component.ftl
# Resources/Locale/en-US/_strings/components/storage-voice-control-component.ftl
# Resources/Locale/en-US/_strings/prototypes/roles/antags.ftl
# Resources/Locale/en-US/_strings/reagents/meta/physical-desc.ftl
# Resources/Locale/en-US/lathe/lathe-categories.ftl
# Resources/Prototypes/Access/command.yml
# Resources/Prototypes/Catalog/Fills/Books/bookshelf.yml
# Resources/Prototypes/Catalog/Fills/Lockers/heads.yml
# Resources/Prototypes/Catalog/Fills/Lockers/misc.yml
# Resources/Prototypes/Catalog/VendingMachines/Inventories/chemvend.yml
# Resources/Prototypes/Catalog/thief_toolbox_sets.yml
# Resources/Prototypes/Datasets/Names/Operation_prefix.yml
# Resources/Prototypes/Datasets/Names/Operation_suffix.yml
# Resources/Prototypes/Datasets/Names/arachnid_first.yml
# Resources/Prototypes/Datasets/Names/arachnid_last.yml
# Resources/Prototypes/Datasets/Names/borg.yml
# Resources/Prototypes/Datasets/Names/cargo_shuttle.yml
# Resources/Prototypes/Datasets/Names/clown.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/first.yml
# Resources/Prototypes/Datasets/Names/first_female.yml
# Resources/Prototypes/Datasets/Names/first_male.yml
# Resources/Prototypes/Datasets/Names/fortunes.yml
# Resources/Prototypes/Datasets/Names/hologram.yml
# Resources/Prototypes/Datasets/Names/last.yml
# Resources/Prototypes/Datasets/Names/military.yml
# Resources/Prototypes/Datasets/Names/moth_first_female.yml
# Resources/Prototypes/Datasets/Names/moth_first_male.yml
# Resources/Prototypes/Datasets/Names/moth_last.yml
# Resources/Prototypes/Datasets/Names/mushman_first.yml
# Resources/Prototypes/Datasets/Names/mushman_last.yml
# Resources/Prototypes/Datasets/Names/ninja.yml
# Resources/Prototypes/Datasets/Names/ninja_title.yml
# Resources/Prototypes/Datasets/Names/regalrat.yml
# Resources/Prototypes/Datasets/Names/reptilian_female.yml
# Resources/Prototypes/Datasets/Names/reptilian_male.yml
# Resources/Prototypes/Datasets/Names/revenant.yml
# Resources/Prototypes/Datasets/Names/skeleton_first.yml
# Resources/Prototypes/Datasets/Names/syndicate.yml
# Resources/Prototypes/Datasets/Names/vox.yml
# Resources/Prototypes/Datasets/Names/wizard_first.yml
# Resources/Prototypes/Datasets/Names/wizard_last.yml
# Resources/Prototypes/Datasets/adjectives.yml
# Resources/Prototypes/Datasets/corporations.yml
# Resources/Prototypes/Datasets/criminal_records.yml
# Resources/Prototypes/Datasets/rat_king_commands.yml
# Resources/Prototypes/Datasets/verbs.yml
# Resources/Prototypes/Entities/Clothing/Head/specific.yml
# Resources/Prototypes/Entities/Clothing/OuterClothing/coats.yml
# Resources/Prototypes/Entities/Clothing/OuterClothing/specific.yml
# Resources/Prototypes/Entities/Mobs/Cyborgs/base_borg_chassis.yml
# Resources/Prototypes/Entities/Mobs/NPCs/revenant.yml
# Resources/Prototypes/Entities/Mobs/Player/human.yml
# Resources/Prototypes/Entities/Mobs/Player/humanoid.yml
# Resources/Prototypes/Entities/Mobs/Species/arachnid.yml
# Resources/Prototypes/Entities/Mobs/Species/base.yml
# Resources/Prototypes/Entities/Mobs/Species/moth.yml
# Resources/Prototypes/Entities/Mobs/Species/vox.yml
# Resources/Prototypes/Entities/Objects/Devices/pda.yml
# Resources/Prototypes/Entities/Objects/Misc/paper.yml
# Resources/Prototypes/Entities/Objects/Misc/subdermal_implants.yml
# Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Cartridges/shotgun.yml
# Resources/Prototypes/Entities/Objects/Weapons/Guns/Projectiles/projectiles.yml
# Resources/Prototypes/Entities/Stations/nanotrasen.yml
# Resources/Prototypes/Entities/Structures/Furniture/carpets.yml
# Resources/Prototypes/Entities/Structures/Storage/Closets/wall_lockers.yml
# Resources/Prototypes/GameRules/roundstart.yml
# Resources/Prototypes/Procedural/salvage_loot.yml
# Resources/Prototypes/Reagents/Consumable/Drink/alcohol.yml
# Resources/Prototypes/Recipes/Lathes/biogen.yml
# Resources/Prototypes/Recipes/Lathes/categories.yml
# Resources/Prototypes/Roles/Jobs/Security/warden.yml
# Resources/Prototypes/Species/arachnid.yml
# Resources/Prototypes/Species/diona.yml
# Resources/Prototypes/Species/moth.yml
# Resources/Prototypes/ai_factions.yml
# Resources/Prototypes/game_presets.yml
# Resources/ServerInfo/Guidebook/Mobs/SlimePerson.xml
# Resources/ServerInfo/Guidebook/ServerRules/SpaceLaw/SpaceLaw.xml
# Resources/ServerInfo/Guidebook/Service/Botany.xml
# Resources/Textures/Clothing/Eyes/Glasses/glasses.rsi/meta.json
# Resources/Textures/Clothing/Eyes/Glasses/jamjar.rsi/meta.json
# Resources/Textures/Clothing/Eyes/Glasses/mercglasses.rsi/meta.json
# Resources/Textures/Clothing/Eyes/Glasses/meson.rsi/meta.json
# Resources/Textures/Clothing/Eyes/Glasses/ninjavisor.rsi/meta.json
# Resources/Textures/Clothing/Eyes/Glasses/outlawglasses.rsi/meta.json
# Resources/Textures/Clothing/Eyes/Glasses/science.rsi/meta.json
# Resources/Textures/Clothing/Eyes/Glasses/secglasses.rsi/meta.json
# Resources/Textures/Clothing/Eyes/Glasses/sunglasses.rsi/meta.json
# Resources/Textures/Clothing/Eyes/Glasses/thermal.rsi/meta.json
# Resources/Textures/Clothing/Eyes/Hud/beergoggles.rsi/inhand-left.png
# Resources/Textures/Clothing/Eyes/Hud/beergoggles.rsi/inhand-right.png
# Resources/Textures/Clothing/Eyes/Hud/beergoggles.rsi/meta.json
# Resources/Textures/Clothing/Eyes/Hud/synd.rsi/meta.json
# Resources/Textures/Clothing/Eyes/Hud/syndagent.rsi/meta.json
# 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/program_icons.rsi/meta.json
# Resources/Textures/Objects/Misc/Lights/lights.rsi/meta.json
# Resources/Textures/Objects/Misc/bureaucracy.rsi/meta.json
# Resources/Textures/Objects/Specific/Hydroponics/aloe.rsi/meta.json
# Resources/Textures/Objects/Specific/Hydroponics/apple.rsi/meta.json
# 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/eggplant.rsi/meta.json
# Resources/Textures/Objects/Specific/Hydroponics/gatfruit.rsi/meta.json
# Resources/Textures/Objects/Specific/Hydroponics/lemon.rsi/meta.json
# Resources/Textures/Objects/Specific/Hydroponics/onion_red.rsi/meta.json
# Resources/Textures/Objects/Specific/Hydroponics/potato.rsi/meta.json
# Resources/Textures/Objects/Specific/Hydroponics/sugarcane.rsi/meta.json
# Resources/Textures/Objects/Specific/Hydroponics/tomato.rsi/meta.json
# Resources/Textures/Objects/Specific/Robotics/borgmodule.rsi/meta.json
# Resources/Textures/Objects/Specific/Robotics/cyborg_parts.rsi/meta.json
# Resources/Textures/Objects/Tools/spray_painter.rsi/meta.json
# Resources/Textures/Objects/Weapons/Grenades/flashbang.rsi/meta.json
# Resources/Textures/Objects/Weapons/Grenades/grenade.rsi/meta.json
# Resources/Textures/Objects/Weapons/Grenades/nukenade.rsi/meta.json
# Resources/migration.yml
# Tools/actions_changelogs_since_last_run.py
2025-03-25 11:30:01 +03:00
Errant
150f58a6a5
lock bwoinkwindow bottom bar height ( #35896 )
2025-03-19 18:43:13 +01:00
Errant
a6d66e682f
Restore the order of admin overlay elements ( #35783 )
...
admin overlay order fix
2025-03-11 17:47:03 +01:00
Errant
c7d9a45dab
Fix Ahelp window playerlist resize ( #35747 )
...
reorganize bwoink window layout
2025-03-10 20:40:36 +11:00
Errant
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
Errant
184edfe71d
Merge stable to master ( #35640 )
2025-03-03 08:04:07 +01:00
Errant
3d9ce10f58
Revert "[HOTFIX] - Players with unknown playtimes now are tagged as new players" ( #35639 )
...
Revert "[HOTFIX] - Players with unknown playtimes now are tagged as new playe…"
This reverts commit 4dfd3e5740
2025-03-03 07:49:13 +01:00
slarticodefast
6f1df2b62f
Merge stable into master ( #35626 )
2025-03-02 21:36:14 +01:00
beck-thompson
4dfd3e5740
[HOTFIX] - Players with unknown playtimes now are tagged as new players ( #35564 )
...
* Players with unknown playtimes now are tagged as new players
* Fix
* I'm silly it was in the same file
* Cavar update
2025-03-02 20:45:54 +01:00
Errant
1b20121114
Increase line spacing of the admin overlay ( #35591 )
...
line spacing
2025-03-01 03:17:07 +01:00
Schrödinger
8ea888d821
[ADMIN] Minor Refactor AdminNameOverlay ( #35520 )
...
* refactor(src): Minor refactor of Draw in "AdminNameOverlay. And new info about playtime player
* fix(src): Add configure classic admin owerlay
* fix
* 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
2025-02-28 21:51:30 +01:00
Vigers Ray
10888fd269
Merge remote-tracking branch 'space-wizards/master'
...
# Conflicts:
# Content.Client/GameTicking/Managers/ClientGameTicker.cs
# Content.Server/Administration/Systems/BwoinkSystem.cs
# Content.Server/Cargo/Systems/CargoSystem.Orders.cs
# Content.Server/Chat/Systems/ChatSystem.cs
# Content.Server/Power/EntitySystems/PowerNetSystem.cs
# Content.Server/Shuttles/Systems/ArrivalsSystem.cs
# Content.Server/Station/Systems/StationSpawningSystem.cs
# Content.Server/StationEvents/Components/PowerGridCheckRuleComponent.cs
# Content.Server/StationEvents/Events/PowerGridCheckRule.cs
# Content.Server/Zombies/ZombieSystem.Transform.cs
# Content.Shared/CCVar/CCVars.Game.cs
# Content.Shared/GameTicking/SharedGameTicker.cs
# Resources/Locale/en-US/_strings/game-ticking/game-presets/preset-wizard.ftl
# Resources/Locale/en-US/_strings/guidebook/cooking.ftl
# Resources/Prototypes/Entities/Clothing/OuterClothing/misc.yml
# Resources/Prototypes/Entities/Markers/Spawners/ghost_roles.yml
# Resources/Prototypes/Entities/Mobs/NPCs/pets.yml
# Resources/Prototypes/Entities/Objects/Weapons/Guns/Projectiles/projectiles.yml
# Resources/Prototypes/Entities/Objects/Weapons/Guns/turrets.yml
# Resources/Prototypes/Entities/Structures/Machines/lathe.yml
# Resources/Prototypes/GameRules/events.yml
# Resources/Prototypes/GameRules/midround.yml
# Resources/Prototypes/GameRules/roundstart.yml
# Resources/Prototypes/Guidebook/antagonist.yml
# Resources/ServerInfo/Guidebook/Jobs.xml
# Resources/ServerInfo/Guidebook/Service/FoodRecipes.xml
# Resources/migration.yml
2025-02-26 22:01:48 +03:00
Pieter-Jan Briers
05de5bd3eb
Fix bogus AdminNameOverlay Rider error ( #35432 )
2025-02-24 15:37:54 +11:00
Winkarst
b912dedbfc
New Feature: Admin Only messages in AHelp ( #35283 )
...
* Feature
* Update
* Update
* Update
* Update Resources/Locale/en-US/administration/bwoink.ftl
Co-authored-by: Pieter-Jan Briers <pieterjan.briers@gmail.com>
* Yes
---------
Co-authored-by: Pieter-Jan Briers <pieterjan.briers@gmail.com>
2025-02-22 09:45:50 -08:00
Vigers Ray
1b61551b4d
Merge remote-tracking branch 'refs/remotes/wizards/master'
...
# Conflicts:
# Content.Server/GameTicking/GameTicker.StatusShell.cs
# Content.Server/Implants/SubdermalImplantSystem.cs
# Content.Server/Silicons/Borgs/BorgSystem.cs
# Content.Shared/Preferences/HumanoidCharacterProfile.cs
# Resources/Locale/en-US/_strings/advertisements/vending/smite.ftl
# Resources/Maps/_Sunrise/Shuttles/wrecklaimer.yml
# Resources/Prototypes/Entities/Markers/Spawners/Random/crates.yml
# Resources/Prototypes/Entities/Stations/base.yml
# Resources/Prototypes/Roles/Jobs/CentComm/emergencyresponseteam.yml
2025-01-16 20:00:41 +03:00
Myra
6041c828de
Remove baby jail ( #34443 )
...
* Remove baby jail
Closes #33893
* Test fail fix.
2025-01-15 22:08:15 +01:00
Vigers Ray
d86ad2ba97
Merge remote-tracking branch 'refs/remotes/wizards/master'
...
# Conflicts:
# Resources/Locale/en-US/_strings/discord/watchlist-connections.ftl
# 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-15 18:23:20 +03:00
Pieter-Jan Briers
c2e050ced0
Persist deadmin to database, add admin suspension system ( #34048 )
2025-01-15 00:46:45 +01:00
Vigers Ray
5c219f5105
Merge remote-tracking branch 'refs/remotes/wizards/master'
...
# Conflicts:
# Content.Client/Administration/UI/Tabs/PlayerTab/PlayerTabEntry.xaml
# Content.Client/Administration/UI/Tabs/PlayerTab/PlayerTabHeader.xaml
# Content.Client/Administration/UI/Tabs/PlayerTab/PlayerTabHeader.xaml.cs
# Content.Server/Administration/Systems/AdminSystem.cs
# Content.Server/Connection/ConnectionManager.cs
# Content.Server/Entry/EntryPoint.cs
# Content.Server/Ghost/Roles/GhostRoleSystem.cs
# Content.Server/IoC/ServerContentIoC.cs
# Resources/Locale/en-US/_strings/administration/antag.ftl
# Resources/Locale/en-US/_strings/advertisements/vending/pride.ftl
# Resources/Locale/en-US/_strings/mind/role-types.ftl
# Resources/Prototypes/Entities/Markers/Spawners/ghost_roles.yml
# Resources/Prototypes/Entities/Mobs/Player/dragon.yml
# Resources/Prototypes/Entities/Mobs/Player/silicon.yml
# Resources/Prototypes/Entities/Objects/Devices/Syndicate_Gadgets/reinforcement_teleporter.yml
# Resources/Prototypes/Entities/Objects/Specific/Robotics/mmi.yml
# Resources/Textures/Interface/Misc/job_icons.rsi/meta.json
2025-01-14 18:46:45 +03:00
Errant
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
Vigers Ray
596698b387
Фикс антаг банов и наказание случайной смерти [ПОРТ] ( #1088 )
...
* Antag Bans - traitors
* Added Zombify conversion check for banned, fixed style on ban panel.
* Fix All antag selection on grouprole
* UI updates to show role and antag bans.
* Fix All antag placement
* Prevent Banned players from becoming revs. Added Random Death Smite.
* part 1 PR changes.
* Change appeal instructions to ccvar.
* more readable expirationText logic
* Remove duplicate service setups
* Add helper methods for getting role/antag bans before checking.
* Move Serverside antag Checks in to common methods on ban manager.
* dont allow banned players to return to zombie body after being forced to ghost.
* Move timer stuff in to existing gametick methods.
* Cleaner UI ban check methods
* Handle cases where a ban expires mid round and show new joining players their bans
* Fix a bunch of mismatching time stamps, some were set in UTC, some in local ☠
* Keep the exisiting ban display ui overlay for latejoiners but use the new one in job selection.
* Fix the rev conversion smite, use existing wait period for the end conditions to execute.
* This was already happening.
* Pretty sure the initial passes were false positives on this, no value keeping this on reflection.
* Fix renaming messup from merge conflict.
* Just mock the that the ban isnt real instead of going deeper with the DB stuff.
* Remove double set on cache
* Fix merge conflict
* Adds a border to Oppenhopper poster (#34219 )
* border
* Update meta.json
* Update Resources/Textures/Structures/Wallmounts/posters.rsi/meta.json
---------
Co-authored-by: slarticodefast <161409025+slarticodefast@users.noreply.github.com>
* Trim trailing newlines from examine messages (#33381 )
* Trim trailing newlines from examine messages
* TrimTrailingNewlines -> TrimEnd
* фиксы
* упс
---------
Co-authored-by: Repo <47093363+Titian3@users.noreply.github.com>
Co-authored-by: metalgearsloth <31366439+metalgearsloth@users.noreply.github.com>
Co-authored-by: Spessmann <156740760+Spessmann@users.noreply.github.com>
Co-authored-by: slarticodefast <161409025+slarticodefast@users.noreply.github.com>
Co-authored-by: SpaceManiac <tad@platymuus.com>
2025-01-11 05:07:34 +03:00
Vigers Ray
4c9c6988b8
Кнопка просмотра целей антагов в админ панель
2025-01-06 23:42:18 +03:00
Vigers Ray
0c1e15e516
Merge remote-tracking branch 'refs/remotes/wizards/master'
...
# Conflicts:
# Content.Client/Info/LinkBanner.cs
# Resources/Locale/en-US/_strings/atmos/gas-pipe-sensor.ftl
# Resources/Locale/en-US/_strings/station-events/events/greytide-virus.ftl
# Resources/Prototypes/Datasets/Names/diona.yml
# Resources/Prototypes/Entities/Objects/Weapons/Guns/Projectiles/projectiles.yml
2024-11-26 17:50:59 +03:00
Winkarst
0a587c9ccc
Disable submit admin note button on switch to note ( #33456 )
...
Co-authored-by: Winkarst <74284083+Winkarst-cpu@users.noreply.github.co>
2024-11-23 17:41:28 +11:00
Pieter-Jan Briers
75a096b6bd
Merge remote-tracking branch 'upstream/master' into 24-10-29-modern-hwid
2024-11-21 01:26:01 +01:00
Vigers Ray
fba2af74b3
Merge remote-tracking branch 'refs/remotes/wizards/master'
...
# Conflicts:
# .github/labeler.yml
# .github/workflows/labeler-needsreview.yml
# .github/workflows/labeler-untriaged.yml
# Resources/Prototypes/Entities/Mobs/Cyborgs/base_borg_chassis.yml
# Resources/Prototypes/Entities/Mobs/Cyborgs/borg_chassis.yml
# Resources/Prototypes/Entities/Mobs/Player/silicon.yml
# Resources/Prototypes/Entities/Objects/Specific/Robotics/borg_parts.yml
# Resources/Prototypes/Entities/Objects/Specific/Robotics/endoskeleton.yml
# Resources/Prototypes/Entities/Structures/Machines/lathe.yml
# Resources/Prototypes/Recipes/Construction/Graphs/machines/cyborg.yml
# Resources/Prototypes/tags.yml
# Resources/ServerInfo/Guidebook/Science/Cyborgs.xml
# Resources/migration.yml
2024-11-15 14:52:30 +03:00
beck-thompson
dfda557d4b
Note expiry time is now relative instead of using timestamps ( #33262 )
...
* Add the stuff
* Loc fix
* fixes
* Change
2024-11-15 10:24:27 +07:00
Pieter-Jan Briers
4f3db43696
Integrate Modern HWID into content
...
This should be the primary changes for the future-proof "Modern HWID" system implemented into Robust and the auth server.
HWIDs in the database have been given an additional column representing their version, legacy or modern. This is implemented via an EF Core owned entity. By manually setting the column name of the main value column, we can keep DB compatibility and the migration is just adding some type columns.
This new HWID type has to be plumbed through everywhere, resulting in some breaking changes for the DB layer and such.
New bans and player records are placed with the new modern HWID. Old bans are still checked against legacy HWIDs.
Modern HWIDs are presented with a "V2-" prefix to admins, to allow distinguishing them. This is also integrated into the parsing logic for placing new bans.
There's also some code cleanup to reduce copy pasting around the place from my changes.
Requires latest engine to support ImmutableArray<byte> in NetSerializer.
2024-11-12 01:51:54 +01:00
SplikZerys
27ee3abaa8
Revert "Proton ( #420 )"
...
This reverts commit 939249a3
2024-10-02 09:05:30 +03:00
pacable
939249a38b
Proton ( #420 )
...
* Proton-1 finished!
Signed-off-by: pacable <igor.mamaev1@gmail.com>
* fix
Signed-off-by: pacable <igor.mamaev1@gmail.com>
---------
Signed-off-by: pacable <igor.mamaev1@gmail.com>
2024-09-30 16:15:53 +03:00
VigersRay
47cdabdaed
Merge remote-tracking branch 'refs/remotes/wizards/master'
...
# Conflicts:
# Content.Shared/StatusEffect/StatusEffectsSystem.cs
# Resources/Audio/Effects/attributions.yml
# Resources/Locale/en-US/_strings/anomaly/inner_anomaly.ftl
# Resources/Prototypes/Catalog/Fills/Lockers/heads.yml
# Resources/Prototypes/Entities/Mobs/Species/base.yml
# Resources/Prototypes/Entities/Objects/Devices/Syndicate_Gadgets/reinforcement_teleporter.yml
# Resources/ServerInfo/Guidebook/Service/FoodRecipes.xml
2024-09-19 16:09:00 +03:00
Tayrtahn
94ad76fd07
Fix Set Outfit command/verb ( #29672 )
...
* Filter Set Outfit menu to exclude loadout sets
* Apply loadouts to job outfits
* Use appropriate species for Urists
* squishy
---------
Co-authored-by: metalgearsloth <comedian_vs_clown@hotmail.com>
2024-09-19 18:02:37 +10:00
Rinary
64f1aed90c
Большие изменения ( #345 )
...
* init
* мать масштаба тарабанил
* fix
* upd
* upd
* upd
* upd
* upd
* console spam fix
* hohohohohohohooooonkeeeeeeeeeeeeeerrrrrrrrrrrsssssssss........
* fix
* fix
* upd
* upd
* some fixes
* fix
* upd
* upd translation for steal obj
* teg translate
* upd
* fix locale + add advertisements
* translate configurator
* Fully translate
* upd
* Я манал это переводить, позже переведу
* upd en-US
* fix Linter
* upd
* fix
* upd
* fix
* fix
* fix
* Возврат ПНТ
* remove agent non silent equipment
* add acid to uplink
* carrySystem new popups
* fix
* fix
* fix disease locale
* add Disease Guide
* upd locale
* upd
* Revert "Merge branch 'master' of https://github.com/space-wizards/space-station-14 into misc"
This reverts commit 4130d241fc47fb80924c0dd3b9c9a2db85af8a25, reversing
changes made to 30abf7341ecce404f61f64e2000ad327964fcb00.
* Revert "Merge branch 'master' of https://github.com/space-wizards/space-station-14 into misc"
This reverts commit 4e5a50d21c29be8482f31e49db253b1ed17a0ae4, reversing
changes made to 449cd7bfd50f29eb653e68ba60e3f0b9310f0443.
* Revert "Merge branch 'master' of https://github.com/space-wizards/space-station-14 into misc"
This reverts commit a4679665ef441d4b63a92dc3c4e217e2cdedbc16, reversing
changes made to a80ef96cfbbc3cc737045e41a2f063a0910bf1ce.
* Revert "Merge branch 'master' of https://github.com/space-wizards/space-station-14 into misc"
This reverts commit 94f585756bb27d10a1be7fab1f340d79b7c0a213, reversing
changes made to 906d18a3f66eaed73f3a894d70971872904fad4e.
* Revert "Merge branch 'master' of https://github.com/space-wizards/space-station-14 into misc"
This reverts commit d0a7c6436ba5c175b0e00d69f495ba51f9aac645, reversing
changes made to e7933332274b336af1fc2a960264bc546c95d208.
# Conflicts:
# Resources/Prototypes/Entities/Objects/Misc/identification_cards.yml
# Resources/Prototypes/Roles/Jobs/departments.yml
* fix
* upd
* upd
* Reapply "Merge branch 'master' of https://github.com/space-wizards/space-station-14 into misc"
This reverts commit 042a3f112bbc32a622108475ac28081eb0bbbf9f.
# Conflicts:
# Content.Server/Dragon/DragonRiftSystem.cs
# Content.Server/GameTicking/GameTicker.Spawning.cs
# Content.Server/Shuttles/Systems/EmergencyShuttleSystem.cs
# Content.Server/Shuttles/Systems/ShuttleSystem.FasterThanLight.cs
# Content.Server/Spawners/EntitySystems/ContainerSpawnPointSystem.cs
# Content.Server/Zombies/ZombieSystem.cs
# Content.Server/_Sunrise/NPCSleep/NPCSleepSystem.cs
# Resources/Changelog/Changelog.yml
# Resources/Locale/en-US/_strings/store/uplink-catalog.ftl
# Resources/Prototypes/Catalog/VendingMachines/Inventories/secdrobe.yml
# Resources/Prototypes/Entities/Clothing/Head/hardsuit-helmets.yml
# Resources/Prototypes/Entities/Clothing/Head/helmets.yml
# Resources/Prototypes/Entities/Mobs/Player/silicon.yml
# Resources/Prototypes/Entities/Objects/Misc/identification_cards.yml
# Resources/Prototypes/Entities/Stations/base.yml
# Resources/Prototypes/Loadouts/Jobs/Security/security_officer.yml
# Resources/Prototypes/Loadouts/loadout_groups.yml
# Resources/Prototypes/Maps/box.yml
# Resources/Prototypes/Maps/core.yml
# Resources/Prototypes/Maps/fland.yml
# Resources/Prototypes/Maps/marathon.yml
# Resources/Prototypes/Maps/meta.yml
# Resources/Prototypes/Maps/packed.yml
# Resources/Prototypes/Roles/Jobs/departments.yml
# Resources/Prototypes/Store/categories.yml
# Resources/ServerInfo/Guidebook/Engineering/PortableGenerator.xml
# Resources/ServerInfo/Guidebook/Security/Defusal.xml
# Resources/ServerInfo/Guidebook/Security/Forensics.xml
# Resources/migration.yml
* Reapply "Merge branch 'master' of https://github.com/space-wizards/space-station-14 into misc"
This reverts commit 2860e1d217a71be0c29684e020b2278c3f08685f.
# Conflicts:
# Resources/Changelog/Changelog.yml
* Reapply "Merge branch 'master' of https://github.com/space-wizards/space-station-14 into misc"
This reverts commit 0dc7ea17e23d844ce93118db7812b844e36dda4f.
# Conflicts:
# Resources/Changelog/Changelog.yml
# Resources/Prototypes/Hydroponics/randomMutations.yml
* Reapply "Merge branch 'master' of https://github.com/space-wizards/space-station-14 into misc"
This reverts commit 439926b3c60e95cc2e701d84a032b17471a7c18e.
* Reapply "Merge branch 'master' of https://github.com/space-wizards/space-station-14 into misc"
This reverts commit 14160ab99909bf6b6f996f415d9dcfd5d4addbba.
# Conflicts:
# Resources/Changelog/Changelog.yml
* fix
* upd
* upd uplink
* upd
* fix linter
2024-09-16 19:05:38 +03:00
VigersRay
aa38c32b65
upstream
2024-09-16 12:40:23 +03:00
Winkarst
88dcc831c1
Remove calls to FormattedMessage obsolete methods ( #31706 )
...
* Remove FormattedMessage obsolete methods
* Oops
2024-09-01 13:00:53 +02:00
VigersRay
9328f4d9cb
Merge remote-tracking branch 'refs/remotes/wizards/master'
...
# Conflicts:
# Content.Client/Lobby/UI/Loadouts/LoadoutWindow.xaml.cs
# Content.Server/Connection/ConnectionManager.cs
# Content.Server/GameTicking/GameTicker.Spawning.cs
# Content.Server/Shuttles/Systems/ArrivalsSystem.cs
# Content.Server/Shuttles/Systems/DockingSystem.Shuttle.cs
# Content.Server/Shuttles/Systems/EmergencyShuttleSystem.cs
# Content.Server/Station/Systems/StationSpawningSystem.cs
# Content.Shared/Chat/SharedChatSystem.cs
# Content.Shared/UserInterface/ActivatableUIComponent.cs
# Resources/Prototypes/Datasets/Names/ai.yml
# Resources/Prototypes/Datasets/adjectives.yml
# Resources/Prototypes/Datasets/verbs.yml
# Resources/Prototypes/Entities/Clothing/Shoes/boots.yml
# Resources/Prototypes/Entities/Clothing/Shoes/specific.yml
# Resources/Prototypes/Entities/Mobs/NPCs/revenant.yml
# Resources/Prototypes/Entities/Objects/Specific/Robotics/mmi.yml
# Resources/Prototypes/Entities/Stations/base.yml
# Resources/Prototypes/Entities/Structures/Machines/lathe.yml
# Resources/Prototypes/Maps/bagel.yml
# Resources/Prototypes/Roles/Jobs/Science/borg.yml
# Resources/Prototypes/Roles/Jobs/Security/security_cadet.yml
# Resources/Textures/Clothing/Head/Helmets/light_riot.rsi/equipped-HELMET.png
# Resources/Textures/Clothing/Head/Helmets/light_riot.rsi/icon.png
# Resources/Textures/Clothing/Head/Helmets/light_riot.rsi/meta.json
# Resources/Textures/Interface/Misc/job_icons.rsi/meta.json
# Resources/Textures/Objects/Misc/bureaucracy.rsi/meta.json
# Resources/Textures/Structures/Wallmounts/barsign.rsi/officerbeersky.png
# Resources/Textures/Structures/Wallmounts/signs.rsi/anomaly.png
# Resources/Textures/Structures/Wallmounts/signs.rsi/meta.json
# SpaceStation14.sln
2024-08-28 19:12:01 +03:00
Rinary
520aac8a6f
Опять Перевод/Фиксы ( #320 )
...
* init
* some upd
* upd
* upd
* fix
* Update southern.ftl
* fix
2024-08-28 18:15:49 +03:00
eoineoineoin
8ffae8d313
Scale text in admin player overlay ( #31503 )
...
* Scale text in admin player overlay
Fixes #30040
* Feedback from PR - get UI scale through root window
---------
Co-authored-by: Eoin Mcloughlin <helloworld@eoinrul.es>
2024-08-27 16:43:47 +02:00
metalgearsloth
a89d4c750b
Power stuff ( #31314 )
...
* Power stuff
- Add shared IsPowered
- Add shared ResolveApc
- Move PowerChangedEvent to shared for now
- Add SlimPoweredLight that actually functions how you'd expect a PoweredLight to function it id didn't have a bunch of bloat on it.
* big update
* boing
2024-08-25 22:18:42 +10:00
VigersRay
a741ff4195
Merge remote-tracking branch 'refs/remotes/wizards/master'
2024-08-18 01:15:36 +03:00
Milon
a4b0bef12c
add confirmation to the delete button in objects tab ( #30946 )
...
ui shitcode
2024-08-17 12:05:17 -04:00
VigersRay
ff29e78e72
Merge remote-tracking branch 'refs/remotes/wizards/master'
...
# Conflicts:
# Content.Client/Administration/UI/Tabs/PlayerTab/PlayerTab.xaml.cs
# Content.Client/Chat/Managers/ChatManager.cs
# Content.Server/Administration/Systems/AdminSystem.cs
# Content.Server/Chat/Managers/ChatManager.cs
# Content.Server/Ghost/Roles/GhostRoleSystem.cs
# Content.Server/Zombies/ZombieSystem.Transform.cs
# Content.Shared/Administration/PlayerInfo.cs
2024-08-15 22:54:40 +03:00
Errant
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
VigersRay
f07eec269d
Merge remote-tracking branch 'refs/remotes/wizards/master'
...
# Conflicts:
# Resources/Prototypes/Catalog/Fills/Lockers/security.yml
# Resources/Prototypes/Entities/Structures/Machines/lathe.yml
# Resources/Prototypes/Entities/Structures/Machines/nuke.yml
2024-08-15 21:11:15 +03:00
IgorAnt028
84f9dd0f0b
Fix false and true in player-panel.ftl ( #31043 )
...
Fix false and true in player-panel
Add a new True string
2024-08-15 18:00:56 +03:00
Rinary
05aeb44b14
[RU] Полный перевод ( #236 )
...
* init
* fax translate
* translate
* translate cargo panel
* road map translate
* Fix cargo panel | fix bot craft translate
* fix, steal objectives translate
* do not break my not localized fax!
* fix
* radio guide translate
* Better DefaultRules
* Translate Criminal Records
* Space luw fully translate excluding CrimeList(need to rework)
* Some Guidebook translate
* Перевод глоссария, некоторые термины были переписанны под РУ комьюнити игры, некоторые к сожелению остались прежними
* Fix
* fix, translate
* Обновил структуру SpeakOnUIClosed, пофиксил перевод автоматов
* update and fix
* fully translate
* fix
* not fail but warn
* fix
* fix2
* фикс уже переведённого дерьма от корвахов
* Добавил термин подов в глоссарий
* roles translate fix
* Сикей в глоссарий
* Delete Resources/Locale/ru-RU/_sunrise/info/character-info.ftl
* remove cluster from pool
* new translation
* fully translate borgs
* some fixes
* Mr.Chang moment
* upd
* upd
* upd
* hotfix
* big fix
* fix some hardcode lang
* oh no shitcode language
* some translation
* some actions| admin commands translate start
* some new translation
* fully translate commands | figurines | chat-repo
* upd
* second upd
* upd
* start translating items
* some fixes
* translate wackpack
Из-за игры слов, я не смог нормально интерпритировать это дерьмо, так что пусть будет так, да теряется смысл и смешинка, но извините, я не смог как-то придумать игру слов
* translate
* debug translate
* upd
* Актуализация всего перевода
* fix
* fix
* upd
* some fixes | guns to his folders
* upd
* upd
* upd
* upd
* upd
* upd
* Перевод меток атмоса
* Последние коррективы
* fix
* some hardcode localization fix
* fix
* some fixes
* stats entry fully translate
* upd
* some fixes
* translate server side stats entry
* fix
* fix
* fix2
* fix
* upd
* upd
* fix
* holly shit
* fix
* totaly feed
* upd
* upd
* fix
* upd
* init
* upd
* upd
* access in prototypes
* Sunrise comments on code
* my bad
* я даун
2024-08-14 21:44:32 +03:00
