Vigers Ray
e97d944f9e
Фикс "Добро пожаловать на хттпс://бусти.сом"
2024-11-29 05:17:34 +03:00
Vigers Ray
dbfa90e956
Звуковое оповещение новых ролей для призраков и вынос правил в отдельную кнопку.
2024-11-29 04:35:28 +03:00
Vigers Ray
aca6e6c473
Merge remote-tracking branch 'refs/remotes/wizards/master'
...
# Conflicts:
# Resources/Textures/Structures/Wallmounts/posters.rsi/meta.json
# Resources/Textures/Tiles/plating_burnt.png
# Resources/Textures/Tiles/steel_burnt.png
2024-11-29 00:28:18 +03:00
Vigers Ray
667987a86c
details textedit for votekick
2024-11-29 00:16:31 +03:00
Vigers Ray
8c77fcdd1b
Revert "фикс RoundstartFtlTarget"
...
This reverts commit a3b12c17af
2024-11-28 23:50:35 +03:00
beck-thompson
a790955b76
Light verb is now predicted ( #33622 )
...
Fix
2024-11-29 00:41:01 +11:00
Vigers Ray
a3b12c17af
фикс RoundstartFtlTarget
2024-11-27 05:03:42 +03:00
Vigers Ray
78aa7aefe4
Уменьшил время на переподключение до 15с
2024-11-26 20:46:48 +03:00
Vigers Ray
18a7fb2d88
Вынес настройки билда в отдельную вкладку
2024-11-26 19:24:27 +03:00
Vigers Ray
0c1e15e516
Merge remote-tracking branch 'refs/remotes/wizards/master'
...
# Conflicts:
# Content.Client/Info/LinkBanner.cs
# Resources/Locale/en-US/_strings/atmos/gas-pipe-sensor.ftl
# Resources/Locale/en-US/_strings/station-events/events/greytide-virus.ftl
# Resources/Prototypes/Datasets/Names/diona.yml
# Resources/Prototypes/Entities/Objects/Weapons/Guns/Projectiles/projectiles.yml
2024-11-26 17:50:59 +03:00
Babaev
ae78fa1048
a ( #655 )
2024-11-26 17:36:16 +03:00
Intoxicating-Innocence
d5225d1f46
Ghost role drop-down alignment ( #33397 )
...
* dropdown shares margin width with children
* removed dependency that rider added for some reason
* reduced vertical margin from 8 to 2
2024-11-26 09:28:31 +01:00
metalgearsloth
f27fa1ed30
Simplify separated screen top menu ( #33047 )
2024-11-26 01:59:34 +01:00
Nikolai Korolev
ea7f5433ac
Fix RA0003 warning for ChatBox ( #33531 )
2024-11-25 22:53:12 +11:00
Ben
32f48d974f
removed obsolete netmessage creator ( #33542 )
...
removed opsolete netmessage createor
2024-11-25 22:39:10 +11:00
eoineoineoin
bdf4a46edf
Minor improvements & fixes to Shuttle Console UI ( #31623 )
...
* Fix grids and docks being culled from display prematurely
* Fix inconsistent disabling of "Undock" buttons
* Add a radar icon to indicate where the controlling console is
* Tidy up math
Remove lots of sketchy transforms-of-transforms, which should have been
as single matrix multiply. Assign proper names to matrices. Remove some
redundant calculations.
* Feedback
2024-11-23 17:55:09 +11:00
Winkarst
0a587c9ccc
Disable submit admin note button on switch to note ( #33456 )
...
Co-authored-by: Winkarst <74284083+Winkarst-cpu@users.noreply.github.co>
2024-11-23 17:41:28 +11:00
slarticodefast
de516905f0
another rename
2024-11-22 23:39:05 +01:00
slarticodefast
306277afe0
rename
2024-11-22 23:05:36 +01:00
slarticodefast
08bfb43feb
cleanup
2024-11-22 23:02:59 +01:00
slarticodefast
5a9a2d463b
Merge branch 'master' into powerhud
2024-11-22 19:38:55 +01:00
c4llv07e
646d41d3a7
Add telegram to the server info-links ( #33459 )
2024-11-22 16:38:41 +01:00
Vasilis
94ac0b1399
Modern HWID integration ( #33265 )
2024-11-22 11:08:51 +00:00
Vigers Ray
a55a740ba3
Merge remote-tracking branch 'refs/remotes/wizards/master'
2024-11-22 06:44:44 +03:00
DrSmugleaf
5a751a820a
Fix admin ghosts not being able to see items in pockets or interact with them ( #31076 )
...
* Fix admin ghosts not being able to see items in pouches or interact with them
* fix
* oops
---------
Co-authored-by: slarticodefast <161409025+slarticodefast@users.noreply.github.com>
2024-11-22 03:56:05 +01:00
slarticodefast
3758715bdc
electrification hud
2024-11-22 00:43:02 +01:00
Pieter-Jan Briers
75a096b6bd
Merge remote-tracking branch 'upstream/master' into 24-10-29-modern-hwid
2024-11-21 01:26:01 +01:00
Vigers Ray
1c05542382
Фикс гост ролей с требованиями
2024-11-20 19:30:45 +03:00
Vigers Ray
8d0ab85920
Merge remote-tracking branch 'refs/remotes/wizards/master'
...
# Conflicts:
# Content.Client/Construction/UI/ConstructionMenuPresenter.cs
# Content.Server/GameTicking/GameTicker.Spawning.cs
# Content.Server/Silicons/Laws/SiliconLawSystem.cs
# Resources/Locale/en-US/_strings/clothing/components/magboots-component.ftl
# Resources/Locale/en-US/_strings/singularity/components/generator-component.ftl
# Resources/Prototypes/Datasets/Names/borer.yml
# Resources/Prototypes/Entities/Stations/base.yml
# Resources/Prototypes/Recipes/Construction/Graphs/clothing/medsec_hud.yml
# Resources/Prototypes/Recipes/Construction/Graphs/tools/logic_gate.yml
# Resources/Prototypes/Recipes/Construction/Graphs/utilities/wallmount_substation.yml
# Resources/Prototypes/Recipes/Crafting/Graphs/improvised/potato.yml
# Resources/migration.yml
2024-11-20 17:50:33 +03:00
metalgearsloth
a818c2a134
Temporarily make singularity a bit harder to loose as non-antag ( #33358 )
2024-11-20 16:55:58 +11:00
Saphire
44db676b24
Actually make the emagging popup work properly
2024-11-20 09:32:50 +06:00
qwerltaz
e98383d572
Construction menu grid view ( #32577 )
...
* button
* implement populate grid view
* tweak min width
* Make grid button toggle visible
* tweak min window size
* fix missing recipe button when mirroring item
* make grid buttons toggleable
* align button texture vertically
* selected grid item has plain color background
* tweak window width so all buttons look good
* rename select method, defer colouring
* get icon better
* whoops
* simpler button toggle
* spritesys frame0, move spritesys
* delete old sprite system refs
2024-11-20 12:54:49 +11:00
SlamBamActionman
89392e2424
Remove drag & drop dropping items from containers ( #32706 )
...
* Initial commit
* Update based on maintainer discussion
* Forgot to remove this woops
2024-11-20 12:00:38 +11: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
dffdff2423
2c82a2dfc0
Add admin remarks button to lobby ( #31761 )
2024-11-15 23:09:29 -06:00
Saphire Lattice
e7e1d96051
Improve crayon UI to not be stuck in 1996 ( #33101 )
...
* Improve crayon UI to not be stuck in 1996
* Make a horrifying crayon spaghetti
* Crayon
* Undeprecate the crayon, describe the crayon
2024-11-15 21:25:06 -06:00
Vigers Ray
fba2af74b3
Merge remote-tracking branch 'refs/remotes/wizards/master'
...
# Conflicts:
# .github/labeler.yml
# .github/workflows/labeler-needsreview.yml
# .github/workflows/labeler-untriaged.yml
# Resources/Prototypes/Entities/Mobs/Cyborgs/base_borg_chassis.yml
# Resources/Prototypes/Entities/Mobs/Cyborgs/borg_chassis.yml
# Resources/Prototypes/Entities/Mobs/Player/silicon.yml
# Resources/Prototypes/Entities/Objects/Specific/Robotics/borg_parts.yml
# Resources/Prototypes/Entities/Objects/Specific/Robotics/endoskeleton.yml
# Resources/Prototypes/Entities/Structures/Machines/lathe.yml
# Resources/Prototypes/Recipes/Construction/Graphs/machines/cyborg.yml
# Resources/Prototypes/tags.yml
# Resources/ServerInfo/Guidebook/Science/Cyborgs.xml
# Resources/migration.yml
2024-11-15 14:52:30 +03:00
beck-thompson
dfda557d4b
Note expiry time is now relative instead of using timestamps ( #33262 )
...
* Add the stuff
* Loc fix
* fixes
* Change
2024-11-15 10:24:27 +07:00
Pieter-Jan Briers
1bebb3390c
Borg type switching. ( #32586 )
...
* Borg type switching.
This allows borgs (new spawn or constructed) to select their chassis type on creation, like in SS13. This removes the need for the many different chassis types, and means round-start borgs can actually play the game immediately instead of waiting for science to unlock everything.
New borgs have an additional action that allows them to select their type. This opens a nice window with basic information about the borgs and a select button. Once a type has been selected it is permanent for that borg chassis.
These borg types also immediately start the borg with specific modules, so they do not need to be printed. Additional modules can still be inserted for upgrades, though this is now less critical. The built-in modules cannot be removed, but are shown in the UI.
The modules that each borg type starts with:
* Generic: tools
* Engineering: advanced tools, construction, RCD, cable
* Salvage: Grappling gun, appraisal, mining
* Janitor: cleaning, light replacer
* Medical: treatment
* Service: music, service, clowning
Specialized borgs have 3 additional module slots available on top of the ones listed above, generic borgs have 5.
Borg types are specified in a new BorgTypePrototype. These prototypes specify all information about the borg type. It is assigned to the borg entity through a mix of client side, server, and shared code. Some of the involved components were made networked, others are just ensured they're set on both sides of the wire.
The most gnarly change is the inventory template prototype, which needs to change purely to modify the borg hat offset. I managed to bodge this in with an API that *probably* won't explode for specifically for this use case, but it's still not the most clean of API designs.
Parts for specific borg chassis have been removed (so much deleted YAML) and specialized borg modules that are in the base set of a type have been removed from the exosuit fab as there's no point to printing those.
The ability to "downgrade" a borg so it can select a new chassis, like in SS13, is something that would be nice, but was not high enough priority for me to block the feature on. I did keep it in mind with some of the code, so it may be possible in the future.
There is no fancy animation when selecting borg types like in SS13, because I didn't think it was high priority, and it would add a lot of complex code.
* Fix sandbox failure due to collection expression.
* Module tweak
Fix salvage borg modules still having research/lathe recipes
Engie borg has regular tool module, not advanced.
* Fix inventory system breakage
* Fix migrations
Some things were missing
* Guidebook rewordings & review
* MinWidth on confirm selection button
2024-11-14 11:08:35 -06:00
Vigers Ray
8cf5db66b4
Перенес ссылку на телеграм
2024-11-14 04:39:08 +03:00
Vigers Ray
24679aff6d
фиксы апстрима
2024-11-14 03:38:28 +03:00
Vigers Ray
d3c3ec7a3e
фиксы бага лобби с реконектом
2024-11-13 12:06:00 +03:00
Vigers Ray
c4af6e90af
фиксы
2024-11-13 05:18:48 +03:00
Vigers Ray
38889342ad
Merge remote-tracking branch 'refs/remotes/wizards/master'
...
# Conflicts:
# Content.Client/UserInterface/Systems/Ghost/Controls/Roles/GhostRolesEui.cs
# Content.Server/Chemistry/EntitySystems/InjectorSystem.cs
# Content.Shared/Weapons/Ranged/Components/GunComponent.cs
# Content.Shared/Weapons/Ranged/Systems/SharedGunSystem.cs
# Resources/Audio/Machines/attributions.yml
# Resources/Prototypes/Entities/Mobs/Cyborgs/base_borg_chassis.yml
# Resources/Prototypes/Entities/Mobs/Player/silicon.yml
# Resources/Prototypes/Entities/Objects/Weapons/Guns/SMGs/smgs.yml
# Resources/Prototypes/Recipes/Lathes/medical.yml
# Resources/Prototypes/Roles/Jobs/Civilian/service_worker.yml
# Resources/ServerInfo/Guidebook/Antagonist/Antagonists.xml
# Resources/ServerInfo/Guidebook/Antagonist/MinorAntagonists.xml
# Resources/ServerInfo/Guidebook/Antagonist/Nuclear Operatives.xml
# Resources/ServerInfo/Guidebook/Antagonist/Revolutionaries.xml
# Resources/ServerInfo/Guidebook/Antagonist/SpaceNinja.xml
# Resources/ServerInfo/Guidebook/Antagonist/Thieves.xml
# Resources/Textures/Clothing/Uniforms/Jumpskirt/color.rsi/equipped-INNERCLOTHING.png
# Resources/Textures/Clothing/Uniforms/Jumpskirt/color.rsi/icon.png
# Resources/Textures/Clothing/Uniforms/Jumpskirt/color.rsi/meta.json
# Resources/Textures/Clothing/Uniforms/Jumpsuit/color.rsi/equipped-INNERCLOTHING.png
# Resources/Textures/Clothing/Uniforms/Jumpsuit/color.rsi/icon.png
# Resources/Textures/Clothing/Uniforms/Jumpsuit/color.rsi/meta.json
# Resources/Textures/Objects/Weapons/Melee/combat_knife.rsi/inhand-left.png
# Resources/Textures/Objects/Weapons/Melee/combat_knife.rsi/inhand-right.png
# Resources/Textures/Objects/Weapons/Melee/combat_knife.rsi/meta.json
# Resources/Textures/Objects/Weapons/Melee/survival_knife.rsi/inhand-left.png
# Resources/Textures/Objects/Weapons/Melee/survival_knife.rsi/inhand-right.png
# Resources/Textures/Objects/Weapons/Melee/survival_knife.rsi/meta.json
2024-11-13 04:35:52 +03:00
haiwwkes
2d6da2b0d0
awooo ( #617 )
2024-11-13 04:11:45 +03:00
haiwwkes
5c3211b9ec
aaaaaaa ( #616 )
2024-11-13 04:10:39 +03:00
Rinary
ad190f1865
Хирургия ( #607 )
...
* Surgery
* translate strings
* ru translate
* second ru translate
* fix
* fix pizza icon
* пу-пу-пу
* fix damageeeee
* fix
* fix x2)
2024-11-13 04:05:51 +03:00
haiwwkes
8bec8a7b02
Система следов ( #606 )
...
* core
* oopsie
2024-11-13 04:05:19 +03:00
Rinary
977e8baaea
Доработка вампира и мелочи ( #598 )
...
* init
* fix vampire polymorph
* fix vampire metabolizm
* upd
* теперь при бане будет указываться номер раунда, хд
* fix
* fix
* fix locale
* change speed
* new nukeops shuttle
* FULLY FIX EBANY VAMPIRE OBJECTIVES
* fix faction
* fix drank objective
* try fix status icon
* fix changelings
* fix zombie faction
* vampire status icon fix
* upd roadmap
* vampire blood amount alert
* drain objective up
* upd
* upd
2024-11-13 04:02:57 +03:00
