rechka/fish-station
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
34603 commits 1 branch 0 tags 1.2 GiB
Commit graph

5014 commits

Author SHA1 Message Date
Vigers Ray
286a1f2265
QoL Истории ахелпа (#1984) 2025-04-27 22:34:04 +03:00
Vigers Ray
5d2cdd3f44 Merge remote-tracking branch 'space-wizards/master' 
# Conflicts:
#	Content.Client/Humanoid/HumanoidAppearanceSystem.cs
#	Content.Server/Fluids/EntitySystems/PuddleSystem.cs
#	Content.Server/Roles/Jobs/JobSystem.cs
#	Content.Shared/Humanoid/HumanoidAppearanceComponent.cs
#	Resources/Prototypes/Entities/Clothing/Head/hardsuit-helmets.yml
#	Resources/Prototypes/Entities/Mobs/Species/vox.yml
#	Resources/Prototypes/Entities/Objects/Misc/paper.yml
#	Resources/Prototypes/Entities/Objects/Tools/lighters.yml
#	Resources/Prototypes/Entities/Objects/Weapons/Guns/SMGs/smgs.yml
#	Resources/Prototypes/Recipes/Lathes/categories.yml
#	Resources/Prototypes/Recipes/Lathes/machine_boards.yml
#	Resources/Prototypes/Species/vox.yml
 2025-04-21 08:56:50 +03:00
Ed
f6a29e24a2
Markings overhaul (#35938) 
* markings displacement setup

* ok i got it!

* fix map updating

* remove trackingLayers

* markings clean up and modernizize

* marking disabling displacements

* markings restriction

* dehihienize

* dehihiniezize 2

* aa

* nice
 2025-04-20 17:01:50 -04:00
Tayrtahn
31cf0505c9
Convert NameIdentifier to use NameModifierSystem (#36736) 
Convert NameIdentifier to use NameModifierSystem
 2025-04-20 14:16:59 +10:00
Vigers Ray
e2aab392db Merge remote-tracking branch 'space-wizards/master' 
# Conflicts:
#	Content.Server/PDA/PdaSystem.cs
#	Resources/Prototypes/Roles/Jobs/Cargo/salvage_specialist.yml
#	Resources/Prototypes/Roles/Jobs/Civilian/bartender.yml
#	Resources/Prototypes/Roles/Jobs/Civilian/chef.yml
#	Resources/Prototypes/Roles/Jobs/Engineering/atmospheric_technician.yml
#	Resources/Prototypes/Roles/Jobs/Engineering/station_engineer.yml
#	Resources/Prototypes/Roles/Jobs/Engineering/technical_assistant.yml
#	Resources/Prototypes/Roles/Jobs/Medical/chemist.yml
#	Resources/Prototypes/Roles/Jobs/Medical/medical_doctor.yml
#	Resources/Prototypes/Roles/Jobs/Medical/medical_intern.yml
#	Resources/Prototypes/Roles/Jobs/Medical/paramedic.yml
#	Resources/Prototypes/Roles/Jobs/Science/borg.yml
#	Resources/Prototypes/Roles/Jobs/Science/research_assistant.yml
#	Resources/Prototypes/Roles/Jobs/Science/scientist.yml
#	Resources/Prototypes/Roles/Jobs/Security/security_cadet.yml
#	Resources/Prototypes/Roles/Jobs/Security/security_officer.yml
#	Resources/Prototypes/Roles/Jobs/Security/warden.yml
#	Resources/Prototypes/borg_types.yml
#	Resources/Textures/Structures/Walls/shuttleinterior.rsi/full.png
#	Resources/Textures/Structures/Walls/shuttleinterior.rsi/meta.json
#	Resources/Textures/Structures/Walls/shuttleinterior.rsi/state0.png
#	Resources/Textures/Structures/Walls/shuttleinterior.rsi/state1.png
#	Resources/Textures/Structures/Walls/shuttleinterior.rsi/state2.png
#	Resources/Textures/Structures/Walls/shuttleinterior.rsi/state3.png
#	Resources/Textures/Structures/Walls/shuttleinterior.rsi/state4.png
#	Resources/Textures/Structures/Walls/shuttleinterior.rsi/state5.png
#	Resources/Textures/Structures/Walls/shuttleinterior.rsi/state6.png
#	Resources/Textures/Structures/Walls/shuttleinterior.rsi/state7.png
 2025-04-20 02:52:59 +03:00
pacable
a4de2c6df7
Админ консоль прописывания команд (#1876) 2025-04-20 02:44:56 +03:00
c4llv07e
52323a8972
Better PowerCharge menu wrapping (retry) (#34036) 
* fixed

* Move wattage to the power button

---------

Co-authored-by: VideoKompany <135313844+VlaDOS1408@users.noreply.github.com>
 2025-04-19 16:20:32 -04:00
slarticodefast
51e2607a12
cleanup RingerSystem (#36731) 
cleanup ringersystem
 2025-04-19 19:11:08 +02:00
Kyle Tyo
8dc2cb8874
Minor dependency and variable cleanup. (#36730) 
removal of misc unused or extra dependency definitions.
 2025-04-19 18:11:34 +02:00
pathetic meowmeow
8e24308714
Make two inventories not dance around as much when opening/closing them (#35041) 
* Make two inventories not dance around as much when opening/closing them

* Use .Any
 2025-04-19 10:40:49 -04:00
metalgearsloth
39aefa0441
Fix detailed examine mispredicts (#33814) 
So:
- Shared examine like armour, adds the button incorrectly and mispredicts it.
- Server-only like damage, doesn't add it (correct) and no mispredict.

We'll just prune any verbs if the server sends them in unless the verb is client-only and it should fix it unless there's client-side code not flagging it as clientexclusive.
 2025-04-19 10:37:45 -04:00
Milon
6138fcdce9
Predict and cleanup RingerComponent (#35907) 
* clean up most stuff

* move to shared

* works

* shuffle shit around

* oops! access

* fixes

* todo: everything

* SUFFERING

* curse you
 2025-04-19 15:55:05 +02:00
Vigers Ray
e1b8d682ff Merge remote-tracking branch 'space-wizards/master' 
# Conflicts:
#	Content.Server/PDA/PdaSystem.cs
#	Content.Server/RoundEnd/RoundEndSystem.cs
#	Content.Server/Shuttles/Systems/EmergencyShuttleSystem.Console.cs
#	Resources/Prototypes/Catalog/VendingMachines/Inventories/winterdrobe.yml
#	Resources/Prototypes/Reagents/Consumable/Drink/drinks.yml
 2025-04-19 16:33:37 +03:00
metalgearsloth
9bdd7307fd
Predicted multihanded component (#36712) 
* Predicted multihanded component

* Refview

* reh
 2025-04-19 18:05:20 +10:00
metalgearsloth
63dfd21b14
Predict dumping (#32394) 
* Predict dumping

- This got soaped really fucking hard.
- Dumping is predicted, this required disposals to be predicte.d
- Disposals required mailing (because it's tightly coupled), and a smidge of other content systems.
- I also had to fix a compnetworkgenerator issue at the same time so it wouldn't mispredict.

* Fix a bunch of stuff

* nasty merge

* Some reviews

* Some more reviews while I stash

* Fix merge

* Fix merge

* Half of review

* Review

* re(h)f

* lizards

* feexes

* feex
 2025-04-19 16:20:40 +10:00
Vigers Ray
6844adcc9e Merge remote-tracking branch 'space-wizards/master' 
# Conflicts:
#	Content.Shared/Doors/Systems/SharedDoorSystem.cs
#	Content.Shared/Weapons/Melee/SharedMeleeWeaponSystem.cs
 2025-04-19 05:02:40 +03:00
metalgearsloth
72372dc77d
Predict gas volume pumps (#33835) 
* Predict gas volume pumps

* Also this one

* Review
 2025-04-19 11:48:41 +10:00
metalgearsloth
8ab0e59db6
Refactor disarms (#36546) 
* Refactor disarms

- Move client stuff to shared
- Cleanup a bunch of stuff
- Ref events
- Fix the swing sound mispredict (I noticed it on target dummies).

* Revert this change

* minor review

* Rebiew

---------

Co-authored-by: Milon <milonpl.git@proton.me>
 2025-04-19 11:38:22 +10:00
Vigers Ray
c9eb6bd25e Merge remote-tracking branch 'space-wizards/master' 
# Conflicts:
#	Resources/Locale/en-US/_strings/materials/silo.ftl
#	Resources/Textures/Clothing/Neck/mantles/cemantle.rsi/equipped-NECK.png
#	Resources/Textures/Clothing/Neck/mantles/cemantle.rsi/icon.png
#	Resources/Textures/Clothing/Neck/mantles/cemantle.rsi/meta.json
 2025-04-19 03:51:31 +03:00
Nemanja
f8ff7aee92
Local Material Silo (#36492) 
* Material Silo

* fix board, fix copyright

* a bit of review.... for the vibe....

* a tiny bit of review

* 4 spaced

* sloths no good very tiny nitpick

* fix ui flickers

* oops

* slightly lower range

* Sloth Review

---------

Co-authored-by: ScarKy0 <scarky0@onet.eu>
 2025-04-19 09:43:17 +10:00
Vigers Ray
26c3024407 фиксы апстрима 2025-04-19 02:33:41 +03:00
Vigers Ray
0e350ab6d3 Merge remote-tracking branch 'space-wizards/master' 
# Conflicts:
#	Content.Client/Actions/ActionsSystem.cs
#	Content.Client/UserInterface/Systems/Chat/Widgets/ChatBox.xaml
#	Content.Server/GameTicking/GameTicker.GamePreset.cs
#	Content.Server/GameTicking/GameTicker.Spawning.cs
#	Content.Server/Station/Systems/StationSpawningSystem.cs
#	Content.Shared/Actions/BaseActionComponent.cs
#	Content.Shared/Actions/SharedActionsSystem.cs
#	Content.Shared/Weapons/Reflect/ReflectComponent.cs
#	Content.Shared/Weapons/Reflect/ReflectSystem.cs
#	README.md
#	Resources/Prototypes/Actions/types.yml
#	Resources/Prototypes/Entities/Clothing/Eyes/hud.yml
#	Resources/Prototypes/Entities/Mobs/NPCs/animals.yml
#	Resources/Prototypes/Entities/Mobs/Player/dragon.yml
#	Resources/Prototypes/Recipes/Lathes/security.yml
#	Resources/Prototypes/ai_factions.yml
 2025-04-19 00:46:30 +03:00
Tayrtahn
c155740ac5
Cleanup warnings in SimpleRadialMenu (#36690) 2025-04-18 18:28:24 +02:00
Ciarán Walsh
ab1bcfe391
Implement client-side theming for OutputPanel scroll-down button. (#35913) 
* Implement client-side theming for OutputPanel scroll-down button.

* Use OutputPanel constant for button class name

* Remove unused string

* Enable scroll button for ChatBox

* Update RobustToolbox

* Update to merged RT version
 2025-04-18 17:42:59 +10:00
Fildrance
7d81d63aa0
fix: return deconstruct to the top level option of radial menu (#36486) 
feat: now RCD can have recepies that are placed on the top level of radial menu - 'Main' category name is reserved for this

Co-authored-by: pa.pecherskij <pa.pecherskij@interfax.ru>
 2025-04-17 23:50:15 -05:00
Tayrtahn
e00e2ba407
Add PopupPredictedCursor and fix doubled popups on vending machines (#36655) 
* Add PopupCursorPredicted method

* Fix doubled popups on vending machine restock failures

* Rename to match existing pattern
 2025-04-18 14:01:46 +10:00
metalgearsloth
7d2ef2bd47
Action charges refactor (#33993) 
* Action charges refactor

- Fixes the slight godmoding of baseactioncomponent.
- Gets back 1ms of server time.

* chorg

* Remove FrameUpdate

* Fixes

* More fixes

* Combine

* Fixes

* Updates

* weh

* Last fixes

* weh

* Fix naughty

* YAML fixes

* This one too

* Merge conflicts

* This thing

* Review

* Fix this as well

* Icon fix

* weh

* Review

* Review

* seamless

* Review
 2025-04-18 13:45:48 +10:00
Nemanja
c3e43a78f3
Fix another storedSprite bug (#36662) 2025-04-18 12:15:31 +10:00
metalgearsloth
e1a21728e7
Storage fixes (#36533) 
* Storage fixes

- Add size event.
- Fix reclaim not running always.

* Block the toggles

* Standardise and popup explaining

* Disable item toggles in bags

* Fix verb popping up even if we can't activate

* Conflicts

* Validate

* Stop drags if source closes

* Really fixes

* Real fix

* Revert this
 2025-04-18 12:11:31 +10:00
gus
2c60d6b27f
RCD Refactor (#34781) 
* fixed prediction (hopefully), removed caching of prototype, sealed the class, removed any and count

* erroneus using statement

* removed unused timing, removed obsolete method of getting gridUid

* nuked mapgriddata

* code cleanup

* cleanup

* this has to be a string without me rewriting more code than i want to in this moment

* kill

---------

Co-authored-by: metalgearsloth <31366439+metalgearsloth@users.noreply.github.com>
Co-authored-by: metalgearsloth <comedian_vs_clown@hotmail.com>
 2025-04-17 21:34:38 -04:00
Vigers Ray
f71f04558f Merge remote-tracking branch 'space-wizards/master' 
# Conflicts:
#	Content.Client/SurveillanceCamera/UI/SurveillanceCameraMonitorWindow.xaml.cs
#	Content.Shared/Nutrition/EntitySystems/ThirstSystem.cs
#	Resources/Prototypes/Entities/Mobs/Cyborgs/base_borg_chassis.yml
#	Resources/Prototypes/Entities/Objects/Misc/subdermal_implants.yml
 2025-04-17 23:48:59 +03:00
Vigers Ray
f1ac20d096 Выровнял таблицу контрибюторов 2025-04-17 23:46:35 +03:00
eoineoineoin
05ae563e29
Fix exception when telepad system plays beam animations (#33010) 
Fix exception when order sent to telepad

Co-authored-by: Milon <milonpl.git@proton.me>
 2025-04-17 21:52:38 +10:00
Ben Bryant
73e3e90198
Skip unnecessary MaterialStorageControl updates (#32662) 
Remove unnecessary dictionary copying
 2025-04-17 20:41:15 +10:00
eoineoineoin
2fc8cdff00
Fix UI issues with Camera Monitor (#31809) 
* Fix jumpy camera monitor UI

Basically copy-pasted same solution from #30292

* Remove duplicate code; use shared ItemList method to sync items
 2025-04-17 20:15:35 +10:00
Kyle Tyo
7d64599d2d
Action buttons are now usable in the action window. (#35642) 
* Update ActionUIController.cs

* renamed some inconsistent arguments.

* removed a redundant check.

* revert some variable renames to reduce the diff.
 2025-04-17 20:08:09 +10:00
Vigers Ray
091f0b22ee
Топ контрибюторов в лобби (#1828) 2025-04-17 06:27:30 +03:00
Vigers Ray
a5a2bbd386 Merge remote-tracking branch 'space-wizards/master' 
# Conflicts:
#	Resources/Textures/Clothing/Hands/Gloves/Color/black.rsi/meta.json
#	Resources/Textures/Clothing/Hands/Gloves/Color/color.rsi/meta.json
#	Resources/Textures/Clothing/Hands/Gloves/captain.rsi/inhand-left.png
#	Resources/Textures/Clothing/Hands/Gloves/captain.rsi/inhand-right.png
#	Resources/Textures/Clothing/Hands/Gloves/captain.rsi/meta.json
#	Resources/Textures/Clothing/Hands/Gloves/combat.rsi/inhand-left.png
#	Resources/Textures/Clothing/Hands/Gloves/combat.rsi/inhand-right.png
#	Resources/Textures/Clothing/Hands/Gloves/combat.rsi/meta.json
#	Resources/Textures/Clothing/Hands/Gloves/fingerless.rsi/meta.json
#	Resources/Textures/Clothing/Hands/Gloves/fingerlessinsuls.rsi/meta.json
#	Resources/Textures/Clothing/Hands/Gloves/janitor.rsi/inhand-left.png
#	Resources/Textures/Clothing/Hands/Gloves/janitor.rsi/inhand-right.png
#	Resources/Textures/Clothing/Hands/Gloves/janitor.rsi/meta.json
#	Resources/Textures/Clothing/Hands/Gloves/latex.rsi/meta.json
#	Resources/Textures/Clothing/Hands/Gloves/leather.rsi/meta.json
#	Resources/Textures/Clothing/Hands/Gloves/mercfingerless.rsi/meta.json
#	Resources/Textures/Clothing/Hands/Gloves/nitrile.rsi/inhand-left.png
#	Resources/Textures/Clothing/Hands/Gloves/nitrile.rsi/inhand-right.png
#	Resources/Textures/Clothing/Hands/Gloves/nitrile.rsi/meta.json
#	Resources/Textures/Clothing/Hands/Gloves/robohands.rsi/meta.json
#	Resources/Textures/Clothing/Head/Hardsuits/cybersun.rsi/meta.json
#	Resources/Textures/Clothing/OuterClothing/Hardsuits/cybersun.rsi/meta.json
#	Resources/Textures/Mobs/Aliens/Xenos/purple_snake.rsi/meta.json
 2025-04-17 06:26:03 +03:00
beck-thompson
b41ee53dbd
Cleanup various admin buttons (#36312) 
cleanup
 2025-04-17 03:02:41 +02:00
Ed
5a69877fe7
storedOffset bugfix (#33606) 
* Update ItemGridPiece.cs

* Update SharedItemSystem.cs

* Update ItemGridPiece.cs

* EmoGarbage Review

---------

Co-authored-by: EmoGarbage404 <retron404@gmail.com>
 2025-04-16 20:42:22 -04:00
Tayrtahn
f4f9f7ea7b
Cleanup warnings in ScreenshotHook (#36637) 2025-04-16 23:51:38 +02:00
Ciarán Walsh
a16097fa33
Fix duplicate suit signals (#35918) 
* Include the suit owner’s UID in suit sensor status updates.

* Show a single monitoring entry per crew member

* Rewrite sensor collection using a dictionary
 2025-04-16 23:14:05 +02:00
Vigers Ray
6020a6fd5b Merge remote-tracking branch 'space-wizards/master' 
# Conflicts:
#	Content.Client/Administration/UI/Tabs/PlayerTab/PlayerTab.xaml.cs
#	Content.Client/Administration/UI/Tabs/PlayerTab/PlayerTabEntry.xaml.cs
#	Content.Server/Weapons/Ranged/Systems/GunSystem.cs
#	Content.Server/Zombies/ZombieSystem.cs
#	Content.Shared/Inventory/InventorySystem.Relay.cs
#	Content.Shared/Zombies/SharedZombieSystem.cs
#	Content.Shared/Zombies/ZombieComponent.cs
#	Resources/Locale/en-US/_strings/research/technologies.ftl
#	Resources/Prototypes/Entities/Clothing/OuterClothing/bio.yml
#	Resources/Prototypes/Polymorphs/polymorph.yml
#	Resources/Prototypes/Recipes/Lathes/security.yml
#	Resources/Prototypes/Research/arsenal.yml
#	Resources/Prototypes/Research/experimental.yml
 2025-04-17 00:07:59 +03:00
Linkbro
0d70d6bfdf
New Sprites for cables (#34955) 
* initial textures

* Makes it have layers because Milon wanted it

* Makes it have layers because Milon wanted it

* in do NOT understand github

* tested, works

* Update Content.Client/Power/Visualizers/CableVisualizerComponent.cs

Co-authored-by: lzk <124214523+lzk228@users.noreply.github.com>

* Update Content.Client/Power/Visualizers/CableVisualizerComponent.cs

Co-authored-by: lzk <124214523+lzk228@users.noreply.github.com>

* remove extra newline

* EmoGarbage Review - Adjust MV cables to use orange stripes

---------

Co-authored-by: lzk <124214523+lzk228@users.noreply.github.com>
Co-authored-by: Milon <milonpl.git@proton.me>
Co-authored-by: EmoGarbage404 <retron404@gmail.com>
 2025-04-16 16:26:25 -04:00
Errant
fb388d2265
Role subtypes (#35359) 2025-04-16 19:04:48 +02:00
J
b1c08582d5
Various system spring cleaning (#36206) 
* Various systems warnings cleanup

* Last changes before submitting PR

* Add guard for transform component, fix failing test

* Small corrections

* Audio params to specifiers datafields

* Using audio params on components and configs
 2025-04-16 13:08:22 +02:00
Vigers Ray
7f187618e7 Merge remote-tracking branch 'space-wizards/master' 
# Conflicts:
#	Resources/Prototypes/Catalog/uplink_catalog.yml
#	Resources/migration.yml
 2025-04-16 01:44:52 +03:00
Fildrance
98d951008a
fix: mode scanner footer now is not jumping up and down on scanning artifact (#36599) 
fix: scanner footer now is not jumping up and down on scanning artifact

Co-authored-by: pa.pecherskij <pa.pecherskij@interfax.ru>
 2025-04-16 00:05:36 +02:00
Vigers Ray
77d4af8975 Merge remote-tracking branch 'space-wizards/master' 
# Conflicts:
#	Content.Server/Atmos/EntitySystems/FlammableSystem.cs
#	Content.Server/Xenoarchaeology/XenoArtifacts/Effects/Components/GasArtifactComponent.cs
#	Content.Server/Xenoarchaeology/XenoArtifacts/Triggers/Components/ArtifactGasTriggerComponent.cs
#	Content.Shared/Damage/Systems/StaminaSystem.cs
#	Content.Shared/Inventory/InventorySystem.Relay.cs
#	Resources/Locale/en-US/_strings/chat/ui/chat-window.ftl
#	Resources/Locale/en-US/_strings/damage/damage-popup-component.ftl
#	Resources/Prototypes/Entities/Objects/Misc/subdermal_implants.yml
#	Resources/Prototypes/XenoArch/Effects/normal_effects.yml
#	Resources/Textures/Objects/Specific/Medical/hypospray.rsi/hypo.png
#	Resources/Textures/Objects/Specific/Medical/hypospray.rsi/meta.json
#	Resources/migration.yml
 2025-04-15 04:03:44 +03:00
Vigers Ray
9cb67238de Большинство оверлев не работают на лежачих. 2025-04-15 03:54:42 +03:00