195 Commits

Author SHA1 Message Date
Charlotte Tezuka
ea713efb05 Merge remote-tracking branch 'corvax/master' into upstream 2026-01-14 18:15:24 +02:00
slarticodefast
a428130d45 Remove blacklist methods in EntityWhitelistSystem (#40932)
* replace blacklist methods

* VS is trolling me
2025-11-24 00:38:08 +00:00
Charlotte Tezuka
1595f938d3 Merge remote-tracking branch 'corvax/master' into wl-upstream 2025-11-11 16:35:48 +02:00
Super
dd61991b1c Add multi-job exclusion support to objectives, and add more appropriate job restrictions to certain thief objectives. (#40065)
* multi exclusion!

* quick correction

* migrate all job: fields to jobs fields to avoid test fails. breaking change!!!
2025-10-31 09:26:25 +00:00
Connor Huffine
ecc0aaaa9f Ninja Bomb Blacklisting (#40726)
* Ninja Bombing moved to blacklist

* Added blocker to "Solars"

Solars is too generic for a named bombing target.

* Change to AllEntityQuery

More clear intent

* Update migration.yml

Add migration to 'null' for removed WarpPointBombing entity

* Update NinjaConditionsSystem.cs

Undo some tidying

* Changed to tag

Ninja blocking component is now a tag instead of a new component

* Update NinjaConditionsSystem.cs

detidying

* Update NinjaConditionsSystem.cs

Change to efficient enumerator

* Move blacklist to component

Moved blacklist to spidercharge component

* Update migration.yml

fixed component reference

* Update migration.yml

Fixes Saltern. Exo is more complicated.

---------

Co-authored-by: ArtisticRoomba <145879011+ArtisticRoomba@users.noreply.github.com>
2025-10-10 21:16:50 +00:00
Charlotte Tezuka
d5e69e73e5 Upstream from corvax/master 19.09 2025-09-19 00:42:32 +02:00
B_Kirill
438090a505 Cleanup warnings: CS0414 (#39748)
* Cleanup

* Fix
2025-08-19 09:42:54 +02:00
slarticodefast
2743dcf67f Move mind role components to shared (#39606) 2025-08-13 12:51:46 +02:00
deltanedas
1d21e13360 make objectives use yml defined mind filters (#36030)
* add MindHasRole whitelist overload

* add mind filters framework

* add different mind filters and pools

* update traitor stuff to use mind filters

* line

* don't duplicate kill objectives

* g

* gs

---------

Co-authored-by: deltanedas <@deltanedas:kde.org>
Co-authored-by: ScarKy0 <106310278+ScarKy0@users.noreply.github.com>
Co-authored-by: ScarKy0 <scarky0@onet.eu>
Co-authored-by: SlamBamActionman <slambamactionman@gmail.com>
2025-08-08 17:58:46 +02:00
Kyle Tyo
d4c025567a Predict warp point location examines. (#39402)
commit
2025-08-05 20:26:41 +02:00
ssdaniel24
6591aabe4f Merge remote-tracking branch 'corvax/master' into upstream-07-23 2025-07-23 22:35:40 +03:00
beck-thompson
a48c390854 Objectives that do not fit requirements are now deleted (#38365)
* Fix

* Update Content.Server/Objectives/ObjectivesSystem.cs

Thanks Tayrathn!

Co-authored-by: Tayrtahn <tayrtahn@gmail.com>

---------

Co-authored-by: Tayrtahn <tayrtahn@gmail.com>
2025-06-16 18:54:11 -04:00
ssdaniel24
3fc0562c41 Merge remote-tracking branch 'corvax/master' into wl-upstream-sync-06-10
Conflicts:
	Content.Server/GameTicking/GameTicker.Spawning.cs
	Resources/Credits/GitHub.txt
	Resources/Prototypes/Entities/Clothing/Head/eva-helmets.yml
	Resources/Prototypes/Entities/Objects/Tools/jetpacks.yml
	Resources/Prototypes/Entities/Objects/Weapons/Guns/Shotguns/shotguns.yml
	Resources/Prototypes/GameRules/cargo_gifts.yml
	Resources/Prototypes/Maps/omega.yml
	Resources/Prototypes/Reagents/Consumable/Drink/alcohol.yml
	Resources/Textures/Mobs/Customization/reptilian_parts.rsi/meta.json
	Resources/Textures/Mobs/Customization/reptilian_parts.rsi/tail_large_wagging.png
2025-06-10 22:07:39 +03:00
ssdaniel24
d399099102 Merge remote-tracking branch 'corvax/master' into wl-upstream-sync-try-2
Conflicts:
   Content.Client/Humanoid/HumanoidAppearanceSystem.cs
   Content.Client/LateJoin/LateJoinGui.cs
   Content.Client/Stylesheets/StyleNano.cs
   Content.Server/Administration/Systems/AdminVerbSystem.Tools.cs
   Content.Server/Fax/FaxSystem.cs
   Content.Server/GameTicking/GameTicker.Spawning.cs
   Content.Server/Objectives/Systems/KillPersonConditionSystem.cs
   Content.Server/Station/Systems/StationSpawningSystem.cs
   Content.Shared.Database/LogType.cs
   Content.Shared/Ghost/GhostComponent.cs
   Content.Shared/Humanoid/SharedHumanoidAppearanceSystem.cs
   Content.Shared/Preferences/HumanoidCharacterProfile.cs
   Content.Shared/Roles/SharedRoleSystem.cs
   README.md
   Resources/ConfigPresets/Corvax/common.toml
   Resources/Credits/GitHub.txt
   Resources/Locale/ru-RU/ss14-ru/prototypes/entities/mobs/cyborgs/base_borg_chassis.ftl
   Resources/Maps/Shuttles/trading_outpost.yml
   Resources/Prototypes/Corvax/Roles/Jobs/Command/iaa.yml
   Resources/Prototypes/Corvax/Roles/Jobs/Security/brigmedic.yml
   Resources/Prototypes/Corvax/Roles/Jobs/Security/pilot.yml
   Resources/Prototypes/Entities/Clothing/OuterClothing/base_clothingouter.yml
   Resources/Prototypes/Entities/Mobs/Customization/Markings/reptilian.yml
   Resources/Prototypes/Entities/Mobs/Cyborgs/base_borg_chassis.yml
   Resources/Prototypes/Entities/Objects/Weapons/Guns/Battery/battery_guns.yml
   Resources/Prototypes/Entities/Objects/Weapons/Melee/sword.yml
   Resources/Prototypes/Entities/Structures/Machines/chem_master.yml
   Resources/Prototypes/Entities/Structures/Power/substation.yml
   Resources/Prototypes/GameRules/cargo_gifts.yml
   Resources/Prototypes/GameRules/events.yml
   Resources/Prototypes/GameRules/meteorswarms.yml
   Resources/Prototypes/Maps/bagel.yml
   Resources/Prototypes/Reagents/Consumable/Drink/drinks.yml
   Resources/Prototypes/Reagents/chemicals.yml
   Resources/Prototypes/Reagents/medicine.yml
   Resources/Prototypes/Reagents/pyrotechnic.yml
   Resources/Prototypes/Reagents/toxins.yml
   Resources/Prototypes/Recipes/Cooking/meal_recipes.yml
   Resources/Prototypes/Roles/Jobs/Cargo/quartermaster.yml
   Resources/Prototypes/Roles/Jobs/Command/captain.yml
   Resources/Prototypes/Roles/Jobs/Command/head_of_personnel.yml
   Resources/Prototypes/Roles/Jobs/Engineering/chief_engineer.yml
   Resources/Prototypes/Roles/Jobs/Medical/chief_medical_officer.yml
   Resources/Prototypes/Roles/Jobs/Medical/paramedic.yml
   Resources/Prototypes/Roles/Jobs/Science/research_director.yml
   Resources/Prototypes/Roles/Jobs/Security/detective.yml
   Resources/Prototypes/Roles/Jobs/Security/head_of_security.yml
   Resources/Prototypes/Roles/Jobs/Security/security_officer.yml
   Resources/Prototypes/Roles/Jobs/Security/warden.yml
   Resources/Prototypes/Voice/disease_emotes.yml
   Resources/Prototypes/Voice/speech_emotes.yml
   Resources/Prototypes/radio_channels.yml
   Resources/Textures/Effects/speech.rsi/meta.json
   Resources/Textures/Interface/Default/Slots/id.png
   Resources/Textures/Interface/Minimalist/Slots/pda.png
   Resources/Textures/Mobs/Customization/reptilian_parts.rsi/meta.json
   Resources/Textures/Mobs/Silicon/chassis.rsi/meta.json
   RobustToolbox
2025-06-02 12:30:02 +03:00
Tayrtahn
447f866745 Cleanup warning in StealConditionSystem (#37903)
Fix 1 warning in StealConditionSystem
2025-05-28 18:17:43 +02:00
ScarKy0
0cb9e803e5 Tweak "Escape" objective to allow yellowtexting (#37680)
init
2025-05-21 20:25:07 -07:00
ScarKy0
572b20464c Tweak "Help a fellow traitor" objective to allow yellowtexting (#37679)
init
2025-05-21 16:45:34 -04:00
LEVELcat
39d96ee4cc fix GetTitle in TargetObjectiveSystem 2025-05-19 01:19:08 +03:00
LEVELcat
5564eb1c36 fix subname in objectives 2025-05-19 00:46:23 +03:00
LEVELcat
dd394530a2 revert some code from subnames 2025-05-18 22:11:34 +03:00
ScarKy0
4ac4d3e080 Yellowtexting (#37360)
* init

* else if tree

* f

* color

* review
2025-05-12 12:22:25 -04:00
ScarKy0
9b5ddb87f5 Fix brains, borgs etc not counting as marooned (#37148)
* init

* comments

* comment

* no more debug
2025-05-06 13:24:26 -04:00
keronshb
0a394d4af5 Wizard Teleport Scroll (Teleport Location ECS) (#36424) 2025-04-28 19:42:24 +02:00
ScarKy0
14cca7990a [HOTFIX] Fix maroon objective, change the text (#36990)
* test

* text

* capital C

* guh
2025-04-28 11:31:42 +02:00
LEVELcat
1244d80342 Merge branch 'master' of https://github.com/space-syndicate/space-station-14 into upsteam
# Resolved Conflicts:
#	Content.Client/Lobby/UI/HumanoidProfileEditor.xaml.cs
#	Content.Shared/Silicons/StationAi/SharedStationAiSystem.Held.cs
#	Resources/Credits/GitHub.txt
#	Resources/Prototypes/Corvax/Roles/Jobs/Command/iaa.yml
#	Resources/Prototypes/GameRules/events.yml
2025-04-23 01:51:58 +03:00
Jackson Langley
256b6b88fb Require traitors to maroon their objective no matter what (#35825)
* jesus

* okay.

* OOPS

* ok

* ok

Co-authored-by: slarticodefast <161409025+slarticodefast@users.noreply.github.com>

* ok

* Update Resources/Prototypes/Objectives/paradoxClone.yml

Co-authored-by: slarticodefast <161409025+slarticodefast@users.noreply.github.com>

* Update Resources/Prototypes/Objectives/base_objectives.yml

Co-authored-by: slarticodefast <161409025+slarticodefast@users.noreply.github.com>

* m

* ok

* ok

---------

Co-authored-by: slarticodefast <161409025+slarticodefast@users.noreply.github.com>
2025-04-20 17:34:19 -04:00
slarticodefast
f6bfce38da remove mind roles from EntityWhitelist (#36089)
* remove mind roles from EntityWhitelist

* remove redundant dependency
2025-04-10 20:45:12 +10:00
Tayrtahn
048dcd9eeb Fix lsobjectives target player logic (#36398)
* Fix lsobjectives target player logic

* Logic 3.0
2025-04-08 21:42:38 +02:00
slarticodefast
b276524468 fix rmobjective command and add completion options (#36396)
fix rmobjective command
2025-04-08 16:54:13 +02:00
LEVELcat
790070d410 Merge branch 'master' of https://github.com/space-syndicate/space-station-14 into upstreamAgain
# Resolved Conflicts:
#	.github/workflows/publish.yml
#	Content.IntegrationTests/Tests/Commands/SuicideCommandTests.cs
#	Content.Server/Administration/Systems/BwoinkSystem.cs
#	Content.Server/Corvax/StationGoal/StationGoalPaperSystem.cs
#	Content.Server/DetailExaminable/DetailExaminableystem.cs
#	Content.Server/GameTicking/GameTicker.Spawning.cs
#	Content.Server/Ghost/GhostSystem.cs
#	Content.Server/Light/EntitySystems/PoweredLightSystem.cs
#	Content.Server/Station/Systems/StationSpawningSystem.cs
#	Content.Server/Store/Systems/StoreSystem.Listings.cs
#	Content.Server/Store/Systems/StoreSystem.Ui.cs
#	Content.Shared.Database/LogType.cs
#	Content.Shared/Damage/Systems/StaminaSystem.cs
#	Content.Shared/Eye/VisibilityFlags.cs
#	Content.Shared/Humanoid/Markings/MarkingCategories.cs
#	Content.Shared/Humanoid/NamingSystem.cs
#	Content.Shared/Humanoid/Prototypes/SpeciesPrototype.cs
#	Content.Shared/Humanoid/SharedHumanoidAppearanceSystem.cs
#	Directory.Packages.props
#	Resources/Audio/Lobby/attributions.yml
#	Resources/Credits/GitHub.txt
#	Resources/Locale/ru-RU/ghost/roles/ghost-role-component.ftl
#	Resources/Prototypes/Corvax/Reagents/Consumable/Drink/alcohol.yml
#	Resources/Prototypes/Corvax/lobbyscreens.yml
#	Resources/Prototypes/Entities/Mobs/Species/base.yml
#	Resources/Prototypes/Entities/Mobs/Species/moth.yml
#	Resources/Prototypes/Entities/Objects/Tools/toolbox.yml
#	Resources/Prototypes/Entities/Objects/Weapons/Melee/sledgehammer.yml
#	Resources/Prototypes/Entities/Structures/Shuttles/cannons.yml
#	Resources/Prototypes/GameRules/events.yml
#	Resources/Prototypes/Reagents/medicine.yml
#	Resources/Prototypes/Roles/Jobs/Security/warden.yml
#	Resources/Prototypes/SoundCollections/lobby.yml
#	Resources/Prototypes/Species/arachnid.yml
#	Resources/Prototypes/Species/diona.yml
#	Resources/Prototypes/Species/moth.yml
#	Resources/Prototypes/Species/reptilian.yml
#	Resources/Prototypes/Species/vox.yml
#	Resources/Prototypes/Voice/speech_emotes.yml
#	Resources/Prototypes/game_presets.yml
#	Resources/Prototypes/secret_weights.yml
#	Resources/Textures/Corvax/LobbyScreens/attributions.yml
#	Resources/Textures/Interface/Misc/job_icons.rsi/meta.json
2025-04-06 08:43:40 +03:00
slarticodefast
48a4aa3929 Cleanup Objective files, add PickSpecificPersonComponent (#35802)
* cleanup objectives

* remove unrelated access restriction

* review
2025-03-13 01:41:50 +01:00
slarticodefast
7a6b947e60 Steal the mail thieving objective (#35746)
* mail theft

* networked
2025-03-09 20:41:53 +01:00
Killerqu00
2d32e08bee CVar - Toggle display of round-end greentext (#35651)
* hide greentext if cvar false

* change IFs around a lil

* reviews
2025-03-04 08:59:44 -08:00
keronshb
68de58eb66 THE WIZARD (#35406)
* Adds Survivor Antag

* Adds Survivor Role

* Adds Survivor Rule ECS, adds a survivor role event, adds make antagonist to  random global spawn spell

* Moves Survivor Ensurecomp to event handler. Makes Add Survivor Role a broadcast. Adds Survivor Component. Removes redundant briefing.

* Adds Survivor Antagonist role type for admins to keep track of this easier, adds it to Survivor.

* Adds access to survivor game rule system

* Adds Survivor Rule

* Adds end of round survivor text

* Adds end of round reporting logic. Adds logic to start the survivor rule.

* Changes desc from centcomm to shuttle

* survivor (S)

* Checks if they're alive on the shuttle instead of centcomm.

* ftl text selection based on number of survivors.

* Removed Survivor Antagonist, replaced it with Free Agent.

* Adds InvalidForGlobalSpawnSpell tag, checks for it on spawnspell, and adds it to a zombified person.

* Changes logic so we launch the game rule if it hasnt launched yet. Moves rule logic starting to server. Moved survivor rule logic out of event and into Start method.

* Fixes invalid entity issue

* Descs for Survivor Rule and Survivor comps

* Moves Survivor Rule to its own yml

* Checks for dead survivors, changes survivor checks for mind. Adds survivor comp to mind to fix any mindswap issues. Same for invalid survivor tag

* Changes shuttle xform call to just mapid

* Protoid fix

* THE WIZARD

* Wizard spawner

* adds the correct state

* Wizard preset and weight

* Fixes wizard rule

* Weight back to 100%

* Adds Random Metadata

* Wizard locs

* Puts requirements in the right place

* Adds wiz ghost spawner and mob

* wizard spawnpoint fix + shuttle mapping

* wizard loadout + fix wizard spawning + wizard random name

* comment

* Adds Wizard testing

* FIXES SHUTTLE ISSUE BASED REI

* THE WIZARD LOBBY SONG. Special thanks to song creator Chris Remo for allowing us to use this.

* Free Objective ECS + Base Free Objective

* Space Wizard Federation for Wiz Obj issuer.

* Wizard Objectives

* Moves wizard shuttle to base wizard rule. Gives Wizard their objectives. Removes WizardRule

* Renames midround to subgamemodes. Adds wizard sub game mode.

* Adds SubWizard to SubGameModesRule. Adds a SubGameMode with no wizard. Adds No SubGamemodeRule for Wizard preset

* Wizard midround event

* Fixes wizard midround

* Wizard Guidebook

* Removes todo

* Fixes text

* Removes wizard rule ECS, not needed

* Wizard jetpack

---------

Co-authored-by: ScarKy0 <scarky0@onet.eu>
Co-authored-by: ScarKy0 <106310278+ScarKy0@users.noreply.github.com>
2025-02-25 22:34:07 -07:00
Pupchansky
1c7c8dd82b Полный фикс ошибок апстрима + АПСТРИМ 2025-02-03 08:48:35 +05:00
ReeZer2
4f2d609890 FIX: Thief beacon doubled steal targets (#33750) 2025-01-01 17:25:48 +01: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
Pupchansky
488cadd0a8 апстрим 2024-11-23 18:39:01 +05: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
Pupchansky
93b82301c3 Апстрим 2024-11-06 16:46:02 +05: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
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
Pupchansky
fcde1c14a1 апстрим 2024-10-08 22:05:52 +05:00
Pupchansky
12856b9330 Апстрим 2024-09-21 22:08:48 +05:00
deltanedas
fdfbd74bcb increase thieving beacon range to 2 (#31340)
* increase thieving beacon range to 2

* add obstruction check

* review

* Entity<T?> strikes again

* webedit ops because github died or something

---------

Co-authored-by: deltanedas <@deltanedas:kde.org>
2024-09-19 23:55:31 +10:00
Эдуард
1468cbdb8a Wanted list cartridge (#31223)
* WantedListCartridge has been added

* WantedListCartridge user interface works

* WantedListCartridge is added as standard in some PDAs

* The CriminalRecordsSystem can now also take into account who created the record

* Added offense history table

* Fix of missing loaderUid for a cartridge without installing the program

* Added personalized information about the target

* The crime history has been finalized

* Added StatusList

* The officer's name has been added to the automatic history

* WantedListCartridge has been added to the HOS locker

* WantedListCartridge has been removed from brigmedic's preset programs

* The StealConditionSystem now takes into account whether a cartridge is inserted or installed

* Added target to thief on WantedListCartridge

* Merge fix

* Removing copypaste

* Fix merge 2

* The sprite of WantedListCartridge has been changed

* Update pda.yml

* Fix scrollbar in the history table

* Upstream localization fix

* `StatusList` has been replaced by `ListContainer` with `TextureRect`

* Margin fix
2024-09-19 12:22:02 +02:00
chavonadelal
ccc5f61584 Localization of steal targets (#30153)
* Localization of steal targets

* Correction of localization of theft objects

* The second correction of the localization of theft targets

* Update steal-target-groups.ftl

Co-authored-by: Ed <96445749+TheShuEd@users.noreply.github.com>

* Revision of the localization method

* Choosing a simple option for localization

* Fix TechnologyDisk name

* Corrections based on feedback received

* correction of declension

---------

Co-authored-by: Ed <96445749+TheShuEd@users.noreply.github.com>
2024-09-16 14:50:14 +02:00
Hreno
2a7bc17a13 Display agents' jobs in the Round End Summary window (#31652) 2024-09-09 13:31:53 -06:00
nikthechampiongr
4b8bedaeef Add completions to addobjective and localize it (#30456)
* Add completions to addobjective and localise it

* Cleanup

* Fix

* Make a manager to handle subscribtion completion options

This is so we can unsubscribe to prototype reloads properly

* Convert the manager into a system

* Move the system into the systems folder

I forgor

* Merge CompletionsSystem into ObjectivesSystem
2024-09-08 17:28:43 +10:00
Pupchansky
2239d847ef Апстрим 2024-08-21 13:32:48 +05:00