Vigers Ray
a136c69a08
Merge remote-tracking branch 'space-wizards/master'
...
# Conflicts:
# Content.Client/Humanoid/MarkingPicker.xaml.cs
# Content.Client/Humanoid/SingleMarkingPicker.xaml.cs
# Resources/Prototypes/Shaders/shaders.yml
2025-04-10 16:34:22 +03: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
Vigers Ray
22cf3a0317
Merge remote-tracking branch 'space-wizards/master'
...
# Conflicts:
# Resources/Locale/en-US/_strings/objectives/commands/rmobjective.ftl
# Resources/Textures/Objects/Misc/brbsign.rsi/meta.json
2025-04-09 18:04:28 +03: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
Vigers Ray
8662794068
ЕБАНЫЕ ОШИБКИ ЛИНТЕРА ПОСЛЕ АПСТРИМА
2025-03-25 13:10:18 +03:00
Vigers Ray
d0f5e8d361
Merge remote-tracking branch 'space-wizards/master'
...
# Conflicts:
# .github/workflows/validate-rgas.yml
# .github/workflows/validate-rsis.yml
# Content.Client/Changelog/ChangelogTab.xaml.cs
# Content.Client/Humanoid/HumanoidAppearanceSystem.cs
# Content.Client/Options/UI/OptionsMenu.xaml.cs
# Content.Client/SubFloor/SubFloorHideSystem.cs
# Content.Client/UserInterface/Systems/Ghost/Widgets/GhostGui.xaml.cs
# Content.Server/Advertise/EntitySystems/SpeakOnUIClosedSystem.cs
# Content.Server/Antag/AntagSelectionSystem.cs
# Content.Server/Arcade/SpaceVillainGame/SpaceVillainArcadeSystem.cs
# Content.Server/Explosion/EntitySystems/TriggerSystem.cs
# Content.Server/Mindshield/MindShieldSystem.cs
# Content.Server/Objectives/Systems/KillPersonConditionSystem.cs
# Content.Server/Standing/StandingStateSystem.cs
# Content.Server/Station/Systems/StationJobsSystem.Roundstart.cs
# Content.Server/VendingMachines/VendingMachineSystem.cs
# Content.Server/Zombies/ZombieSystem.Transform.cs
# Content.Server/Zombies/ZombieSystem.cs
# Content.Shared/Damage/Systems/DamageableSystem.cs
# Content.Shared/Humanoid/HumanoidAppearanceComponent.cs
# Content.Shared/Humanoid/Markings/MarkingManager.cs
# Content.Shared/Humanoid/NamingSystem.cs
# Content.Shared/Humanoid/Prototypes/SpeciesPrototype.cs
# Content.Shared/Humanoid/SharedHumanoidAppearanceSystem.cs
# Content.Shared/Implants/Components/SubdermalImplantComponent.cs
# Content.Shared/Standing/StandingStateSystem.cs
# Content.Shared/VendingMachines/SharedVendingMachineSystem.cs
# Content.Shared/VendingMachines/VendingMachineComponent.cs
# Resources/Audio/Lobby/attributions.yml
# Resources/Locale/en-US/_strings/administration/commands/forceghost.ftl
# Resources/Locale/en-US/_strings/clothing/components/fire-protection-component.ftl
# Resources/Locale/en-US/_strings/components/storage-voice-control-component.ftl
# Resources/Locale/en-US/_strings/prototypes/roles/antags.ftl
# Resources/Locale/en-US/_strings/reagents/meta/physical-desc.ftl
# Resources/Locale/en-US/lathe/lathe-categories.ftl
# Resources/Prototypes/Access/command.yml
# Resources/Prototypes/Catalog/Fills/Books/bookshelf.yml
# Resources/Prototypes/Catalog/Fills/Lockers/heads.yml
# Resources/Prototypes/Catalog/Fills/Lockers/misc.yml
# Resources/Prototypes/Catalog/VendingMachines/Inventories/chemvend.yml
# Resources/Prototypes/Catalog/thief_toolbox_sets.yml
# Resources/Prototypes/Datasets/Names/Operation_prefix.yml
# Resources/Prototypes/Datasets/Names/Operation_suffix.yml
# Resources/Prototypes/Datasets/Names/arachnid_first.yml
# Resources/Prototypes/Datasets/Names/arachnid_last.yml
# Resources/Prototypes/Datasets/Names/borg.yml
# Resources/Prototypes/Datasets/Names/cargo_shuttle.yml
# Resources/Prototypes/Datasets/Names/clown.yml
# Resources/Prototypes/Datasets/Names/diona.yml
# Resources/Prototypes/Datasets/Names/fake_human_first.yml
# Resources/Prototypes/Datasets/Names/fake_human_last.yml
# Resources/Prototypes/Datasets/Names/first.yml
# Resources/Prototypes/Datasets/Names/first_female.yml
# Resources/Prototypes/Datasets/Names/first_male.yml
# Resources/Prototypes/Datasets/Names/fortunes.yml
# Resources/Prototypes/Datasets/Names/hologram.yml
# Resources/Prototypes/Datasets/Names/last.yml
# Resources/Prototypes/Datasets/Names/military.yml
# Resources/Prototypes/Datasets/Names/moth_first_female.yml
# Resources/Prototypes/Datasets/Names/moth_first_male.yml
# Resources/Prototypes/Datasets/Names/moth_last.yml
# Resources/Prototypes/Datasets/Names/mushman_first.yml
# Resources/Prototypes/Datasets/Names/mushman_last.yml
# Resources/Prototypes/Datasets/Names/ninja.yml
# Resources/Prototypes/Datasets/Names/ninja_title.yml
# Resources/Prototypes/Datasets/Names/regalrat.yml
# Resources/Prototypes/Datasets/Names/reptilian_female.yml
# Resources/Prototypes/Datasets/Names/reptilian_male.yml
# Resources/Prototypes/Datasets/Names/revenant.yml
# Resources/Prototypes/Datasets/Names/skeleton_first.yml
# Resources/Prototypes/Datasets/Names/syndicate.yml
# Resources/Prototypes/Datasets/Names/vox.yml
# Resources/Prototypes/Datasets/Names/wizard_first.yml
# Resources/Prototypes/Datasets/Names/wizard_last.yml
# Resources/Prototypes/Datasets/adjectives.yml
# Resources/Prototypes/Datasets/corporations.yml
# Resources/Prototypes/Datasets/criminal_records.yml
# Resources/Prototypes/Datasets/rat_king_commands.yml
# Resources/Prototypes/Datasets/verbs.yml
# Resources/Prototypes/Entities/Clothing/Head/specific.yml
# Resources/Prototypes/Entities/Clothing/OuterClothing/coats.yml
# Resources/Prototypes/Entities/Clothing/OuterClothing/specific.yml
# Resources/Prototypes/Entities/Mobs/Cyborgs/base_borg_chassis.yml
# Resources/Prototypes/Entities/Mobs/NPCs/revenant.yml
# Resources/Prototypes/Entities/Mobs/Player/human.yml
# Resources/Prototypes/Entities/Mobs/Player/humanoid.yml
# Resources/Prototypes/Entities/Mobs/Species/arachnid.yml
# Resources/Prototypes/Entities/Mobs/Species/base.yml
# Resources/Prototypes/Entities/Mobs/Species/moth.yml
# Resources/Prototypes/Entities/Mobs/Species/vox.yml
# Resources/Prototypes/Entities/Objects/Devices/pda.yml
# Resources/Prototypes/Entities/Objects/Misc/paper.yml
# Resources/Prototypes/Entities/Objects/Misc/subdermal_implants.yml
# Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Cartridges/shotgun.yml
# Resources/Prototypes/Entities/Objects/Weapons/Guns/Projectiles/projectiles.yml
# Resources/Prototypes/Entities/Stations/nanotrasen.yml
# Resources/Prototypes/Entities/Structures/Furniture/carpets.yml
# Resources/Prototypes/Entities/Structures/Storage/Closets/wall_lockers.yml
# Resources/Prototypes/GameRules/roundstart.yml
# Resources/Prototypes/Procedural/salvage_loot.yml
# Resources/Prototypes/Reagents/Consumable/Drink/alcohol.yml
# Resources/Prototypes/Recipes/Lathes/biogen.yml
# Resources/Prototypes/Recipes/Lathes/categories.yml
# Resources/Prototypes/Roles/Jobs/Security/warden.yml
# Resources/Prototypes/Species/arachnid.yml
# Resources/Prototypes/Species/diona.yml
# Resources/Prototypes/Species/moth.yml
# Resources/Prototypes/ai_factions.yml
# Resources/Prototypes/game_presets.yml
# Resources/ServerInfo/Guidebook/Mobs/SlimePerson.xml
# Resources/ServerInfo/Guidebook/ServerRules/SpaceLaw/SpaceLaw.xml
# Resources/ServerInfo/Guidebook/Service/Botany.xml
# Resources/Textures/Clothing/Eyes/Glasses/glasses.rsi/meta.json
# Resources/Textures/Clothing/Eyes/Glasses/jamjar.rsi/meta.json
# Resources/Textures/Clothing/Eyes/Glasses/mercglasses.rsi/meta.json
# Resources/Textures/Clothing/Eyes/Glasses/meson.rsi/meta.json
# Resources/Textures/Clothing/Eyes/Glasses/ninjavisor.rsi/meta.json
# Resources/Textures/Clothing/Eyes/Glasses/outlawglasses.rsi/meta.json
# Resources/Textures/Clothing/Eyes/Glasses/science.rsi/meta.json
# Resources/Textures/Clothing/Eyes/Glasses/secglasses.rsi/meta.json
# Resources/Textures/Clothing/Eyes/Glasses/sunglasses.rsi/meta.json
# Resources/Textures/Clothing/Eyes/Glasses/thermal.rsi/meta.json
# Resources/Textures/Clothing/Eyes/Hud/beergoggles.rsi/inhand-left.png
# Resources/Textures/Clothing/Eyes/Hud/beergoggles.rsi/inhand-right.png
# Resources/Textures/Clothing/Eyes/Hud/beergoggles.rsi/meta.json
# Resources/Textures/Clothing/Eyes/Hud/synd.rsi/meta.json
# Resources/Textures/Clothing/Eyes/Hud/syndagent.rsi/meta.json
# Resources/Textures/Clothing/Head/Hats/capcap.rsi/inhand-left.png
# Resources/Textures/Clothing/Head/Hats/capcap.rsi/inhand-right.png
# Resources/Textures/Clothing/Head/Hats/capcap.rsi/meta.json
# Resources/Textures/Interface/Misc/program_icons.rsi/meta.json
# Resources/Textures/Objects/Misc/Lights/lights.rsi/meta.json
# Resources/Textures/Objects/Misc/bureaucracy.rsi/meta.json
# Resources/Textures/Objects/Specific/Hydroponics/aloe.rsi/meta.json
# Resources/Textures/Objects/Specific/Hydroponics/apple.rsi/meta.json
# Resources/Textures/Objects/Specific/Hydroponics/carrot.rsi/meta.json
# Resources/Textures/Objects/Specific/Hydroponics/chanterelle.rsi/meta.json
# Resources/Textures/Objects/Specific/Hydroponics/chili.rsi/meta.json
# Resources/Textures/Objects/Specific/Hydroponics/eggplant.rsi/meta.json
# Resources/Textures/Objects/Specific/Hydroponics/gatfruit.rsi/meta.json
# Resources/Textures/Objects/Specific/Hydroponics/lemon.rsi/meta.json
# Resources/Textures/Objects/Specific/Hydroponics/onion_red.rsi/meta.json
# Resources/Textures/Objects/Specific/Hydroponics/potato.rsi/meta.json
# Resources/Textures/Objects/Specific/Hydroponics/sugarcane.rsi/meta.json
# Resources/Textures/Objects/Specific/Hydroponics/tomato.rsi/meta.json
# Resources/Textures/Objects/Specific/Robotics/borgmodule.rsi/meta.json
# Resources/Textures/Objects/Specific/Robotics/cyborg_parts.rsi/meta.json
# Resources/Textures/Objects/Tools/spray_painter.rsi/meta.json
# Resources/Textures/Objects/Weapons/Grenades/flashbang.rsi/meta.json
# Resources/Textures/Objects/Weapons/Grenades/grenade.rsi/meta.json
# Resources/Textures/Objects/Weapons/Grenades/nukenade.rsi/meta.json
# Resources/migration.yml
# Tools/actions_changelogs_since_last_run.py
2025-03-25 11:30:01 +03:00
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
Vigers Ray
10888fd269
Merge remote-tracking branch 'space-wizards/master'
...
# Conflicts:
# Content.Client/GameTicking/Managers/ClientGameTicker.cs
# Content.Server/Administration/Systems/BwoinkSystem.cs
# Content.Server/Cargo/Systems/CargoSystem.Orders.cs
# Content.Server/Chat/Systems/ChatSystem.cs
# Content.Server/Power/EntitySystems/PowerNetSystem.cs
# Content.Server/Shuttles/Systems/ArrivalsSystem.cs
# Content.Server/Station/Systems/StationSpawningSystem.cs
# Content.Server/StationEvents/Components/PowerGridCheckRuleComponent.cs
# Content.Server/StationEvents/Events/PowerGridCheckRule.cs
# Content.Server/Zombies/ZombieSystem.Transform.cs
# Content.Shared/CCVar/CCVars.Game.cs
# Content.Shared/GameTicking/SharedGameTicker.cs
# Resources/Locale/en-US/_strings/game-ticking/game-presets/preset-wizard.ftl
# Resources/Locale/en-US/_strings/guidebook/cooking.ftl
# Resources/Prototypes/Entities/Clothing/OuterClothing/misc.yml
# Resources/Prototypes/Entities/Markers/Spawners/ghost_roles.yml
# Resources/Prototypes/Entities/Mobs/NPCs/pets.yml
# Resources/Prototypes/Entities/Objects/Weapons/Guns/Projectiles/projectiles.yml
# Resources/Prototypes/Entities/Objects/Weapons/Guns/turrets.yml
# Resources/Prototypes/Entities/Structures/Machines/lathe.yml
# Resources/Prototypes/GameRules/events.yml
# Resources/Prototypes/GameRules/midround.yml
# Resources/Prototypes/GameRules/roundstart.yml
# Resources/Prototypes/Guidebook/antagonist.yml
# Resources/ServerInfo/Guidebook/Jobs.xml
# Resources/ServerInfo/Guidebook/Service/FoodRecipes.xml
# Resources/migration.yml
2025-02-26 22:01:48 +03:00
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
Vigers Ray
502811b5c8
Много говна
2025-01-04 06:03:21 +03:00
Vigers Ray
cb17bfcefe
Новая цель на убийство других антагонистов
2025-01-04 02:11:42 +03:00
Vigers Ray
486b666199
Merge remote-tracking branch 'refs/remotes/wizards/master'
...
# Conflicts:
# Resources/Prototypes/Datasets/ion_storm.yml
# Resources/Prototypes/SoundCollections/NukeMusic.yml
# Resources/migration.yml
2025-01-02 21:12:06 +03:00
ReeZer2
4f2d609890
FIX: Thief beacon doubled steal targets ( #33750 )
2025-01-01 17:25:48 +01: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
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
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
73c323bd9a
Merge remote-tracking branch 'refs/remotes/wizards/master'
...
# Conflicts:
# Content.Client/Lobby/UI/LobbyGui.xaml
# Resources/Textures/Objects/Misc/bureaucracy.rsi/meta.json
# Resources/Textures/Objects/Misc/bureaucracy.rsi/paper_stamp-psychologist.png
2024-09-21 06:29:09 +03: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
VigersRay
47cdabdaed
Merge remote-tracking branch 'refs/remotes/wizards/master'
...
# Conflicts:
# Content.Shared/StatusEffect/StatusEffectsSystem.cs
# Resources/Audio/Effects/attributions.yml
# Resources/Locale/en-US/_strings/anomaly/inner_anomaly.ftl
# Resources/Prototypes/Catalog/Fills/Lockers/heads.yml
# Resources/Prototypes/Entities/Mobs/Species/base.yml
# Resources/Prototypes/Entities/Objects/Devices/Syndicate_Gadgets/reinforcement_teleporter.yml
# Resources/ServerInfo/Guidebook/Service/FoodRecipes.xml
2024-09-19 16:09:00 +03:00
Эдуард
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
VigersRay
209f68f0c9
Merge remote-tracking branch 'refs/remotes/wizards/master'
...
# Conflicts:
# Content.Server/Objectives/Systems/StealConditionSystem.cs
# Resources/Locale/en-US/_strings/objectives/conditions/steal-target-groups.ftl
# Resources/Prototypes/Objectives/stealTargetGroups.yml
2024-09-16 16:20:10 +03: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
VigersRay
aa38c32b65
upstream
2024-09-16 12:40:23 +03: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
pacable
556d234b0a
Терминатор ( #333 )
...
* Revert Revert Exterminator pending newmed/redesign (#26978 )
This reverts commit f544c912#28218 )"
This reverts commit 489efeb717#30733 )"
This reverts commit 0a4b220854
2024-08-29 16:07:25 +03:00
Rinary
d91fe7fe98
Фикс дерьма ( #289 )
...
* init
* upd
* upd contraband
* upd
* translate my burger
* upd
* ntrep jucket upd
* fix
* upd
* steal objective fix
* upd
* fix
* fix
* fix2
* Я идиот кстати
* ты серьезно? Доебалось до 2х скоб
* upd
2024-08-16 00:40:49 +03:00
Rinary
cf049f550a
Обновление перевода ( #286 )
...
* init
* upd
* upd contraband
* upd
* translate my burger
* upd
* ntrep jucket upd
* fix
* upd
* steal objective fix
* upd
* fix
* fix
* fix2
2024-08-15 23:46:29 +03:00
Rinary
05aeb44b14
[RU] Полный перевод ( #236 )
...
* init
* fax translate
* translate
* translate cargo panel
* road map translate
* Fix cargo panel | fix bot craft translate
* fix, steal objectives translate
* do not break my not localized fax!
* fix
* radio guide translate
* Better DefaultRules
* Translate Criminal Records
* Space luw fully translate excluding CrimeList(need to rework)
* Some Guidebook translate
* Перевод глоссария, некоторые термины были переписанны под РУ комьюнити игры, некоторые к сожелению остались прежними
* Fix
* fix, translate
* Обновил структуру SpeakOnUIClosed, пофиксил перевод автоматов
* update and fix
* fully translate
* fix
* not fail but warn
* fix
* fix2
* фикс уже переведённого дерьма от корвахов
* Добавил термин подов в глоссарий
* roles translate fix
* Сикей в глоссарий
* Delete Resources/Locale/ru-RU/_sunrise/info/character-info.ftl
* remove cluster from pool
* new translation
* fully translate borgs
* some fixes
* Mr.Chang moment
* upd
* upd
* upd
* hotfix
* big fix
* fix some hardcode lang
* oh no shitcode language
* some translation
* some actions| admin commands translate start
* some new translation
* fully translate commands | figurines | chat-repo
* upd
* second upd
* upd
* start translating items
* some fixes
* translate wackpack
Из-за игры слов, я не смог нормально интерпритировать это дерьмо, так что пусть будет так, да теряется смысл и смешинка, но извините, я не смог как-то придумать игру слов
* translate
* debug translate
* upd
* Актуализация всего перевода
* fix
* fix
* upd
* some fixes | guns to his folders
* upd
* upd
* upd
* upd
* upd
* upd
* Перевод меток атмоса
* Последние коррективы
* fix
* some hardcode localization fix
* fix
* some fixes
* stats entry fully translate
* upd
* some fixes
* translate server side stats entry
* fix
* fix
* fix2
* fix
* upd
* upd
* fix
* holly shit
* fix
* totaly feed
* upd
* upd
* fix
* upd
* init
* upd
* upd
* access in prototypes
* Sunrise comments on code
* my bad
* я даун
2024-08-14 21:44:32 +03:00
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
Ed
03745efc7f
Thief beacons (try 2) ( #29997 )
...
content
2024-08-08 16:17:50 +03:00
Vigers Ray
bcb9508552
Говнокрад ( #268 )
...
* real?
* ok
* real 2
* one more thing that i forgot to port part 2
* i am dumb
* mofo og
* waaaagh
* some rework placeholders
* porting part 2
* bruh.
* bruh 2
* bruh 3.
* Update ChangelingRuleSystem.cs
* Update AdminVerbSystem.Antags.cs
* говнокрад это SubGamemode
* тяжело...
* пу-пу-пу
---------
Co-authored-by: whateverusername0 <whateveremail>
Co-authored-by: username <113782077+whateverusername0@users.noreply.github.com>
2024-08-08 09:28:44 +03:00
VigersRay
f4081b90fe
Исправил отсутсвие целей на убийства у агентов.
2024-07-25 00:48:02 +03:00
VigersRay
a8e5e66277
Апстрим
2024-07-18 17:07:25 +03:00
Ed
d8ab4982ad
Character menu issuer localization ( #29840 )
...
* Update CharacterUIController.cs
* TODO Burn this shit
* huh?
* huh!
---------
Co-authored-by: lzk <124214523+lzk228@users.noreply.github.com>
2024-07-17 08:47:50 +03:00
VigersRay
b390abe77c
Merge remote-tracking branch 'refs/remotes/wizards/master'
2024-07-16 14:00:27 +03:00
Cojoke
927cf7799f
Remove uses of AllObjectives ( #30077 )
...
Remove the uses of AllObjectives
2024-07-16 10:17:18 +03:00
VigersRay
83090d089f
Merge remote-tracking branch 'refs/remotes/wizards/master'
...
# Conflicts:
# Resources/Textures/Clothing/Head/Hardhats/blue.rsi/icon.png
# Resources/Textures/Clothing/Head/Hardhats/blue.rsi/light-icon.png
# Resources/Textures/Clothing/Head/Hardhats/orange.rsi/icon.png
# Resources/Textures/Clothing/Head/Hardhats/orange.rsi/light-icon.png
# Resources/Textures/Clothing/Head/Hardhats/red.rsi/icon.png
# Resources/Textures/Clothing/Head/Hardhats/red.rsi/light-icon.png
# Resources/Textures/Clothing/Head/Hardhats/white.rsi/icon.png
# Resources/Textures/Clothing/Head/Hardhats/white.rsi/light-icon.png
# Resources/Textures/Clothing/Head/Hardhats/yellow.rsi/icon.png
# Resources/Textures/Clothing/Head/Hardhats/yellow.rsi/light-icon.png
2024-07-13 12:55:55 +03:00
Tayrtahn
3388c0dcaa
Fix antag objectives always overshooting MaxDifficulty (and kill tries20) ( #29830 )
...
* The death of try20
* Add integration test for traitor gamerule
* Fix max difficulty being overshot
* Check at least one objective is assigned
* EntProtoId
2024-07-13 14:14:30 +10:00
