Valtos
28a37dcd70
New tts voices 2 ( #344 )
...
* Update tts-voices.yml
* Update tts-voices2.ftl
2024-06-10 00:30:35 +03:00
Jabak
77234ff343
Кушать хочу
2024-06-09 20:49:07 +03:00
Aviu00
0c34a1fd9b
Magic 3 ( #340 )
...
* - add: Some tweaks and localization.
* - add: Teleport spell.
* - tweak: Tweak wizard hardsuit.
* - add: Turn off shield on cast.
* - add: New wizard clothes & update wizard shuttle,
* - remove: Remove old clothes from shuttle.
* - fix: No teleporting to centcomm.
2024-06-09 19:26:27 +03:00
Jabak
38ae317e71
Merge remote-tracking branch 'upstream/master'
2024-06-08 22:36:55 +03:00
Aviu00
d838e850c6
Ling tweak & faction cleanup ( #337 )
...
* - tweak: Ling tweaks.
* - fix: Faction cleanup.
2024-06-08 16:03:20 +03:00
Aviu00
c1fe31b63b
More magic ( #338 )
...
* - tweak: Magic tweaks.
* - add: Rework some spells.
* - fix: Some bugfixes.
* - tweak: Less requirements.
* - add: Loc.
2024-06-08 16:01:49 +03:00
Aviu00
4fde7aedee
Маг ( #336 )
...
* GameRule, a lot of prototypes and FTL pending
* some protos
* - add: Magic additions, tweaks and bugfixes.
* - add: Wizard gamerule.
* - tweak: Do not call shuttle.
---------
Co-authored-by: melano <92106367+melanoTurbo@users.noreply.github.com >
2024-06-07 16:02:23 +00:00
Aviu00
2978834228
Esword stuff ( #329 )
...
* - fix: Fix black RGB.
* - add: Toy sword update.
* - add: FlipOnHitSystem.
* - tweak: Price reduction.
2024-06-05 17:31:21 +03:00
Jabak
d2b24c049d
Merge remote-tracking branch 'upstream/master'
2024-06-03 19:54:40 +03:00
Aviu00
231927a577
Security update ( #323 )
...
* add: security hud update
* access & fix names
* translates
* fix
* - fix: Fixes.
* - fix: Условно-досрочно.
---------
Co-authored-by: CaYpeN1 <artem7771art@gmail.com >
2024-06-01 16:28:21 +03:00
ThereDrD0
5a705ac195
Revert "[Feat] Обновление для визора СБ ( #274 )" ( #320 )
...
This reverts commit 3a5fcf35a5
2024-06-01 14:12:12 +03:00
CaypenNow
3a5fcf35a5
[Feat] Обновление для визора СБ ( #274 )
...
* add: security hud update
* access & fix names
* translates
* fix
2024-06-01 10:30:21 +03:00
Jabak
d35247adc5
Merge remote-tracking branch 'upstream/master'
2024-05-31 23:12:21 +03:00
RinKeeper
357680d278
fixes ( #282 )
...
* fix: fixes
* resolve conflicts
* very important commit
* very important gramatical error
* incredible architecture solution
2024-05-30 17:48:15 +03:00
Remuchi
d4be4d3445
[Feat] Внешний вид и название канистр можно изменить прямо в игре ( #317 )
...
* feat: Теперь можно менять внешний вид канистр газов
* fix: русский язык (я его не знаю)
2024-05-30 17:28:53 +03:00
Aviu00
e509855524
- add: Revive 2.0. ( #318 )
2024-05-30 15:27:13 +03:00
Jabkas
7282ac2471
Merge remote-tracking branch 'upstream/master'
2024-05-27 08:43:42 +03:00
Stasvozgalov
5777737868
Binary-channel-fix ( #312 )
2024-05-23 02:54:27 +03:00
Jabkas
6eea50bff4
New TTS voices
2024-05-19 16:54:45 +03:00
Valtos
652254b9b6
New TTS voices ( #309 )
...
* add prototypes
* translate
* FUCK
2024-05-16 08:38:10 +03:00
ThereDrD0
b911f0ab79
fix: fix {$amount} in health analyzer ( #306 )
2024-05-14 23:08:53 +03:00
Jabkas
2f47e707ea
fix: fix popup
2024-05-14 17:53:11 +03:00
Jabkas
9204951c3b
Tagilla-hammer
2024-05-14 17:37:00 +03:00
ThereDrD0
d0f851e032
fix: fix popup ( #304 )
2024-05-14 08:05:48 +03:00
Stasvozgalov
518a0d7cc6
Tagilla-hammer ( #301 )
...
* Tagilla-hammer
* Update tagilla_hammer.yml
2024-05-12 00:35:06 +03:00
Aviu00
2ccbaf09a4
Merge remote-tracking branch 'upstream/master' into ups
2024-05-03 14:26:57 +03:00
Valtos
5d37092a0a
Fix Chat ( #291 )
...
* removes transparency
* fit options
2024-04-23 02:50:07 +05:00
Remuchi
bf0a124b05
[Fix] Hotfixes 2 ( #287 )
...
* fix: Скоупидия и Вандербокс снова работают
* fix: главы станции снова не могут быть главами революции
* а что так можно было
2024-04-20 22:41:39 +09:00
Aviu00
a9fc896795
- fix: Cleanup uplink.
2024-04-20 10:35:49 +03:00
Remuchi
be61369e61
fix: различные фиксы переводов
2024-04-17 12:59:52 +07:00
Jabkas
0d2e7dda61
- add: Clippy
2024-04-16 20:40:28 +03:00
Remuchi
fbb957d6d5
фиксы после бета теста
2024-04-14 13:53:04 +07:00
Remuchi
8712256194
Revert "Revert "Revert "Cleanup ExecutionSystem ( #24382 )" ( #25555 )""
...
This reverts commit 3c9c149b81
2024-04-14 12:12:54 +07:00
Remuchi
e2b6002076
Merge remote-tracking branch 'origin/master' into upstream
...
# Conflicts:
# Content.Server/Antag/AntagSelectionSystem.cs
# Content.Server/Changeling/ChangelingRuleSystem.cs
# Content.Server/Changeling/ChangelingSystem.Abilities.cs
# Content.Server/Doors/Systems/DoorSystem.cs
# Content.Server/GameTicking/Rules/NukeopsRuleSystem.cs
# Content.Server/GameTicking/Rules/RevolutionaryRuleSystem.cs
# Content.Server/GameTicking/Rules/TraitorRuleSystem.cs
# Content.Server/GameTicking/Rules/ZombieRuleSystem.cs
# Content.Server/Holosign/HolosignSystem.cs
# Content.Server/Revenant/EntitySystems/RevenantSystem.Abilities.cs
# Content.Server/_White/Cult/GameRule/CultRuleComponent.cs
# Content.Server/_White/Cult/GameRule/CultRuleSystem.cs
# Content.Server/_White/Cult/Runes/Systems/CultSystem.Rune.cs
# Content.Server/_White/Keyhole/KeyholeSystem.cs
# Content.Server/_White/MeatyOre/MeatyOreStoreSystem.cs
# Content.Shared/Projectiles/SharedProjectileSystem.cs
# Content.Shared/Weapons/Melee/SharedMeleeWeaponSystem.cs
# Content.Shared/_White/Keyhole/Components/KeyBaseComponent.cs
# Resources/Locale/ru-RU/White/stuff.ftl/runes-entities.ftl
# Resources/Locale/ru-RU/_white/cult/blood-spear.ftl
# Resources/Locale/ru-RU/_white/cult/bolt-barrage.ftl
# Resources/Locale/ru-RU/_white/cult/cult.ftl
# Resources/Locale/ru-RU/_white/cult/gui.ftl
# Resources/Locale/ru-RU/cult/cult-structure.ftl
# Resources/Locale/ru-RU/cult/pylon.ftl
# Resources/Maps/White/Scoupidia.yml
# Resources/Maps/White/Void.yml
# Resources/Maps/White/WonderBox.yml
# Resources/Prototypes/Actions/types.yml
# Resources/Prototypes/Atmospherics/gases.yml
# Resources/Prototypes/Catalog/Cargo/cargo_atmospherics.yml
# Resources/Prototypes/Catalog/Cargo/cargo_vending.yml
# Resources/Prototypes/Catalog/Fills/Lockers/dressers.yml
# Resources/Prototypes/Catalog/Fills/Lockers/heads.yml
# Resources/Prototypes/Catalog/Fills/Lockers/misc.yml
# Resources/Prototypes/Catalog/uplink_catalog.yml
# Resources/Prototypes/Entities/Clothing/OuterClothing/armor.yml
# Resources/Prototypes/Entities/Objects/Misc/subdermal_implants.yml
# Resources/Prototypes/Entities/Objects/Tools/jaws_of_life.yml
# Resources/Prototypes/Entities/Objects/Weapons/Melee/sledgehammer.yml
# Resources/Prototypes/Entities/Objects/Weapons/Melee/sword.yml
# Resources/Prototypes/Entities/Structures/Doors/Airlocks/base_assembly.yml
# Resources/Prototypes/Entities/Structures/Doors/Airlocks/base_structureairlocks.yml
# Resources/Prototypes/Entities/Structures/Doors/Firelocks/firelock.yml
# Resources/Prototypes/Entities/Structures/Doors/Firelocks/frame.yml
# Resources/Prototypes/Entities/Structures/Doors/SecretDoor/secret_door.yml
# Resources/Prototypes/Entities/Structures/Doors/Windoors/assembly.yml
# Resources/Prototypes/Entities/Structures/Doors/Windoors/base_structurewindoors.yml
# Resources/Prototypes/Entities/Structures/Furniture/dresser.yml
# Resources/Prototypes/Entities/Structures/Lighting/base_lighting.yml
# Resources/Prototypes/Entities/Structures/Power/cable_terminal.yml
# Resources/Prototypes/Entities/Structures/Walls/grille.yml
# Resources/Prototypes/Entities/Structures/Walls/walls.yml
# Resources/Prototypes/Entities/Structures/stairs.yml
# Resources/Prototypes/_White/Entities/Objects/Misc/books.yml
2024-04-13 13:59:00 +07:00
Remuchi
7ca05487a9
еще приколы
2024-04-13 12:55:14 +07:00
Remuchi
f21ef6953c
всякое прикольное
2024-04-13 11:58:34 +07:00
Remuchi
c279a8fb8f
космозакон удалён из игры
2024-04-13 11:45:47 +07:00
Remuchi
d2d501dbc0
Merge remote-tracking branch 'upstream/master' into upstream
...
# Conflicts:
# Content.Client/Access/AccessOverlay.cs
# Content.Client/Access/UI/IdCardConsoleBoundUserInterface.cs
# Content.Client/Access/UI/IdCardConsoleWindow.xaml
# Content.Client/Access/UI/IdCardConsoleWindow.xaml.cs
# Content.Client/Chemistry/UI/InjectorStatusControl.cs
# Content.Client/StatusIcon/StatusIconOverlay.cs
# Content.Client/Stylesheets/StyleNano.cs
# Content.Client/UserInterface/Systems/Chat/ChatUIController.cs
# Content.Client/UserInterface/Systems/Chat/Widgets/ChatBox.xaml
# Content.Server/Access/Systems/IdCardConsoleSystem.cs
# Content.Server/Administration/Commands/AGhost.cs
# Content.Server/Chemistry/EntitySystems/ReagentDispenserSystem.cs
# Content.Server/Connection/ConnectionManager.cs
# Content.Server/DeviceLinking/Systems/SignalTimerSystem.cs
# Content.Server/Disposal/Unit/EntitySystems/DisposalUnitSystem.cs
# Content.Server/GameTicking/GameTicker.RoundFlow.cs
# Content.Server/GameTicking/GameTicker.Spawning.cs
# Content.Server/Humanoid/Systems/HumanoidAppearanceSystem.cs
# Content.Server/Resist/EscapeInventorySystem.cs
# Content.Server/Shuttles/Systems/EmergencyShuttleSystem.cs
# Content.Shared/Access/Components/IdCardConsoleComponent.cs
# Content.Shared/Anomaly/SharedAnomalySystem.cs
# Content.Shared/Bed/Sleep/SharedSleepingSystem.cs
# Content.Shared/Humanoid/SharedHumanoidAppearanceSystem.cs
# Content.Shared/Lock/LockSystem.cs
# Content.Shared/RCD/Systems/RCDSystem.cs
# Content.Shared/Roles/JobPrototype.cs
# Content.Shared/StatusIcon/StatusIconPrototype.cs
# Content.Shared/Weapons/Melee/SharedMeleeWeaponSystem.cs
# Resources/Audio/Machines/attributions.yml
# Resources/Locale/en-US/rcd/components/rcd-component.ftl
# Resources/Maps/reach.yml
# Resources/Prototypes/Catalog/Cargo/cargo_vending.yml
# Resources/Prototypes/Catalog/Fills/Lockers/heads.yml
# Resources/Prototypes/Catalog/Fills/Lockers/security.yml
# Resources/Prototypes/Catalog/ReagentDispensers/beverage.yml
# Resources/Prototypes/Catalog/VendingMachines/Inventories/boozeomat.yml
# Resources/Prototypes/Catalog/VendingMachines/Inventories/cola.yml
# Resources/Prototypes/Catalog/VendingMachines/Inventories/lawdrobe.yml
# Resources/Prototypes/Catalog/VendingMachines/Inventories/pwrgame.yml
# Resources/Prototypes/Catalog/VendingMachines/Inventories/shamblersjuice.yml
# Resources/Prototypes/Catalog/VendingMachines/Inventories/soda.yml
# Resources/Prototypes/Catalog/VendingMachines/Inventories/spaceup.yml
# Resources/Prototypes/Catalog/VendingMachines/Inventories/starkist.yml
# Resources/Prototypes/Catalog/VendingMachines/Inventories/theater.yml
# Resources/Prototypes/DeviceLinking/sink_ports.yml
# Resources/Prototypes/Entities/Clothing/Back/duffel.yml
# Resources/Prototypes/Entities/Clothing/Belt/base_clothingbelt.yml
# Resources/Prototypes/Entities/Clothing/Neck/misc.yml
# Resources/Prototypes/Entities/Clothing/OuterClothing/base_clothingouter.yml
# Resources/Prototypes/Entities/Clothing/OuterClothing/wintercoats.yml
# Resources/Prototypes/Entities/Mobs/Customization/Markings/gauze.yml
# Resources/Prototypes/Entities/Objects/Devices/Electronics/door.yml
# Resources/Prototypes/Entities/Objects/Magic/books.yml
# Resources/Prototypes/Entities/Objects/Materials/Sheets/glass.yml
# Resources/Prototypes/Entities/Objects/Materials/Sheets/metal.yml
# Resources/Prototypes/Entities/Objects/Materials/Sheets/other.yml
# Resources/Prototypes/Entities/Objects/Misc/tiles.yml
# Resources/Prototypes/Entities/Objects/Specific/Medical/morgue.yml
# Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Projectiles/shotgun.yml
# Resources/Prototypes/Entities/Objects/Weapons/Melee/e_sword.yml
# Resources/Prototypes/Entities/Structures/Doors/Airlocks/airlocks.yml
# Resources/Prototypes/Entities/Structures/Doors/Airlocks/base_assembly.yml
# Resources/Prototypes/Entities/Structures/Doors/Airlocks/base_structureairlocks.yml
# Resources/Prototypes/Entities/Structures/Doors/Airlocks/highsec.yml
# Resources/Prototypes/Entities/Structures/Doors/Firelocks/firelock.yml
# Resources/Prototypes/Entities/Structures/Doors/Firelocks/frame.yml
# Resources/Prototypes/Entities/Structures/Doors/MaterialDoors/material_doors.yml
# Resources/Prototypes/Entities/Structures/Doors/SecretDoor/secret_door.yml
# Resources/Prototypes/Entities/Structures/Doors/Windoors/assembly.yml
# Resources/Prototypes/Entities/Structures/Lighting/base_lighting.yml
# Resources/Prototypes/Entities/Structures/Machines/lathe.yml
# Resources/Prototypes/Entities/Structures/Power/cable_terminal.yml
# Resources/Prototypes/Entities/Structures/Storage/Tanks/base_structuretanks.yml
# Resources/Prototypes/Entities/Structures/Walls/grille.yml
# Resources/Prototypes/Recipes/Construction/Graphs/structures/shutter.yml
# Resources/Prototypes/Recipes/Crafting/Graphs/improvised/flowercrown.yml
# Resources/Prototypes/Recipes/Crafting/improvised.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/StatusEffects/health.yml
# Resources/Prototypes/Voice/speech_emotes.yml
# Resources/Prototypes/lobbyscreens.yml
# Resources/Textures/Clothing/OuterClothing/Hardsuits/ERTSuits/ertchaplain.rsi/equipped-OUTERCLOTHING-body-slim.png
# Resources/Textures/Decals/bricktile.rsi/white_box.png
# Resources/Textures/Objects/Misc/books.rsi/meta.json
# Resources/migration.yml
2024-04-13 11:29:33 +07:00
Remuchi
6c7c89e4ec
переводы хихихаха
2024-04-10 14:47:31 +07:00
Remuchi
a61ace4a9a
фиксы под тесты ура
2024-04-10 09:57:42 +07:00
Killerqu00
fd067731b5
Skipping bounties ( #26537 )
...
* add button to menu
* networking and component work
* try to add access stuff
* main functionality done
* add access lock? I think?
* remove extra line
* fix access system
* move SkipTime to StationCargoBountyDatabaseComponent
* Disable/Enable skip button based on cooldown
* remove debugging
* add access denied sound
* remove DataField tags
* dynamic timer
2024-04-09 18:18:07 -04:00
Pieter-Jan Briers
d879665b52
Add new "grant_connect_bypass" admin command ( #26771 )
...
This command allows you to grant a player temporary privilege to join regardless of player cap, whitelist, etc. It does not bypass bans.
The API for this is IConnectionManager.AddTemporaryConnectBypass().
I shuffled around the logic inside ConnectionManager. Bans are now checked before panic bunker.
2024-04-09 17:25:21 +02:00
KittenColony
a1fcfed7d9
Gauze Markings 3 - Revenge of the Wrap ( #25481 )
...
* Insectoid Gauze, Added racial marks to variants
* removed excess r from gauze_moth_lowerleg_r
* Update gauze.ftl
* moved all markings to Overlay Category
* fixed localization error
* a
2024-04-09 10:04:51 +02:00
Crotalus
a9df8cf18a
Fix lathe materials list bug ( #26826 )
...
Fix lathe material list bug
2024-04-08 09:46:42 -04:00
Aviu00
d2ea0bf4ed
Merge remote-tracking branch 'upstream/master' into ups
2024-04-08 12:54:38 +03:00
chromiumboy
f784e9ca4e
Bug fixes for RCD ( #26792 )
...
Various fixes
2024-04-08 13:17:28 +10:00
Crotalus
a178754980
Show missing materials in lathes tooltip ( #26795 )
...
* Lathes: Show missing materials amount in tooltip
* Use AppendLine and remove the last newline at the end
2024-04-07 23:16:11 -04:00
deepdarkdepths
5ecff8a04b
Sanitizes "tbf" into "to be fair" ( #26811 )
...
add
2024-04-08 13:02:46 +10:00
Aviu00
6f6f259e12
- add: Better cycling. ( #272 )
2024-04-06 15:31:09 +03:00
Aviu00
883623e448
Всякое ( #271 )
...
* - tweak: Something.
* - tweak: Tweaks.
* - tweak: Death to autoklickers.
* - tweak: Warop tweak.
* - tweak: Neuro tweaks.
* - add: Translate animal accents.
* - fix: Embeddable projectiles miss corpses.
* - tweak: More sniper ammo.
* - tweak: Free clothes in uplink.
* - tweak: Less speed up from stuff.
* - tweak: Ammo counter and toggleable clothing stuff.
* - add: More emag stuff.
* - tweak: No neuro blunt stamina damage.
* - fix: Fix name.
* - fix: Fix desc.
2024-04-06 15:30:40 +03:00
