Vigers Ray
652852e1ca
Merge remote-tracking branch 'space-wizards/master'
...
# Conflicts:
# Content.Server/Humanoid/Systems/HumanoidAppearanceSystem.cs
# 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
2025-02-10 07:47:04 +03:00
Zachary Higgs
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
Vigers Ray
62a972a050
админвху для всех
2025-02-09 23:38:39 +03:00
Vigers Ray
3355febe9b
Merge remote-tracking branch 'space-wizards/master'
...
# Conflicts:
# Content.Client/StatusIcon/StatusIconSystem.cs
# Content.Server/Implants/ImplantedSystem.cs
# Resources/Audio/Effects/attributions.yml
# Resources/Locale/en-US/markings/ears.ftl
# Resources/Prototypes/Catalog/Fills/Lockers/security.yml
# Resources/Prototypes/Catalog/uplink_catalog.yml
# Resources/Prototypes/Entities/Mobs/Player/observer.yml
# Resources/Prototypes/Entities/Objects/Weapons/Guns/Projectiles/projectiles.yml
# Resources/Prototypes/Entities/Objects/Weapons/Guns/SMGs/smgs.yml
# Resources/Prototypes/Entities/Structures/Machines/lathe.yml
# Resources/Prototypes/LootTables/suspicion_loot_table.yml
# Resources/Prototypes/Research/arsenal.yml
# Resources/ServerInfo/Guidebook/NewPlayer/Controls/Controls.xml
# Resources/Textures/Objects/Weapons/Guns/SMGs/vector.rsi/equipped-BACKPACK.png
# Resources/Textures/Objects/Weapons/Guns/SMGs/vector.rsi/meta.json
# Resources/Textures/Objects/Weapons/Guns/Shotguns/pump.rsi/equipped-BACKPACK.png
# Resources/manifest.yml
# Resources/migration.yml
# RobustToolbox
2025-02-09 22:17:22 +03:00
TemporalOroboros
f37d5c9f0f
Purge uses of TransformComponent.AttachToGridOrMap ( #34940 )
...
Switches over all extant uses of TransformComponent.AttachToGridOrMap to use SharedTransformSystem.AttachToGridOrMap
2025-02-07 12:49:22 +01:00
Vigers Ray
4c5854ea7b
Merge remote-tracking branch 'refs/remotes/wizards/master'
...
# Conflicts:
# Content.Server/Administration/Systems/AdminVerbSystem.Smites.cs
# Resources/Audio/Machines/attributions.yml
# Resources/Locale/en-US/_strings/administration/smites.ftl
# Resources/Locale/en-US/_strings/reagents/frostoil.ftl
# Resources/Prototypes/Catalog/VendingMachines/Inventories/cart.yml
# Resources/Prototypes/Catalog/VendingMachines/Inventories/chapel.yml
# Resources/Prototypes/Catalog/VendingMachines/Inventories/chefvend.yml
# Resources/Prototypes/Catalog/VendingMachines/Inventories/coffee.yml
# Resources/Prototypes/Catalog/VendingMachines/Inventories/condiments.yml
# Resources/Prototypes/Catalog/VendingMachines/Inventories/curadrobe.yml
# Resources/Prototypes/Catalog/VendingMachines/Inventories/engivend.yml
# Resources/Prototypes/Catalog/VendingMachines/Inventories/medical.yml
# Resources/Prototypes/Catalog/VendingMachines/Inventories/scidrobe.yml
# Resources/Prototypes/Catalog/VendingMachines/Inventories/wallmed.yml
# Resources/Prototypes/Entities/Objects/Weapons/Guns/Shotguns/shotguns.yml
# Resources/migration.yml
2025-02-04 04:18:31 +03:00
ScarKy0
8d1a300b57
[Admin] Omni Accent Smite ( #34824 )
...
gods forgive me
2025-02-02 21:00:27 +01:00
Vigers Ray
8a6ea6ac33
Merge remote-tracking branch 'refs/remotes/wizards/master'
2025-01-30 15:38:24 +03:00
beck-thompson
bc1d6420af
After getting banned, you now have to re-read the rules! ( #33270 )
...
* first commit
* opps
* Reset cooldown instead
* Added ccvar
* Not replicated!
2025-01-30 13:09:31 +01:00
Vigers Ray
3c2672efe9
Merge remote-tracking branch 'refs/remotes/wizards/master'
...
# Conflicts:
# Content.Server/Administration/Systems/AdminSystem.cs
# Content.Server/GameTicking/GameTicker.Spawning.cs
# Content.Server/IoC/ServerContentIoC.cs
# Resources/Locale/en-US/_strings/administration/multi-server-kick.ftl
# Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Cartridges/shotgun.yml
2025-01-22 05:27:53 +03:00
slarticodefast
20acef16ee
Merge stable into master ( #34564 )
2025-01-22 00:53:05 +01:00
Pieter-Jan Briers
71c9dfc9ea
Add system to kick people if they connect to multiple servers at once. ( #34563 )
2025-01-22 00:23:47 +01:00
Errant
ae213066b1
HOTFIX Admin playerlist character update fix ( #34560 )
...
fix IdentityChangedEvent subscription
2025-01-21 23:48:07 +01: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
Palladinium
87779250ee
Add Discord webhook on watchlist connection ( #33483 )
2025-01-15 01:32:24 +01: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
d16a238061
Merge remote-tracking branch 'refs/remotes/wizards/master'
2025-01-10 01:22:33 +03:00
c4llv07e
904d75c8a9
Fix empty lines in adminwho with stealthmins. ( #34122 )
...
Don't print newline if admin is hidden.
2025-01-08 10:23:33 -05:00
Vigers Ray
bc46f14574
Глобальная оптимизация и фиксы культа плоти
2025-01-03 11:51:48 +03:00
Vigers Ray
9655b4c6c6
Отключил вербы для выдачи антажок новых
2025-01-01 08:07:25 +03:00
Vigers Ray
6304ac7e6f
Культ плоти ( #871 )
...
* Культ плоти
* Мейби это скорет ноги для паучих ног
* фикс ног и иконок (#986 )
Co-authored-by: Vigers Ray <vigersray@gmail.com>
---------
Co-authored-by: Babaev <129369024+babaevlsdd@users.noreply.github.com>
2025-01-01 08:02:29 +03:00
Vigers Ray
f84969630d
Диверсионный отряд ( #985 )
...
* Диверсионный отряд
* фиксы
* фиксы линтера
* Спрайт терминала икаруса
* фикс пинпоинтера
* Доработки ДО
* Фиксы удалённого управления шаттлом
* Не запускать ДО если на может быть меньше 3 глав
2025-01-01 07:53:31 +03:00
Vigers Ray
d8547bf089
Merge remote-tracking branch 'refs/remotes/wizards/master'
2024-12-24 03:31:44 +03:00
Pieter-Jan Briers
285e9349b6
Fix race condition causing disconnected admins to appear in adminwho ( #34033 )
2024-12-24 11:18:31 +11:00
Vigers Ray
0619ac9206
Merge remote-tracking branch 'refs/remotes/wizards/master'
...
# Conflicts:
# .github/workflows/build-test-debug.yml
# Content.Client/Atmos/Consoles/AtmosAlarmEntryContainer.xaml.cs
# Content.IntegrationTests/Tests/PostMapInitTest.cs
# Content.Server/StoreDiscount/Systems/StoreDiscountSystem.cs
# Content.Server/Zombies/ZombieSystem.cs
# Content.Shared/Nutrition/EntitySystems/HungerSystem.cs
# Resources/Locale/en-US/_strings/atmos/gases.ftl
# Resources/Locale/en-US/_strings/components/atmos-monitoring-component.ftl
# Resources/Locale/en-US/_strings/tools/components/tool-component.ftl
# Resources/Prototypes/Entities/Mobs/Player/silicon.yml
# Resources/Prototypes/Research/industrial.yml
# Resources/Prototypes/Voice/speech_emotes.yml
# Resources/Prototypes/ai_factions.yml
# Resources/toolshedEngineCommandPerms.yml
2024-12-21 18:51:37 +03:00
Leon Friedrich
06e2bba8ab
Toolshed refactor ( #33598 )
...
* Content changes for engine toolshed PR
* add contains command
* more permissive commands
2024-12-21 17:45:48 +11:00
slarticodefast
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
Vigers Ray
7c376e48f1
Merge remote-tracking branch 'refs/remotes/wizards/master'
...
# Conflicts:
# Resources/Prototypes/Entities/Objects/Weapons/Guns/Battery/battery_guns.yml
2024-12-12 02:27:31 +03:00
BramvanZijp
ce9fc82382
Rework the HoS's Energy Shotgun (Varying energy consumption depending on fire-mode + re-adds a toned down self recharge.) ( #32104 )
...
* Rebalance HoS's Energy Shotgun
* SLIGHTLY Up the max charge so the gun properly recharges all of its charges, which matters a lot more with the self charge cooldown system.
* Prevent recharge cooldown if 0 power is used.
* Makes the clientside HUD actually update to reflect the changes in firecost and thus max/current charges.
* Properly fix that recharging to just under full issue instead of applying a budget fix to only the eshotgun.
* Clean up the client ammo UI fix.
* Update the self recharger component to comply with maintainer request.
Co-authored-by: slarticodefast <161409025+slarticodefast@users.noreply.github.com>
* Remove code that was made redundant by a hotfix from another PR.
* Make the recharge pause on EMP, document things where needed, clean up code as per maintainer request, add a note to make the code better when power is moved to shared.
* Fix another internal issue
* Code cleanup + fix the rapid recharge verb to remove pause.
* cleanup
---------
Co-authored-by: slarticodefast <161409025+slarticodefast@users.noreply.github.com>
Co-authored-by: metalgearsloth <comedian_vs_clown@hotmail.com>
2024-12-11 17:21:04 +01:00
Vigers Ray
c326cfdaf6
фиксы апстрима
2024-11-26 18:01:48 +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
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
d853b875eb
Merge remote-tracking branch 'refs/remotes/wizards/master'
...
# Conflicts:
# Content.Client/Lobby/LobbyUIController.cs
# Content.Client/Lobby/UI/CharacterSetupGui.xaml
# Content.Client/Lobby/UI/CharacterSetupGui.xaml.cs
# Content.Server/Antag/AntagSelectionSystem.cs
# Content.Server/GameTicking/GameTicker.Lobby.cs
# Content.Server/Objectives/Systems/KillPersonConditionSystem.cs
# Content.Server/Store/Systems/StoreSystem.Ui.cs
# Content.Shared/Inventory/InventorySystem.Relay.cs
# Resources/Maps/_Sunrise/Shuttles/abandoned_outpost.yml
# Resources/Prototypes/Entities/Stations/base.yml
# Resources/Textures/Interface/Misc/job_icons.rsi/meta.json
# Resources/Textures/Structures/Wallmounts/air_monitors.rsi/alarm0.png
# Resources/Textures/Structures/Wallmounts/air_monitors.rsi/alarm1.png
# Resources/Textures/Structures/Wallmounts/air_monitors.rsi/alarm2.png
# Resources/Textures/Structures/Wallmounts/air_monitors.rsi/alarm_b1.png
# Resources/Textures/Structures/Wallmounts/air_monitors.rsi/alarm_b2.png
# Resources/Textures/Structures/Wallmounts/air_monitors.rsi/alarm_bitem.png
# Resources/Textures/Structures/Wallmounts/air_monitors.rsi/alarmp.png
# Resources/Textures/Structures/Wallmounts/air_monitors.rsi/alarmx.png
# Resources/Textures/Structures/Wallmounts/air_monitors.rsi/meta.json
2024-11-19 18:34:32 +03:00
beck-thompson
da4fa9bea9
Clumsy system refactor ( #31147 )
...
* First commit
* Fixes
* Added the noise
* Renames
* Timespan
* Fixed space
* entity -> ent
* This shouldn't work
* opps....
* Datafield name change
* Better comments
* small comment
* Personal skill issue
* Event renames and stuff
* Couple fixes
* Defib ref fixes (Silly me)
* Added clumsy back!
* no hard code clumsy!
* Identity fix
* Event name change
* Comment change
* Function name change
* opp
* Update names
* Damage stuff!
* Fixes!
* Fixes
* opps
* This was hidden away!!
* negative diff feeds me
2024-11-16 00:46:01 +01:00
Vigers Ray
8ae86bf691
Merge remote-tracking branch 'refs/remotes/wizards/master'
...
# Conflicts:
# Content.Shared/CCVar/CCVars.cs
# Resources/Prototypes/Polymorphs/polymorph.yml
# Resources/Textures/Structures/Windows/mining.rsi/full.png
# Resources/Textures/Structures/Windows/mining.rsi/meta.json
# Resources/Textures/Structures/Windows/mining.rsi/mwindow0.png
# Resources/Textures/Structures/Windows/mining.rsi/mwindow1.png
# Resources/Textures/Structures/Windows/mining.rsi/mwindow2.png
# Resources/Textures/Structures/Windows/mining.rsi/mwindow3.png
# Resources/Textures/Structures/Windows/mining.rsi/mwindow4.png
# Resources/Textures/Structures/Windows/mining.rsi/mwindow5.png
# Resources/Textures/Structures/Windows/mining.rsi/mwindow6.png
# Resources/Textures/Structures/Windows/mining.rsi/mwindow7.png
# Resources/Textures/Structures/Windows/mining_diagonal.rsi/meta.json
# Resources/Textures/Structures/Windows/mining_diagonal.rsi/state0.png
# Resources/Textures/Structures/Windows/mining_diagonal.rsi/state1.png
# Resources/Textures/Structures/Windows/plasma_diagonal.rsi/meta.json
# Resources/Textures/Structures/Windows/plasma_diagonal.rsi/state0.png
# Resources/Textures/Structures/Windows/plasma_diagonal.rsi/state1.png
# Resources/Textures/Structures/Windows/plasma_window.rsi/full.png
# Resources/Textures/Structures/Windows/plasma_window.rsi/meta.json
# Resources/Textures/Structures/Windows/plasma_window.rsi/pwindow0.png
# Resources/Textures/Structures/Windows/plasma_window.rsi/pwindow1.png
# Resources/Textures/Structures/Windows/plasma_window.rsi/pwindow2.png
# Resources/Textures/Structures/Windows/plasma_window.rsi/pwindow3.png
# Resources/Textures/Structures/Windows/plasma_window.rsi/pwindow4.png
# Resources/Textures/Structures/Windows/plasma_window.rsi/pwindow5.png
# Resources/Textures/Structures/Windows/plasma_window.rsi/pwindow6.png
# Resources/Textures/Structures/Windows/plasma_window.rsi/pwindow7.png
# Resources/Textures/Structures/Windows/plastitanium_window.rsi/full.png
# Resources/Textures/Structures/Windows/plastitanium_window.rsi/meta.json
# Resources/Textures/Structures/Windows/plastitanium_window.rsi/ptwindow0.png
# Resources/Textures/Structures/Windows/plastitanium_window.rsi/ptwindow1.png
# Resources/Textures/Structures/Windows/plastitanium_window.rsi/ptwindow2.png
# Resources/Textures/Structures/Windows/plastitanium_window.rsi/ptwindow3.png
# Resources/Textures/Structures/Windows/plastitanium_window.rsi/ptwindow4.png
# Resources/Textures/Structures/Windows/plastitanium_window.rsi/ptwindow5.png
# Resources/Textures/Structures/Windows/plastitanium_window.rsi/ptwindow6.png
# Resources/Textures/Structures/Windows/plastitanium_window.rsi/ptwindow7.png
# Resources/Textures/Structures/Windows/plastitanium_window_diagonal.rsi/meta.json
# Resources/Textures/Structures/Windows/plastitanium_window_diagonal.rsi/state0.png
# Resources/Textures/Structures/Windows/plastitanium_window_diagonal.rsi/state1.png
# Resources/Textures/Structures/Windows/reinforced_plasma_diagonal.rsi/meta.json
# Resources/Textures/Structures/Windows/reinforced_plasma_diagonal.rsi/state0.png
# Resources/Textures/Structures/Windows/reinforced_plasma_diagonal.rsi/state1.png
# Resources/Textures/Structures/Windows/reinforced_plasma_window.rsi/full.png
# Resources/Textures/Structures/Windows/reinforced_plasma_window.rsi/meta.json
# Resources/Textures/Structures/Windows/reinforced_plasma_window.rsi/rpwindow0.png
# Resources/Textures/Structures/Windows/reinforced_plasma_window.rsi/rpwindow1.png
# Resources/Textures/Structures/Windows/reinforced_plasma_window.rsi/rpwindow2.png
# Resources/Textures/Structures/Windows/reinforced_plasma_window.rsi/rpwindow3.png
# Resources/Textures/Structures/Windows/reinforced_plasma_window.rsi/rpwindow4.png
# Resources/Textures/Structures/Windows/reinforced_plasma_window.rsi/rpwindow5.png
# Resources/Textures/Structures/Windows/reinforced_plasma_window.rsi/rpwindow6.png
# Resources/Textures/Structures/Windows/reinforced_plasma_window.rsi/rpwindow7.png
# Resources/Textures/Structures/Windows/reinforced_uranium_diagonal.rsi/meta.json
# Resources/Textures/Structures/Windows/reinforced_uranium_diagonal.rsi/state0.png
# Resources/Textures/Structures/Windows/reinforced_uranium_diagonal.rsi/state1.png
# Resources/Textures/Structures/Windows/reinforced_uranium_window.rsi/full.png
# Resources/Textures/Structures/Windows/reinforced_uranium_window.rsi/meta.json
# Resources/Textures/Structures/Windows/reinforced_uranium_window.rsi/ruwindow0.png
# Resources/Textures/Structures/Windows/reinforced_uranium_window.rsi/ruwindow1.png
# Resources/Textures/Structures/Windows/reinforced_uranium_window.rsi/ruwindow2.png
# Resources/Textures/Structures/Windows/reinforced_uranium_window.rsi/ruwindow3.png
# Resources/Textures/Structures/Windows/reinforced_uranium_window.rsi/ruwindow4.png
# Resources/Textures/Structures/Windows/reinforced_uranium_window.rsi/ruwindow5.png
# Resources/Textures/Structures/Windows/reinforced_uranium_window.rsi/ruwindow6.png
# Resources/Textures/Structures/Windows/reinforced_uranium_window.rsi/ruwindow7.png
# Resources/Textures/Structures/Windows/reinforced_window.rsi/full.png
# Resources/Textures/Structures/Windows/reinforced_window.rsi/meta.json
# Resources/Textures/Structures/Windows/reinforced_window.rsi/rwindow0.png
# Resources/Textures/Structures/Windows/reinforced_window.rsi/rwindow1.png
# Resources/Textures/Structures/Windows/reinforced_window.rsi/rwindow2.png
# Resources/Textures/Structures/Windows/reinforced_window.rsi/rwindow3.png
# Resources/Textures/Structures/Windows/reinforced_window.rsi/rwindow4.png
# Resources/Textures/Structures/Windows/reinforced_window.rsi/rwindow5.png
# Resources/Textures/Structures/Windows/reinforced_window.rsi/rwindow6.png
# Resources/Textures/Structures/Windows/reinforced_window.rsi/rwindow7.png
# Resources/Textures/Structures/Windows/reinforced_window_diagonal.rsi/meta.json
# Resources/Textures/Structures/Windows/reinforced_window_diagonal.rsi/state0.png
# Resources/Textures/Structures/Windows/reinforced_window_diagonal.rsi/state1.png
# Resources/Textures/Structures/Windows/shuttle_window.rsi/full.png
# Resources/Textures/Structures/Windows/shuttle_window.rsi/meta.json
# Resources/Textures/Structures/Windows/shuttle_window.rsi/swindow0.png
# Resources/Textures/Structures/Windows/shuttle_window.rsi/swindow1.png
# Resources/Textures/Structures/Windows/shuttle_window.rsi/swindow2.png
# Resources/Textures/Structures/Windows/shuttle_window.rsi/swindow3.png
# Resources/Textures/Structures/Windows/shuttle_window.rsi/swindow4.png
# Resources/Textures/Structures/Windows/shuttle_window.rsi/swindow5.png
# Resources/Textures/Structures/Windows/shuttle_window.rsi/swindow6.png
# Resources/Textures/Structures/Windows/shuttle_window.rsi/swindow7.png
# Resources/Textures/Structures/Windows/shuttle_window_diagonal.rsi/meta.json
# Resources/Textures/Structures/Windows/shuttle_window_diagonal.rsi/state0.png
# Resources/Textures/Structures/Windows/shuttle_window_diagonal.rsi/state1.png
# Resources/Textures/Structures/Windows/tinted_window.rsi/full.png
# Resources/Textures/Structures/Windows/tinted_window.rsi/meta.json
# Resources/Textures/Structures/Windows/tinted_window.rsi/twindow0.png
# Resources/Textures/Structures/Windows/tinted_window.rsi/twindow1.png
# Resources/Textures/Structures/Windows/tinted_window.rsi/twindow2.png
# Resources/Textures/Structures/Windows/tinted_window.rsi/twindow3.png
# Resources/Textures/Structures/Windows/tinted_window.rsi/twindow4.png
# Resources/Textures/Structures/Windows/tinted_window.rsi/twindow5.png
# Resources/Textures/Structures/Windows/tinted_window.rsi/twindow6.png
# Resources/Textures/Structures/Windows/tinted_window.rsi/twindow7.png
# Resources/Textures/Structures/Windows/uranium_window.rsi/full.png
# Resources/Textures/Structures/Windows/uranium_window.rsi/meta.json
# Resources/Textures/Structures/Windows/uranium_window.rsi/uwindow0.png
# Resources/Textures/Structures/Windows/uranium_window.rsi/uwindow1.png
# Resources/Textures/Structures/Windows/uranium_window.rsi/uwindow2.png
# Resources/Textures/Structures/Windows/uranium_window.rsi/uwindow3.png
# Resources/Textures/Structures/Windows/uranium_window.rsi/uwindow4.png
# Resources/Textures/Structures/Windows/uranium_window.rsi/uwindow5.png
# Resources/Textures/Structures/Windows/uranium_window.rsi/uwindow6.png
# Resources/Textures/Structures/Windows/uranium_window.rsi/uwindow7.png
# Resources/Textures/Structures/Windows/uranium_window_diagonal.rsi/meta.json
# Resources/Textures/Structures/Windows/uranium_window_diagonal.rsi/state0.png
# Resources/Textures/Structures/Windows/uranium_window_diagonal.rsi/state1.png
# Resources/Textures/Structures/Windows/window.rsi/full.png
# Resources/Textures/Structures/Windows/window.rsi/meta.json
# Resources/Textures/Structures/Windows/window.rsi/window0.png
# Resources/Textures/Structures/Windows/window.rsi/window1.png
# Resources/Textures/Structures/Windows/window.rsi/window2.png
# Resources/Textures/Structures/Windows/window.rsi/window3.png
# Resources/Textures/Structures/Windows/window.rsi/window4.png
# Resources/Textures/Structures/Windows/window.rsi/window5.png
# Resources/Textures/Structures/Windows/window.rsi/window6.png
# Resources/Textures/Structures/Windows/window.rsi/window7.png
# Resources/Textures/Structures/Windows/window_diagonal.rsi/meta.json
# Resources/Textures/Structures/Windows/window_diagonal.rsi/state0.png
# Resources/Textures/Structures/Windows/window_diagonal.rsi/state1.png
2024-11-14 03:15:01 +03:00
dffdff2423
51d2b51ad0
tag:with toolshed command ( #31751 )
2024-11-14 06:27:31 +07:00
Vigers Ray
38889342ad
Merge remote-tracking branch 'refs/remotes/wizards/master'
...
# Conflicts:
# Content.Client/UserInterface/Systems/Ghost/Controls/Roles/GhostRolesEui.cs
# Content.Server/Chemistry/EntitySystems/InjectorSystem.cs
# Content.Shared/Weapons/Ranged/Components/GunComponent.cs
# Content.Shared/Weapons/Ranged/Systems/SharedGunSystem.cs
# Resources/Audio/Machines/attributions.yml
# Resources/Prototypes/Entities/Mobs/Cyborgs/base_borg_chassis.yml
# Resources/Prototypes/Entities/Mobs/Player/silicon.yml
# Resources/Prototypes/Entities/Objects/Weapons/Guns/SMGs/smgs.yml
# Resources/Prototypes/Recipes/Lathes/medical.yml
# Resources/Prototypes/Roles/Jobs/Civilian/service_worker.yml
# Resources/ServerInfo/Guidebook/Antagonist/Antagonists.xml
# Resources/ServerInfo/Guidebook/Antagonist/MinorAntagonists.xml
# Resources/ServerInfo/Guidebook/Antagonist/Nuclear Operatives.xml
# Resources/ServerInfo/Guidebook/Antagonist/Revolutionaries.xml
# Resources/ServerInfo/Guidebook/Antagonist/SpaceNinja.xml
# Resources/ServerInfo/Guidebook/Antagonist/Thieves.xml
# Resources/Textures/Clothing/Uniforms/Jumpskirt/color.rsi/equipped-INNERCLOTHING.png
# Resources/Textures/Clothing/Uniforms/Jumpskirt/color.rsi/icon.png
# Resources/Textures/Clothing/Uniforms/Jumpskirt/color.rsi/meta.json
# Resources/Textures/Clothing/Uniforms/Jumpsuit/color.rsi/equipped-INNERCLOTHING.png
# Resources/Textures/Clothing/Uniforms/Jumpsuit/color.rsi/icon.png
# Resources/Textures/Clothing/Uniforms/Jumpsuit/color.rsi/meta.json
# Resources/Textures/Objects/Weapons/Melee/combat_knife.rsi/inhand-left.png
# Resources/Textures/Objects/Weapons/Melee/combat_knife.rsi/inhand-right.png
# Resources/Textures/Objects/Weapons/Melee/combat_knife.rsi/meta.json
# Resources/Textures/Objects/Weapons/Melee/survival_knife.rsi/inhand-left.png
# Resources/Textures/Objects/Weapons/Melee/survival_knife.rsi/inhand-right.png
# Resources/Textures/Objects/Weapons/Melee/survival_knife.rsi/meta.json
2024-11-13 04:35:52 +03:00
Rinary
977e8baaea
Доработка вампира и мелочи ( #598 )
...
* init
* fix vampire polymorph
* fix vampire metabolizm
* upd
* теперь при бане будет указываться номер раунда, хд
* fix
* fix
* fix locale
* change speed
* new nukeops shuttle
* FULLY FIX EBANY VAMPIRE OBJECTIVES
* fix faction
* fix drank objective
* try fix status icon
* fix changelings
* fix zombie faction
* vampire status icon fix
* upd roadmap
* vampire blood amount alert
* drain objective up
* upd
* upd
2024-11-13 04:02:57 +03: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
nikthechampiongr
9520e829de
Allow for the ai's laws to be changed from its core and eye ( #32461 )
...
* Allow for the ai's laws to be changed from its core and eye
* Address reviews
2024-11-02 14:21:10 +01:00
metalgearsloth
1c8eed8b45
Add on-call functionality for adminning ( #30443 )
...
* Add on-call functionality for adminning
The first time an ahelp gets SOS it gets relayed to the specified channel with the specified ping. Every time after that it doesn't until it gets a non-SOS response received.
* Remove redundant name
Pretty sure this already gets chucked on the name of the msg itself I think it just didn't show in screenshot because they were subsequent.
* Update Content.Server/Administration/Systems/BwoinkSystem.cs
Co-authored-by: Chief-Engineer <119664036+Chief-Engineer@users.noreply.github.com>
---------
Co-authored-by: Chief-Engineer <119664036+Chief-Engineer@users.noreply.github.com>
Co-authored-by: deathride58 <deathride58@users.noreply.github.com>
2024-11-02 10:29:16 +01:00
Rinary
a85433e877
Новый антагонист: Вампиры ( #560 )
...
* Initial Commit
* Unfinished
* Continuing, more abilities
* Remove necromicon healing
* oops
* Continuing
* Continuing
* Checkpoint incase i need to undo something
* Rewrite to use event per power, working passives
* refactor fixes
* so many fixes
* some fixes
* some fixes
* new textures, status icon
* vampire antag role, mind role
* проверку на дауна вызывали?(если Null, у сервера ступор головного фатала)
* fix 1
* fix 2
* fix fatal, fix build
* breafing audio
* fix icons style, store in action
* clear store things, add gamerule, mid round game rule
* some rework
* clear any store systems
* clear x2
* if you have 150 Blood Essence, you get mutation
* upd
* some changes
* simple mutation menu
* я вот сижу, в 12 ночи, пишу какую-то очередную хуйню, вместо приятного сна...
* upd
* normal mutations menu
* actions translate
* None type, base actions list
* passive abilities
* ability earning
* fix
* translate vampire preset
* translate vampire mutations menu
* mutations menu textures
* disable some
* ДРАНЫЙ БРИФ ФАТАЛКУ ПО ПРИКОЛУ БЕЕМ
* game preset
* mutation can infinity changed
* fix
* fully rework abilities update system
* gargantua info
* update ignore list
* fix gargantua passives
* vampire objectives
* new icons
* balance
* fix
* upd objectives
* fix metabolizer type, balance 2
* fix metabolizer type 2
* fix syntax
* clear translation
* xd
* update
* round end info
* fix
* drain objective fix
* fix
* fix syntax
* fix
* clear
---------
Co-authored-by: Rainfey <rainfey0+github@gmail.com>
2024-10-31 19:06:01 +03:00
Vigers Ray
389ed704e1
Merge remote-tracking branch 'refs/remotes/wizards/master'
...
# Conflicts:
# Content.Client/Entry/EntryPoint.cs
# Content.Client/IoC/ClientContentIoC.cs
# Content.Server/Administration/Managers/BanManager.cs
# Content.Server/Chat/Managers/ChatSanitizationManager.cs
# Content.Server/Chat/Systems/ChatSystem.cs
# Content.Server/Traitor/Uplink/UplinkSystem.cs
# Content.Shared/Interaction/SharedInteractionSystem.cs
# Content.Shared/Localizations/ContentLocalizationManager.cs
# Content.Shared/Roles/JobRequirement/DepartmentTimeRequirement.cs
# Content.Shared/Roles/JobRequirement/OverallPlaytimeRequirement.cs
# Content.Shared/Roles/JobRequirement/RoleTimeRequirement.cs
# Content.Shared/Weapons/Melee/SharedMeleeWeaponSystem.cs
# Resources/Audio/Ambience/Antag/attributions.yml
# Resources/Audio/Weapons/Guns/Gunshots/attributions.yml
# Resources/Locale/en-US/_strings/advertisements/other/firebot.ftl
# Resources/Locale/en-US/_strings/shuttles/commands.ftl
# Resources/Prototypes/Datasets/Names/last.yml
# Resources/Prototypes/Entities/Mobs/Player/silicon.yml
# Resources/Prototypes/Entities/Objects/Specific/Robotics/borg_modules.yml
# Resources/Prototypes/Entities/Structures/Machines/lathe.yml
# Resources/Prototypes/Roles/Jobs/Science/borg.yml
# Resources/Prototypes/Shuttles/shuttle_incoming_event.yml
# Resources/ServerInfo/Guidebook/Antagonist/Traitors.xml
# Resources/Textures/Clothing/Head/Hats/warden.rsi/equipped-HELMET.png
# Resources/Textures/Clothing/Head/Hats/warden.rsi/meta.json
# Resources/Textures/Clothing/Uniforms/Jumpskirt/ce.rsi/equipped-INNERCLOTHING.png
# Resources/Textures/Clothing/Uniforms/Jumpskirt/ce.rsi/icon.png
# Resources/Textures/Clothing/Uniforms/Jumpsuit/ce.rsi/equipped-INNERCLOTHING-monkey.png
# Resources/Textures/Clothing/Uniforms/Jumpsuit/ce.rsi/equipped-INNERCLOTHING.png
# Resources/Textures/Clothing/Uniforms/Jumpsuit/ce.rsi/icon.png
# Resources/Textures/Clothing/Uniforms/Jumpsuit/ce.rsi/meta.json
# Resources/Textures/Interface/Actions/actions_borg.rsi/meta.json
# Resources/Textures/Structures/Wallmounts/posters.rsi/meta.json
# RobustToolbox
2024-10-30 13:26:32 +03:00
Moomoobeef
6236d1abb3
Updated an incorrect sprite in the smite menu ( #33043 )
...
changed the synth sprite used in the icon for the instrumentify smite out for the more accurate supersynth sprite
2024-10-28 23:35:48 +01:00
IProduceWidgets
8cafd7261d
Fix omega cursed smite code. ( #32844 )
...
* le fixo smotes
* CURSE OF BLINDNESS
* Guh
2024-10-17 09:24:31 +11:00
