Vigers Ray
cb17bfcefe
Новая цель на убийство других антагонистов
2025-01-04 02:11:42 +03:00
Vigers Ray
1c41206802
Merge remote-tracking branch 'refs/remotes/wizards/master'
...
# Conflicts:
# Content.Server/Objectives/Systems/KillPersonConditionSystem.cs
# Resources/Locale/en-US/_strings/actions/actions/wagging.ftl
2024-12-28 19:43:59 +03:00
psykana
616d34102b
Traitor can no longer get multiple objectives to save/help/kill the same person ( #33704 )
...
* Deduplicate traitor objectives
* Remove redundant check
2024-12-28 15:49:03 +01:00
Vigers Ray
af8ff96d07
Фикс целей на убийство. Небольшие баланс правки целей антагов.
2024-11-29 03:06:15 +03:00
Vigers Ray
603af43241
фиксы апстрима
2024-11-19 18:50:55 +03: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
ActiveMammmoth
22987fc77f
Wizard Summon Guns/Magic ( #32692 )
...
* mostly done but there's a bug with spawning
* RandomGlobalSpawnSpellEvent now actually works
* Summon Guns/Magic is working
* Added sound, cap gun, and auto pick up
* Added all requested changes/fixes from reviews
* Halving cooldowns
2024-11-17 17:46:31 +01: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
Theodore Lukin
c78b5ae83d
Fix warden being and qm being not considered head for tot kill head objective ( #32721 )
...
* fixed warden being and qm being not considered head for traitor kill head objective
* fixed hypothetical warden traitor not getting disk objective
* change suggested by deltanedas
* cleanup
* cleanup
* fix
* changed as suggested
* removed a dot in the comment
* removed an empty line
* reformulation
2024-10-18 11:43:05 +02:00
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
f4081b90fe
Исправил отсутсвие целей на убийства у агентов.
2024-07-25 00:48:02 +03:00
VigersRay
ed452581ce
Целью на убийство для антагониста может быть только экипаж основной станции
2024-07-12 06:16:42 +03:00
deltanedas
f7711edbe3
Objectives ecs rework ( #19967 )
...
Co-authored-by: deltanedas <@deltanedas:kde.org>
2023-09-16 16:18:10 +10:00
