VigersRay
c8e9b7bbf4
Merge remote-tracking branch 'refs/remotes/wizards/master'
...
# Conflicts:
# Content.Server/GameTicking/GameTicker.Spawning.cs
# Content.Server/Players/PlayTimeTracking/PlayTimeTrackingSystem.cs
# Content.Server/Roles/RoleSystem.cs
# Content.Server/Silicons/Laws/SiliconLawSystem.cs
# Content.Server/Station/Systems/StationSpawningSystem.cs
# Resources/Prototypes/Entities/Objects/Fun/pai.yml
# Resources/Prototypes/GameRules/midround.yml
# RobustToolbox
2024-10-10 19:09:17 +03:00
Errant
93c7bdc134
Mind Role Entities ( #31318 )
...
* 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
* minor cleanup
* remove createdTime datafield
* now actually using the event replacement I made for role time tracking
* weh
2024-10-10 10:48:56 +02:00
VigersRay
b1cac7e781
Merge remote-tracking branch 'refs/remotes/wizards/master'
...
# Conflicts:
# Content.Client/Chat/Managers/IChatManager.cs
# Content.Client/IoC/ClientContentIoC.cs
# Content.Server/Administration/Systems/BwoinkSystem.cs
# Content.Server/Chat/Managers/ChatManager.cs
# Content.Server/GameTicking/GameTicker.Player.cs
# Resources/Audio/Machines/attributions.yml
# Resources/Locale/en-US/_strings/administration/commands/custom-vote-command.ftl
# Resources/Locale/en-US/_strings/discord/vote-notifications.ftl
# Resources/Locale/en-US/_strings/npc/firebot.ftl
# Resources/Locale/en-US/_strings/paper/syndicate-business-card.ftl
# Resources/Locale/en-US/_strings/store/uplink-catalog.ftl
# Resources/Prototypes/Entities/Objects/Specific/Robotics/borg_modules.yml
# Resources/Prototypes/Recipes/Crafting/bots.yml
# Resources/Textures/Objects/Misc/bureaucracy.rsi/meta.json
# Resources/Textures/Structures/Walls/solid.rsi/reinf_over0.png
2024-10-02 06:45:10 +03:00
nikthechampiongr
a5840b925b
Fix RA0032 ( #32514 )
2024-09-29 02:25:21 +02:00
VigersRay
aa38c32b65
upstream
2024-09-16 12:40:23 +03:00
poeMota
9a51d37d02
Add ERT time stats ( #31629 )
...
* add jobs for ghost roles
* add job to ToggleableGhostRole
* typo
---------
Co-authored-by: Mota <belochuc@gmail.com>
2024-09-02 10:32:49 +05:00
nikthechampiongr
99db9ea39d
Fix suicide logs ( #31661 )
...
Make suicide logs include the username, as well as the character(where possible)
2024-08-31 18:26:52 +10: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
Winkarst
2d85b4e7e9
Move OnGhostAttempt to GhostSystem ( #31445 )
...
* Move OnGhostAttempt to GhostSystem
* Remove unused dependencies and sort them
2024-08-26 14:15:33 +02: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
67c8ba2471
Merge remote-tracking branch 'refs/remotes/wizards/master'
...
# Conflicts:
# Content.Client/Administration/UI/Tabs/ObjectsTab/ObjectsTab.xaml.cs
# Content.Client/Administration/UI/Tabs/ObjectsTab/ObjectsTabEntry.xaml
# Content.Client/Administration/UI/Tabs/ObjectsTab/ObjectsTabEntry.xaml.cs
# Content.IntegrationTests/Tests/PostMapInitTest.cs
# Content.Server/Chat/Systems/ChatSystem.cs
# Content.Server/Clothing/Components/GloveHeatResistanceComponent.cs
# Content.Server/Light/EntitySystems/PoweredLightSystem.cs
# Content.Server/Medical/HealthAnalyzerSystem.cs
# Content.Server/Medical/SuitSensors/SuitSensorComponent.cs
# Content.Server/StationEvents/Events/MeteorSwarmSystem.cs
# Content.Server/StationEvents/Events/StationEventSystem.cs
# Content.Shared/Actions/SharedActionsSystem.cs
# Content.Shared/Interaction/SharedInteractionSystem.cs
# Resources/Prototypes/AlertLevels/alert_levels.yml
# Resources/Prototypes/Catalog/Fills/Lockers/heads.yml
# Resources/Prototypes/Catalog/Fills/Lockers/misc.yml
# Resources/Prototypes/Catalog/VendingMachines/Inventories/engivend.yml
# Resources/Prototypes/Datasets/Names/fortunes.yml
# Resources/Prototypes/Datasets/ion_storm.yml
# Resources/Prototypes/Entities/Clothing/Neck/mantles.yml
# Resources/Prototypes/Entities/Clothing/Uniforms/jumpsuits.yml
# Resources/Prototypes/Entities/Markers/Spawners/Random/maintenance.yml
# Resources/Prototypes/Entities/Mobs/Cyborgs/base_borg_chassis.yml
# Resources/Prototypes/Entities/Objects/Fun/pai.yml
# Resources/Prototypes/Entities/Objects/Misc/identification_cards.yml
# Resources/Prototypes/Entities/Objects/Specific/Medical/handheld_crew_monitor.yml
# Resources/Prototypes/Entities/Structures/Machines/lathe.yml
# Resources/Prototypes/GameRules/events.yml
# Resources/Prototypes/Loadouts/Jobs/Science/research_director.yml
# Resources/Prototypes/Recipes/Lathes/clothing.yml
# Resources/Prototypes/game_presets.yml
# Resources/Prototypes/secret_weights.yml
# Resources/ServerInfo/Guidebook/Engineering/Singularity.xml
# Resources/Textures/Clothing/Head/Helmets/security.rsi/equipped-HELMET-vox.png
# Resources/Textures/Clothing/Head/Helmets/security.rsi/equipped-HELMET.png
# Resources/Textures/Clothing/Head/Helmets/security.rsi/icon.png
# Resources/Textures/Clothing/Head/Helmets/security.rsi/inhand-left.png
# Resources/Textures/Clothing/Head/Helmets/security.rsi/inhand-right.png
# Resources/Textures/Clothing/Head/Helmets/security.rsi/meta.json
# Resources/Textures/Clothing/Mask/ert.rsi/meta.json
# Resources/Textures/Clothing/Mask/joy.rsi/meta.json
# Resources/Textures/Clothing/Mask/squadron.rsi/meta.json
# Resources/Textures/Clothing/Neck/Cloaks/cmo.rsi/equipped-NECK.png
# Resources/Textures/Clothing/Neck/Cloaks/cmo.rsi/meta.json
# Resources/Textures/Clothing/OuterClothing/Armor/security.rsi/equipped-OUTERCLOTHING.png
# Resources/Textures/Clothing/OuterClothing/Armor/security.rsi/icon.png
# Resources/Textures/Clothing/OuterClothing/Armor/security.rsi/meta.json
# Resources/Textures/Clothing/OuterClothing/Hardsuits/medical.rsi/inhand-left.png
# Resources/Textures/Clothing/OuterClothing/Hardsuits/medical.rsi/inhand-right.png
# Resources/Textures/Clothing/Uniforms/Jumpsuit/hos_alt.rsi/equipped-INNERCLOTHING.png
# Resources/Textures/Objects/Specific/Hydroponics/aloe.rsi/produce.png
# Resources/Textures/Objects/Specific/Hydroponics/apple.rsi/produce.png
# Resources/Textures/Objects/Specific/Hydroponics/cannabis.rsi/produce.png
# Resources/Textures/Objects/Tools/crowbar.rsi/meta.json
# Resources/Textures/Objects/Tools/crowbar.rsi/red-icon.png
# Resources/Textures/Objects/Tools/crowbar.rsi/red-storage.png
# Resources/Textures/Structures/Wallmounts/Lighting/light_tube.rsi/base.png
# Resources/Textures/Structures/Wallmounts/Lighting/light_tube.rsi/broken.png
# Resources/Textures/Structures/Wallmounts/Lighting/light_tube.rsi/burned.png
# Resources/Textures/Structures/Wallmounts/Lighting/light_tube.rsi/empty.png
# Resources/Textures/Structures/Wallmounts/Lighting/light_tube.rsi/glow.png
# Resources/Textures/Structures/Wallmounts/Lighting/light_tube.rsi/meta.json
# Resources/migration.yml
2024-08-14 19:55:44 +03:00
Errant
9de922adba
development build ghostrole lottery changes ( #30980 )
...
debug ghostrole lottery changes
2024-08-14 11:57:09 +10:00
VigersRay
c0ee7e3cc9
Merge remote-tracking branch 'refs/remotes/wizards/master'
...
# Conflicts:
# .github/PULL_REQUEST_TEMPLATE.md
# Content.Client/Lobby/LobbyUIController.cs
# Content.Client/Lobby/UI/HumanoidProfileEditor.xaml.cs
# Content.Client/Players/PlayTimeTracking/JobRequirementsManager.cs
# Content.Server/Administration/Systems/BwoinkSystem.cs
# Content.Server/IoC/ServerContentIoC.cs
# Content.Server/Players/PlayTimeTracking/PlayTimeTrackingSystem.cs
# Content.Server/Shuttles/Systems/ArrivalsSystem.cs
# Content.Shared/Preferences/Loadouts/LoadoutPrototype.cs
# Content.Shared/Roles/JobRequirements.cs
# Resources/Prototypes/Accents/word_replacements.yml
# Resources/Prototypes/Catalog/Fills/Lockers/security.yml
# Resources/Prototypes/Entities/Mobs/Species/base.yml
# Resources/Prototypes/Loadouts/Jobs/Cargo/cargo_technician.yml
# Resources/Prototypes/Loadouts/Jobs/Cargo/quartermaster.yml
# Resources/Prototypes/Loadouts/Jobs/Civilian/bartender.yml
# Resources/Prototypes/Loadouts/Jobs/Civilian/botanist.yml
# Resources/Prototypes/Loadouts/Jobs/Civilian/chaplain.yml
# Resources/Prototypes/Loadouts/Jobs/Civilian/chef.yml
# Resources/Prototypes/Loadouts/Jobs/Civilian/janitor.yml
# Resources/Prototypes/Loadouts/Jobs/Civilian/lawyer.yml
# Resources/Prototypes/Loadouts/Jobs/Civilian/librarian.yml
# Resources/Prototypes/Loadouts/Jobs/Civilian/mime.yml
# Resources/Prototypes/Loadouts/Jobs/Civilian/passenger.yml
# Resources/Prototypes/Loadouts/Jobs/Command/captain.yml
# Resources/Prototypes/Loadouts/Jobs/Command/head_of_personnel.yml
# Resources/Prototypes/Loadouts/Jobs/Engineering/atmospheric_technician.yml
# Resources/Prototypes/Loadouts/Jobs/Engineering/chief_engineer.yml
# Resources/Prototypes/Loadouts/Jobs/Engineering/station_engineer.yml
# Resources/Prototypes/Loadouts/Jobs/Engineering/technical_assistant.yml
# Resources/Prototypes/Loadouts/Jobs/Medical/chemist.yml
# Resources/Prototypes/Loadouts/Jobs/Medical/chief_medical_officer.yml
# Resources/Prototypes/Loadouts/Jobs/Medical/medical_doctor.yml
# Resources/Prototypes/Loadouts/Jobs/Medical/medical_intern.yml
# Resources/Prototypes/Loadouts/Jobs/Medical/paramedic.yml
# Resources/Prototypes/Loadouts/Jobs/Science/research_director.yml
# Resources/Prototypes/Loadouts/Jobs/Science/scientist.yml
# Resources/Prototypes/Loadouts/Jobs/Security/detective.yml
# Resources/Prototypes/Loadouts/Jobs/Security/head_of_security.yml
# Resources/Prototypes/Loadouts/Jobs/Security/security_cadet.yml
# Resources/Prototypes/Loadouts/Jobs/Security/security_officer.yml
# Resources/Prototypes/Loadouts/Jobs/Security/warden.yml
# Resources/Prototypes/Loadouts/Miscellaneous/trinkets.yml
# Resources/Prototypes/Recipes/Lathes/medical.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/Science/research_director.yml
# Resources/Prototypes/Roles/Jobs/Security/head_of_security.yml
# Resources/Textures/Clothing/Mask/sadmime.rsi/meta.json
# Resources/Textures/Clothing/Mask/scaredmime.rsi/meta.json
# Resources/Textures/Clothing/OuterClothing/WinterCoats/coat.rsi/meta.json
# Resources/Textures/Clothing/OuterClothing/WinterCoats/coatatmos.rsi/meta.json
# Resources/Textures/Clothing/OuterClothing/WinterCoats/coatcap.rsi/meta.json
# Resources/Textures/Clothing/OuterClothing/WinterCoats/coatcargo.rsi/meta.json
# Resources/Textures/Clothing/OuterClothing/WinterCoats/coatce.rsi/meta.json
# Resources/Textures/Clothing/OuterClothing/WinterCoats/coatcentcom.rsi/meta.json
# Resources/Textures/Clothing/OuterClothing/WinterCoats/coatchem.rsi/meta.json
# Resources/Textures/Clothing/OuterClothing/WinterCoats/coatcmo.rsi/meta.json
# Resources/Textures/Clothing/OuterClothing/WinterCoats/coatengi.rsi/meta.json
# Resources/Textures/Clothing/OuterClothing/WinterCoats/coatgen.rsi/meta.json
# Resources/Textures/Clothing/OuterClothing/WinterCoats/coathop.rsi/meta.json
# Resources/Textures/Clothing/OuterClothing/WinterCoats/coathos.rsi/meta.json
# Resources/Textures/Clothing/OuterClothing/WinterCoats/coathydro.rsi/meta.json
# Resources/Textures/Clothing/OuterClothing/WinterCoats/coatjani.rsi/meta.json
# Resources/Textures/Clothing/OuterClothing/WinterCoats/coatmed.rsi/meta.json
# Resources/Textures/Clothing/OuterClothing/WinterCoats/coatmime.rsi/meta.json
# Resources/Textures/Clothing/OuterClothing/WinterCoats/coatminer.rsi/meta.json
# Resources/Textures/Clothing/OuterClothing/WinterCoats/coatparamed.rsi/meta.json
# Resources/Textures/Clothing/OuterClothing/WinterCoats/coatqm.rsi/meta.json
# Resources/Textures/Clothing/OuterClothing/WinterCoats/coatrd.rsi/meta.json
# Resources/Textures/Clothing/OuterClothing/WinterCoats/coatrobo.rsi/meta.json
# Resources/Textures/Clothing/OuterClothing/WinterCoats/coatsci.rsi/meta.json
# Resources/Textures/Clothing/OuterClothing/WinterCoats/coatsec.rsi/meta.json
# Resources/Textures/Clothing/OuterClothing/WinterCoats/coatviro.rsi/meta.json
# Resources/Textures/Clothing/OuterClothing/WinterCoats/coatwarden.rsi/meta.json
# Resources/Textures/Structures/Power/apc.rsi/base.png
# Resources/Textures/Structures/Power/apc.rsi/broken.png
# Resources/Textures/Structures/Power/apc.rsi/display-charging.png
# Resources/Textures/Structures/Power/apc.rsi/display-full.png
# Resources/Textures/Structures/Power/apc.rsi/display-lack.png
# Resources/Textures/Structures/Power/apc.rsi/display-remote.png
# Resources/Textures/Structures/Power/apc.rsi/emag-unlit.png
# Resources/Textures/Structures/Power/apc.rsi/frame.png
# Resources/Textures/Structures/Power/apc.rsi/static.png
2024-08-05 17:22:05 +03:00
Plykiya
e6b67540e4
Update MoverController.cs to not use Component.Owner ( #29965 )
...
* Update MoverController.cs
* Update a bunch of movement code to use Entity<T>
* Last errors
* wow, there were more errors
---------
Co-authored-by: plykiya <plykiya@protonmail.com>
2024-08-02 11:32:32 +10:00
VigersRay
31b256cce8
Merge remote-tracking branch 'refs/remotes/wizards/master'
...
# Conflicts:
# .github/PULL_REQUEST_TEMPLATE.md
# Resources/Prototypes/Accents/word_replacements.yml
# Resources/Prototypes/Entities/Mobs/Species/arachnid.yml
# Resources/Prototypes/Entities/Mobs/Species/base.yml
# Resources/Prototypes/Entities/Mobs/Species/moth.yml
# Resources/Prototypes/Recipes/Crafting/Graphs/improvised/makeshiftstunprod.yml
# Resources/Prototypes/Traits/disabilities.yml
# Resources/Textures/Clothing/Head/Helmets/paramedhelm.rsi/meta.json
# Resources/Textures/Clothing/Head/Hoods/rad.rsi/meta.json
# Resources/Textures/Clothing/Head/Misc/pumpkin.rsi/meta.json
2024-07-24 20:36:22 +03:00
Scribbles0
7381df4335
Handless mobs can no longer wipe devices ( #30149 )
...
add check for hands
2024-07-23 10:47:07 -07:00
VigersRay
d2c1a1df88
Merge remote-tracking branch 'refs/remotes/wizards/master'
...
# Conflicts:
# Content.Client/Administration/UI/Tabs/ObjectsTab/ObjectsTab.xaml.cs
# Content.Client/Power/PowerMonitoringWindow.xaml.cs
# Content.Client/SurveillanceCamera/UI/SurveillanceCameraMonitorBoundUi.cs
# Content.Client/VoiceMask/VoiceMaskBoundUserInterface.cs
# Content.Client/VoiceMask/VoiceMaskNameChangeWindow.xaml.cs
# Content.IntegrationTests/Tests/GameRules/NukeOpsTest.cs
# Content.IntegrationTests/Tests/PostMapInitTest.cs
# Content.Server/GameTicking/GameTicker.RoundFlow.cs
# Content.Server/Ghost/Roles/GhostRoleSystem.cs
# Content.Server/Players/PlayTimeTracking/PlayTimeTrackingSystem.cs
# Content.Server/Station/Systems/StationJobsSystem.Roundstart.cs
# Resources/Prototypes/Entities/Objects/Devices/Syndicate_Gadgets/reinforcement_teleporter.yml
# Resources/ServerInfo/Guidebook/Mobs/SlimePerson.xml
# Resources/Textures/Structures/Walls/mining.rsi/meta.json
2024-07-22 04:16:05 +03:00
Plykiya
aded74a88a
Syndicate Reinforcement Specializations: Medic, Spy, Thief ( #29853 )
...
* Syndicate thief, spy, medic
* Fixes description for nukies
* update description for uplink
* Implement the radial menu
* forgot these were necessary to push lol
---------
Co-authored-by: plykiya <plykiya@protonmail.com>
2024-07-21 20:32:25 +10:00
VigersRay
5fed5ad979
Куча разного говна которое давно должно было в билде.
2024-07-15 01:22:56 +03:00
metalgearsloth
03f0257ae9
Revert "Picking a ghostrole as an admin will now deadmin you. ( #29790 )" ( #29901 )
...
This reverts commit 1a50760e67
2024-07-11 17:04:10 +10:00
MFMessage
1a50760e67
Picking a ghostrole as an admin will now deadmin you. ( #29790 )
...
* @forcibly deadmins you
* Added checks for AdminDeadminOnJoin
2024-07-11 15:53:14 +10:00
VigersRay
8420fd6ad2
Редизайн лобби 2
2024-07-05 10:22:18 +03:00
VigersRay
9f2d4053e3
Merge remote-tracking branch 'refs/remotes/wizards/master'
...
# Conflicts:
# Content.Client/UserInterface/Controls/RadialContainer.cs
# Resources/Prototypes/Loadouts/loadout_groups.yml
# Resources/Prototypes/Loadouts/role_loadouts.yml
2024-07-04 09:23:18 +03:00
lzk
58d46ddd46
Fix GhostCommand naming ( #29671 )
2024-07-03 10:01:17 +10:00
VigersRay
06dcab6a05
Фиксы спонсорки
2024-07-01 17:24:00 +03:00
TsjipTsjip
949a837720
Ghostrole rule updates ( #29249 )
...
* First batch of ghostrole rule updates
* Second pass
* Re-word free agent
* Apply review comments
Co-authored-by: Chief-Engineer <119664036+Chief-Engineer@users.noreply.github.com>
* You heard it here first folks
God rules are weird to write.
Co-authored-by: Chief-Engineer <119664036+Chief-Engineer@users.noreply.github.com>
* Honkbot -> Free Agent
Co-authored-by: Chief-Engineer <119664036+Chief-Engineer@users.noreply.github.com>
* Mimebot -> Free Agent
Co-authored-by: Chief-Engineer <119664036+Chief-Engineer@users.noreply.github.com>
* Jonkbot -> Free Agent
Co-authored-by: Chief-Engineer <119664036+Chief-Engineer@users.noreply.github.com>
* Softer blue
---------
Co-authored-by: Chief-Engineer <119664036+Chief-Engineer@users.noreply.github.com>
2024-06-21 04:41:54 -05:00
Leon Friedrich
b632a65385
Add JobRequirementOverride prototypes ( #28607 )
...
* Add JobRequirementOverride prototypes
* a
* invert if
* Add override that takes in prototypes directly
2024-06-07 09:43:02 -07:00
Plykiya
41549db282
Remove obsolete VisibilitySystem functions ( #28610 )
...
Remove obsolete visibility functions
Co-authored-by: plykiya <plykiya@protonmail.com>
2024-06-05 17:04:31 +10:00
Leon Friedrich
6235fa1ac6
Content changes for entity categories PR ( #27232 )
...
* Content changes for entity categories PR
* Poke tests
* Why are tests suddenly working?
2024-06-02 14:08:15 +10:00
Tayrtahn
8995810ade
Fix non-ghosts and admins counting toward most followed ( #28120 )
...
* Fixed non-ghosts and admins counting toward most followed
* Redone to better leverage EntityQueryEnumerator
* Remember to test your code before you commit it, kids
* Review revisions
* Update Content.Shared/Follower/FollowerSystem.cs
Co-authored-by: ShadowCommander <shadowjjt@gmail.com>
* Update Content.Shared/Follower/FollowerSystem.cs
Co-authored-by: ShadowCommander <shadowjjt@gmail.com>
* Update Content.Shared/Follower/FollowerSystem.cs
* Clean up
---------
Co-authored-by: ShadowCommander <shadowjjt@gmail.com>
Co-authored-by: ShadowCommander <10494922+ShadowCommander@users.noreply.github.com>
2024-05-20 07:12:05 -07:00
Tayrtahn
fa06783986
Prevent ghosts from spawning on terminating maps/grids ( #28099 )
...
* Extra checks to prevent ghosts spawning on terminating maps/grids
* Add test for grid deletion
2024-05-20 06:52:49 -07:00
Kara
993eef1e7c
Resolve 'EntitySystem.Get<T>()' is obsolete in content ( #27936 )
...
* PROJECT 0 WARNINGS: Resolve `'EntitySystem.Get<T>()' is obsolete` in content
* pass entman
* dog ass test
* webeditor
2024-05-12 20:34:52 -04:00
no
37099e481e
Prevent admin-frozen players from ghosting or suiciding, add "Freeze And Mute" verb ( #27813 )
...
* prevent admin-frozen players from ghosting or suiciding
* Add "Freeze and Mute" admin verb
* Allow "Freeze And Mute" admin verb when player is already frozen but not muted
* Remove redundant scream handler (scream action just emotes, duh)
* AdminFrozenSystem: clean imports
* Update Content.Server/Chat/Commands/SuicideCommand.cs
Co-authored-by: metalgearsloth <31366439+metalgearsloth@users.noreply.github.com>
* Update Ghost.cs
* retrigger ci (empty commit)
---------
Co-authored-by: metalgearsloth <31366439+metalgearsloth@users.noreply.github.com>
2024-05-12 10:35:30 -04:00
Kara
1596e04d0f
Resolve all non-obsoleting warnings in content ( #27934 )
...
* Resolve all non-obsoleting warnings in content
* Update ClientGameTicker.cs
* Update SkeletonAccentSystem.cs
* Update BwoinkSystem.cs
2024-05-11 20:13:58 -07:00
keronshb
999d044139
Magic Refactor + Wizard Grimoire ( #22568 )
...
* Brings over changes from the original magic refactor PR
* Adds Master Spellbook, spellbook categories, WizCoin currency, and locale
* Wiz€oin™
* Adds currency whitelist to Spellbook preset, grants contained actions on action added.
* Adds grant contained action and remove provided action.
* adds a way for actions to be upgraded to the store
* Adds Fireball 3 and fixes action upgrade logic so that it checks if the action can level or if the action can upgrade separately
* Fixes upgrade logic in ActionUpgradeSystem to allow for level ups without an actual upgrade. Fixed action upgrade logic in store system as well
* Removes current action entity from the bought entities list and adds new or old action entity
* Removes Current Entity
* Removes old comments, fixes TransferAllActionsWithNewAttached
* Removes TODO
* Removes Product Action Upgrade Event
* reverts changes to immovablerodrule
* Removes stale event reference
* fixes mind action grant logic
* reverts shared gun system change to projectile anomaly system
* forgor to remove the using
* Reverts unintended changes to action container
* Adds refund button to the store
* Refreshes store back to origin.
* Refund with correct currency
* Init refund
* Check for terminating and update interface
* Disables refund button
* Removes preset allow refund
* dont refund if map changed
* adds refunds to stores
* Adds method to check for starting map
* comments, datafields, some requested changes
* turns event into ref event
* Adds datafields
* Switches to entity terminating event
* Changes store entity to be nullable and checks if store is terminating to remove reference.
* Tryadd instead of containskey
* Adds a refund disable method, disables refund on bought ent container changes if not an action
* Removes duplicate refundcomp
* Removes unintended merges
* Removed another unintended change from merge
* removes extra using statement
* readds using statement
* might as well just remove both usings since it won't leave the PR
* Fixes Action upgrades from stores
* Changes to non obsolete method uses
* Shares spawn code between instant and world
* Adds action entity to action event, adds beforecastspellevent, adds spell requirements to magic component
* puts prereq check in spell methods, sets up template code for before cast event
* checks for required wizard clothes
* Networks Magic Comp and Wizard Clothes Comp. Renames MagicSpawnData to MagicInstantSpawnData.
* Removes posdata from projectiles
* Speech > RequiresSpeech
* Fixes ActionOnInteract
* checks for muted
* popup for missing reqs
* Validate click loc for blink spell
* Checks if doors are in range and not obstructed before opening
* Check ents by map coords
* Adds speak event
* Comments spellbooks
* Removes comments
* Unobsoletes smite spell
* Invert if
* Requirements loc
* Fixes spell reqs
* Inverts an if
* Comment updates
* Starts doafter work
* Removes doafter references
* Balances fireball upgrades to be more reasonable
* Enables refund on master spellbooks
* Spells to do
* update spellbook doafter
* knock toggles bolts
* Touch Spell comments
* Comments for pending spells
* more comments
* adds spider polymorph to spellbook
* TODOs for spells
* reorganizes spellbook categories and adds wands
* fixes spacing and adds limited conditions
* commented owner only for future store PR
* reenables owner only for the grimoire
* fixes grimoire sprite
* Adds wizard rod polymorph
* summon ghosts event
* Moves rod form to offensive category
* Adds charge spell and loc for rod polymorph
* Oops forgor the actual chages
* Item Recall comment
* Fixes UI
* removes extra field for wizard rod
* Cleanup
* New Condition (INCOMPLETE)
* Fix linter
* Fix linter (for real)
* fixed some descriptions
* adds regions to magic
* Adds a non-refund wizard grimoire, fixes blink to deselect after teleporting, reduces force wall despawn time to 12 seconds
* removes limited upgrade condition
---------
Co-authored-by: AJCM <AJCM@tutanota.com>
2024-05-11 19:06:49 -04:00
ShadowCommander
a985c5e83e
Fix ghosts getting spawned in nullspace ( #27617 )
...
* Add tests for ghost spawn position
* Make ghosts spawn immediately
* Format mind system
* Move ghost spawning to GhostSystem
* Spawn ghost on grid or map
This fixes the ghosts being attached the parent entity instead of the grid.
* Move logging out of the ghost system
* Make round start observer spawn using GhostSystem
* Move GameTicker ghost spawning to GhostSystem
Moved the more robust character name selection code over.
Moved the TimeOfDeath code over.
Added canReturn logic.
* Add overrides and default for ghost spawn coordinates
* Add warning log to ghost spawn fail
* Clean up test
* Dont spawn ghost on map delete
* Minor changes to the role test
* Fix role test failing to spawn ghost
It was failing the map check due to using Nullspace
* Fix ghost tests when running in parallel
Not sure what happened, but it seems to be because they were running simultaneously and overwriting values.
* Clean up ghost tests
* Test that map deletion does not spawn ghosts
* Spawn ghost on the next available map
* Disallow spawning on deleted maps
* Fix map deletion ghost test
* Cleanup
2024-05-11 11:03:40 -04:00
no
630a7a78ed
Add ghost role raffles ( #26629 )
...
* Add ghost role raffles
* GRR: Fix dialogue sizing, fix merge
* GRR: Add raffle deciders (winner picker)
* GRR: Make settings prototype based with option to override
* GRR: Use Raffles folder and namespace
* GRR: DataFieldify and TimeSpanify
* GRR: Don't actually DataFieldify HashSet<ICommonSession>s
* GRR: add GetGhostRoleCount() + docs
* update engine on branch
* Ghost role raffles: docs, fix window size, cleanup, etc
* GRR: Admin UI
* GRR: Admin UI: Display initial/max/ext of selected raffle settings proto
* GRR: Make a ton of roles raffled
2024-05-06 18:48:16 -07:00
deltanedas
ff762e56a7
add ghostnado button to warp menu ( #27556 )
...
* add ghostnado button to warp menu
* translator ops
---------
Co-authored-by: deltanedas <@deltanedas:kde.org>
2024-05-01 06:59:35 -07:00
Mr. 27
50fb91bd18
monkey reinforcement teleporters can now select between kobold or monkey with a verb ( #25982 )
...
* inital
* Update animals.yml
* Update animals.yml
* Update Content.Server/Ghost/Roles/Components/GhostRoleMobSpawnerComponent.cs
Co-authored-by: Tayrtahn <tayrtahn@gmail.com>
* Update Content.Server/Ghost/Roles/Components/GhostRoleMobSpawnerComponent.cs
Co-authored-by: Tayrtahn <tayrtahn@gmail.com>
* Update Content.Server/Ghost/Roles/Components/GhostRoleMobSpawnerComponent.cs
Co-authored-by: Tayrtahn <tayrtahn@gmail.com>
* Update Content.Server/Ghost/Roles/Components/GhostRoleMobSpawnerComponent.cs
Co-authored-by: Tayrtahn <tayrtahn@gmail.com>
* Update Content.Server/Ghost/Roles/Components/GhostRoleMobSpawnerComponent.cs
Co-authored-by: Tayrtahn <tayrtahn@gmail.com>
* selecting different role will change the description and name
* fix name
* gargh
* the review
Hello
* e
---------
Co-authored-by: Tayrtahn <tayrtahn@gmail.com>
2024-04-26 15:06:43 +02:00
Leon Friedrich
cb8f145975
Fix GhostRoleComponent performing randomization on ComponentInit ( #26466 )
...
* Fix ghostrole ComponentInit
* A
* a
2024-03-27 00:31:26 -04:00
LordCarve
05a2e6b3a2
Obsolete refactor - ConnectedClient to Channel ( #24409 )
2024-01-23 09:14:13 +11:00
Kara
0ae3858b69
Examine prediction ( #23565 )
...
* Initial prediction
* new group handling
* groups for all examines that use multiple rn
* compile
* why was it doing this??
* handle newlines with sorting properly
2024-01-06 17:53:13 +11:00
metalgearsloth
c326e5d087
Fix multi-ghosts ( #22964 )
...
* Fix multi-ghosts
* Fix mind visits
2023-12-26 00:19:12 +11:00
Leon Friedrich
f308adffaf
Move ActorComponent to shared ( #21293 )
2023-10-29 04:21:02 +11:00
Leon Friedrich
e685cb626b
Un-revert IPlayerManager refactor ( #21244 )
2023-10-28 09:59:53 +11:00
metalgearsloth
a2bbda43cc
Revert "Update submodule to 172.0.0 ( #21222 )" ( #21225 )
2023-10-24 21:55:20 +11:00
Leon Friedrich
7ba0ea2926
IPlayerManager refactor ( #21215 )
2023-10-24 20:19:08 +11:00
DrSmugleaf
5734f02de5
Fix ghost actions disappearing when toggling visibility of other ghosts ( #21033 )
2023-10-20 00:05:33 -07:00
DrSmugleaf
f560f88eb5
Remove 700 usages of Component.Owner ( #21100 )
2023-10-19 12:34:31 -07:00
