Commit graph

4529 commits

Author SHA1 Message Date
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
Rinary
2fc8b27761
Правки в мехах (#583)
* init

* rebalance 2
2024-10-31 19:01:34 +03:00
Vigers Ray
4082ffc4bc
Анимации в лобби. Кастомный выбор фона в лобби. (#562)
* Анимации в лобби

* анимации сущностями

* прототипы анимаций
2024-10-30 20:14:26 +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
Rinary
b6920aec99
Рефактор мехов, правки в системе медицины (#507)
* mech system, fix hands, fix fraction

* fix

* fix fake hypo

* fix triple airlocks big sizing

* fix

* upd clown hulk

* xd fix 2

* bigger exit delay

* mechs reflect changes

* guns changes

* draike up

* mechs in another category

* add equipment

* Revert "upd clown hulk"

This reverts commit b8084967040be5d442b2d4770cf7fdece1daa2a8.

* SPIN MY MECH ASS

* mech no rot

* some resprite

* no injections in hardsuits

* some species can not be injectable

* medipans can ignore armor, admeme hypospray ignore armor

* fix

* fix admeme hypo

* mob fraction fix

* rover + nt gygax add

* fix description

* fix id

* some better dome effects

* если пустая гильза в стволе -> Кнопки "казнь" не будет

* phazon added

* fix server crashes

* full rework mechs on mobstates, coils fix mechs, diagnostic hud show health bar for mechs, mechs fastest repair, add mech analyzer

* some fixes

* configure health of all mechs

* upd

* add rover to uplink

* translate bundle

* change price

* phazon construction

* fix

* fix

* Finish phazon construction

* add phazon research and recipes

* phazon construction translate

* fix

* Mech lights

* fix

* translate light action

* Mech sounds, fix damage

* fix

* fix hello sound

* upd

* fix linter

* change damagePercentage

* fix

* fix hello sound

* temp disable damage sounds

* fix battery needed on construct

* some changes

* add mech painting system as DEBUG(in dev)

* Fix yaml, durand paintings

* mech spray cans textures

* change sprite

* fix

* ripley, clarke new textures

* ripley,clarke paints

* fix

* sec pod texture

---------

Co-authored-by: Vigers Ray <60344369+VigersRay@users.noreply.github.com>
2024-10-30 10:53:00 +03:00
haiwwkes
8987a12177
ban links. (#548) 2024-10-30 10:44:32 +03:00
haiwwkes
99851de785
ayo (#545) 2024-10-30 10:42:02 +03:00
Rinary
612f8ca9aa
Фикс всей локализации (#496)
* cargo product loc

* first cargo product translate

* second cargoproduct translate

* roadmap has optional localization

* upd

* 2024 roadmap translate

* full ru roadmap goals translate moved to russian loc

* translate some roadmap 2025

* roadmap fully translate

* holidays translate

* donation plinks rework

* translate categories

* translate planet prison objective

* translate evil twin objectives

* translate fugitive objectives

* fix planet prisoner dir

* upd

* no more planet prison dir

* partial toys translate

* fully translate toys

* lockbox loc fix

* fix Suntick loc

* fix tape loc

* borg modules translate

* translate borg tools and nanopaste

* upd

* boombox translate

* translate pda's and hand_teleporter

* reinforcement radio translate

* donation plinks translate

* barber items translate

* tape player translate

* ID cards translate

* computers translate

* translate corporate laws

* pepper spray translate

* flippo lighter translate

* magistrat's rubber stamp translate

* translate some ammunition

* clear no need desc

* translate SMGS

* fix

* Finaly guns translating

* translate clocks

* translate misc

* some cloaks translate

* fully cloaks translate

* belts translate

* translate all masks

* translate boots

* all backpacks translate

* glasses translate

* gloves translate

* bras translate

* fix rsi validator

* translate jumpskirt's

* jumpsuits translate

* security pilot's jumpsuit translate

* translate hardsuit helmets

* translate hood

* hats translate

* helmets translate

* men's underpants translate

* translate women's pants

* hardsuits translate

* fix pant desc

* translate armor

* translate coats

* translate captain's overcoat

* socks translate

* big boxes translate

* translate lockers

* power translate

* translate barber pole

* poster translate

* translate chairs

* translate vending_machines

* translate pacificator

* translate computers

* clowns ghost role translate

* translate eviltwin ghost role

* translate predator name

* another player species translate

* translate foliant

* translate borg chassis

* shuttle markers translate

* translate job spawners

* ghost roles spawners translate

* actions translate

* stacks translate

* some fixes

* uplink catalog fully translate

* return hypo on uplink

* sponsor uplink catalog translate start

* new sponsor uplink translation

* fully translate sponsor uplink catalog

* translate lockers

* translate kits

* translate syndicate boombox bundle

* predator organs translate

* body prototypes translate

* humanoid xeno organs translate

* predator body parts translate

* xenomorph body parts translate

* tajaran body parts translate

* translate disease

* species translate

* translate speech emotes

* upd

* translate frontier rules

* translate lust rules

* translate default rules

* crafting translate

* holy shit, last fixes

* no checks if you not changes prototypes

* fix

* fix linter

* fix sponsor uplink catalog

* second fix

* fix socks

* last fix

* xd

* fix

* upd locale, ALL En-US prototypes translated

* upd

* upd locale validator, checks for non lokalized strings in ru-RU

* some translations

* clear

* gaaaaaaaaaay pin

* upd

* upd

* fix

* fix linter

* translate toys

* translate

* upd

* fix

* upd

* fix

* fix linter

* upd

* fix

* better construction graph translation

* start reworking construction menu translation

* some new translations

* fix

* upd translations

* пу-пу-пу

* fix

* upd

* upd, sunrise strings in en-us

* upd

* translate voice-mask

* translate guns

* energy gun translate

* server info translate

* bar signs translate

* translate ui tabs

* translate reagent effect

* translate revenant-catalog

* translate categories

* general translate

* friends translate

* Sponsor uplink fixes|Translate

* some fixes

* translate Security, Hos, QM sponsor uplink
2024-10-30 10:04:15 +03:00
metalgearsloth
94e686ca9c
Fix separated game screen bumping (#33046)
I don't really understand why RecordedSplitContainer exists but removing it looks identical and fixes the panel bumping occasionally.
2024-10-29 16:07:57 +11:00
Stalen
24f79c3ecc
Fix playtime formatting (#32974) 2024-10-28 19:00:00 +01:00
Saphire Lattice
a95c8baf28
Add health analyzer unrevivability warning (#32636)
* Add health analyzer unrevivability warning

* Remove errornous comment
2024-10-26 19:22:08 +02:00
chromiumboy
1307733c4b
Make atmos alert computer colors private variables (#32992) 2024-10-24 23:34:52 -07:00
chromiumboy
5ff5a72a7c
Fix multiplying colors of differing nullabilities (#32991) 2024-10-24 21:06:38 -07:00
chromiumboy
d2216835d8
Visualized regions for NavMapControl (#31910)
* Atmospheric alerts computer

* Moved components, restricted access to them

* Minor tweaks

* The screen will now turn off when the computer is not powered

* Bug fix

* Adjusted label

* Updated to latest master version

* Initial commit

* Tidy up

* Add firelocks to the nav map

* Add nav map regions to atmos alerts computer

* Added support for multiple region overlay sets per grid

* Fixed issue where console values were not updating correctly

* Fixing merge conflict

* Fixing merge conflicts

* Finished all major features

* Removed station map regions (to be re-added in a separate PR)

* Improved clarity

* Adjusted the color saturation of the regions displayed on the atmos alerts computer
2024-10-23 14:49:58 +02:00
slarticodefast
1518dc94a3
fix playtime stats window (#32856) 2024-10-17 23:32:59 +02:00
Vasilis
a739b21b04
Change the window titlebar to show the joined server (#32547)
* Change the window titlebar to show the joined server

Requires https://github.com/space-wizards/RobustToolbox/pull/5475/

* Totally not a webedit

* Can you tell what cvar I copied?

* And this kids is why we don't webedit

* Reviews

---------

Co-authored-by: metalgearsloth <comedian_vs_clown@hotmail.com>
2024-10-17 13:06:07 +02:00
scrivoy
b3c61530bf
Enhance Vending Machine UI: Adjust Minimum Height for better User Experience (#32851)
set FancyWindow MinHeight to 210
2024-10-16 23:34:31 -05:00
Джексон Миссиссиппи
9b71757c07
cleanup melee (#32486)
* it removes warns ig

* Quick fix

---------

Co-authored-by: metalgearsloth <comedian_vs_clown@hotmail.com>
2024-10-14 16:40:59 +11:00
Leon Friedrich
30ada26315
Remove inaccurate admin log when moving a held item (#32525)
Remove inaccurate admin log when switching held item
2024-10-14 15:05:40 +11:00
metalgearsloth
71c9894903
Jobreq format (#32806)
* Format job requirements as hours and minutes

* Use TimeSpan.ToString for playtime instead of custom method

* wehflicts

---------

Co-authored-by: jmcb <joelsgp@protonmail.com>
2024-10-14 14:54:31 +11:00
Pieter-Jan Briers
4a5178a538
Fix role ban loading bugs (#32725)
This code was a mess. Now it's less of a mess and user UserDbDataManager now.

Fixes the following bugs:

* If you connect to a server, restart your client, connect again in the same round, you role bans would not be visible in the client.
* If you role ban somebody who is not connected to the server, then they connect within the round, they will only have the recently-applied ban.

Likely fixes #24781, #27282
2024-10-14 14:30:31 +11:00
VigersRay
b4ef47901d Заебешь 2024-10-12 18:32:00 +03:00
VigersRay
0a9ba2d68b оффы такие оффы 2024-10-12 18:22:30 +03:00
VigersRay
6ff9aa6fd5 ы 2024-10-12 18:15:15 +03:00
VigersRay
06a10c9f99 Merge remote-tracking branch 'refs/remotes/wizards/master' 2024-10-12 17:43:47 +03:00
VigersRay
9df0369159 Фиксы и локализация профиля лобби 2024-10-12 17:43:21 +03:00
eoineoineoin
70b7747fdd
Make APC UI work correctly with multiple users (#32465)
* Make APC UI work correctly with multiple users

* Check access only on client, when constructing UI

* Do TODO (Thanks, Robust 236.1)

---------

Co-authored-by: Eoin Mcloughlin <helloworld@eoinrul.es>
2024-10-12 19:21:43 +11:00
VigersRay
839257dba8 Провиль и привязка через лобби. 2024-10-11 23:44:48 +03:00
haiwwkes
40568a243c
lay down + scope (#476)
* remove old system

* new scope, new laying
2024-10-11 11:52:39 +03:00
Rinary
42f9ac0dbd
Ребаланс Мехов (#482)
* Initial commit

* mechs has reflect

* all mechs has powercagehigh

* mechs can only powered by power cages

* powercages on protolathes

* magboots on mechs

* fire cost upped x2

* battery on guns has 200 energy by basic, adds ion gun

* mecha x-ray gun add

* mecha vindictor here

* added amlg 90

* added uvm31

* localization

* burst fire on Ultra

* fix vindictor no desc

* mech has prying

* add scale 1.08

* add scale 1.08 to combat mechs

* Mechs has collision

* buff chain sword

* upd

* some fixes

* fix weapon charging

* Fix UVM-31 "Drake" Sound and Proto particle

* Fix Mech collision, mechs can't stop peoples any more(some thing issues creates if collision is on)

* AMLG90 Has bigger damage

* Stunner uses hos stun spread

---------

Co-authored-by: SlamBamActionman <slambamactionman@gmail.com>
2024-10-10 20:11:43 +03:00
VigersRay
2ae18ca4d6 фиксы ПНВ 2024-10-10 19:04:20 +03:00
VigersRay
4c71cb6336 Фикс ПНВ 2024-10-07 16:41:26 +03:00
VigersRay
146bd23394 ы 2024-10-07 14:20:48 +03:00
VigersRay
800a20b79e ыыыы 2024-10-07 13:06:33 +03:00
VigersRay
fd85a472b8 remove logs 2024-10-07 10:34:06 +03:00
VigersRay
a2c382d5ba Доработка ПНВ 2024-10-07 08:44:38 +03:00
Rinary
dc40c1404b
Доработка ночного зрения (#455)
* texture upd

* upd and fix color system

* fix

* handcrafted_nvd texture

* add handcraft nvd

* upd color

* add nvd to uplink

* fix loc

* recipe and research

* fix delay system

* fix

* пу-пу-пу

* add recipe to protolathe

* fully fix nvds

* fix layer set visible

* fix

* upd roadmap

* felinids has night vision

* engineering hardsuits has yellow night vision

* upd icon
2024-10-07 01:18:10 +03:00
VigersRay
461a4d84a2 Merge remote-tracking branch 'refs/remotes/wizards/master'
# Conflicts:
#	.github/workflows/publish.yml
#	Resources/Prototypes/Entities/Mobs/Player/dragon.yml
#	Resources/Prototypes/Loadouts/loadout_groups.yml
#	Resources/migration.yml
2024-10-07 01:09:20 +03:00
Golinth
46a2eb545e
Fully Revert Clown Waddling (#32652)
Fully revert Clown Waddling (revival of #29161)

A sad day, see #29156 for discussion
2024-10-06 15:33:02 +02:00
Rinary
2fe0f92886
Оптимизация и обновление ночного виденья (#431)
* optimize night vision shader

* upd

* nvd restyle

* upd

* я не знаю почему эта хуйня не работает, я уже здался

* fix

* upd

* fix
2024-10-03 22:01:47 +03:00
VigersRay
b7cb8d82d1 Merge remote-tracking branch 'origin/master' 2024-10-03 17:25:22 +03:00
VigersRay
b8633c71f3 Merge remote-tracking branch 'refs/remotes/wizards/master' 2024-10-03 17:25:09 +03:00
haiwwkes
5efc51b304
tweaks (#451)
* tweak: add RestrictedRange to prison and transit hub.

* tweak: make laydown better

* ay lmaoo
2024-10-03 17:23:41 +03:00
eoineoineoin
a8982b88af
Allow users to drag-reorder action bar (#32552)
* Avoid rebuilding all buttons on action state change

Allows for drag events to continue when actions change

* Remove excess action buttons

---------

Co-authored-by: Eoin Mcloughlin <helloworld@eoinrul.es>
2024-10-03 16:01:01 +02:00
Pieter-Jan Briers
2d644095e3
Fix borg hands showing up in stripping menu (#32606)
* Fix borg hands showing up in stripping menu

Borgs can't drop their items anyways, and the amount of hands borgs have causes the UI to just bug out.

* Add more checks
2024-10-03 02:11:56 +02:00
Alan Wake
94a6fff32c
good for start, not enough to finish (#417) 2024-10-03 03:11:13 +03:00
VigersRay
940710da9e Merge remote-tracking branch 'refs/remotes/wizards/master'
# Conflicts:
#	Resources/Prototypes/Catalog/Fills/Lockers/heads.yml
#	Resources/Textures/Tiles/attributions.yml
#	Resources/Textures/Tiles/green_circuit.png
#	Resources/Textures/Tiles/steel.png
2024-10-02 15:50:00 +03:00
FluffMe
8961dd35a5
Fix accidental erase of paper contents by spamming save action (#32598)
Fix spammable paper save issue
2024-10-02 14:00:31 +02:00
SplikZerys
27ee3abaa8 Revert "Proton (#420)"
This reverts commit 939249a3
2024-10-02 09:05:30 +03: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