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

315 commits

Author SHA1 Message Date
Vigers Ray
4fd9a62618 Прибытие и ЦК теперь нельзя сломать и предметы на них ничего не стоят. 2024-06-11 02:57:44 +03:00
Vigers Ray
2592568873 Фикс спавна в космопорту 2024-06-11 01:18:50 +03:00
Vigers Ray
4a20ecfd08 Фикс выдачи ролей антагов в прибытии 2024-06-10 20:51:38 +03:00
Vigers Ray
e160fc5422 Фикс стыковки шаттла прибытия. 2024-06-09 22:29:53 +03:00
Vigers Ray
3e5002ec81
Тразитный хаб и играбельное ЦК (#51) 
* Тразитный хаб и играбельное ЦК

* Правки и лоадауты для ролей ЦК

* Фиксы

* приоритет для ролей ЦК

* Остальные приколы для хаба
 2024-06-09 16:39:56 +03:00
Vigers Ray
72affc5f7a
Очередь озвучки анонсов, фиксы багов и оптимизация генерации ттсов. (#35) 
* Очередь на озвучку оповещений

* Фикс ошибок клиента и оптимизация ттса

* Укоротил сообщения о кодах

* чейнжлог
 2024-06-07 11:04:08 +03:00
Vigers Ray
21465c02c0
Отображение времени к прибытию эвак шаттла в КПК (#22) 2024-06-05 14:34:36 +03:00
VigersRay
5f10d21fa6 Merge remote-tracking branch 'refs/remotes/wizards/master' 
# Conflicts:
#	Content.Server/Administration/Commands/PlayTimeCommands.cs
#	Content.Server/Preferences/Managers/ServerPreferencesManager.cs
#	Content.Server/Station/Systems/StationSpawningSystem.cs
#	Content.Server/StationEvents/Events/BreakerFlipRule.cs
#	Content.Shared/Roles/JobPrototype.cs
#	Resources/Prototypes/Catalog/Fills/Backpacks/StarterGear/backpack.yml
#	Resources/Prototypes/Catalog/Fills/Backpacks/StarterGear/duffelbag.yml
#	Resources/Prototypes/Catalog/Fills/Backpacks/StarterGear/satchel.yml
#	Resources/Prototypes/Catalog/Fills/Backpacks/duffelbag.yml
#	Resources/Prototypes/Entities/Mobs/base.yml
#	Resources/Prototypes/Entities/Structures/Storage/Tanks/tanks.yml
#	Resources/Prototypes/GameRules/events.yml
#	Resources/Prototypes/Roles/Antags/traitor.yml
#	Resources/Prototypes/Roles/Jobs/Cargo/quartermaster.yml
#	Resources/Prototypes/Roles/Jobs/Cargo/salvage_specialist.yml
#	Resources/Prototypes/Roles/Jobs/Civilian/clown.yml
#	Resources/Prototypes/Roles/Jobs/Civilian/musician.yml
#	Resources/Prototypes/Roles/Jobs/Engineering/technical_assistant.yml
#	Resources/Prototypes/Roles/Jobs/Fun/misc_startinggear.yml
#	Resources/Prototypes/Roles/Jobs/Medical/chemist.yml
#	Resources/Prototypes/Roles/Jobs/Medical/medical_intern.yml
#	Resources/Prototypes/Roles/Jobs/Science/research_director.yml
#	Resources/Prototypes/Roles/Jobs/Security/security_cadet.yml
 2024-06-04 09:41:27 +03:00
eoineoineoin
b44b159431
Replace Matrix3 with System.Numerics.Matrix3x2 (#27443) 
Replace Matrix3 with Matrix3x2
 2024-06-02 14:07:41 +10:00
VigersRay
1b725c9db8 Merge remote-tracking branch 'refs/remotes/wizards/master' 
# Conflicts:
#	Resources/Prototypes/Entities/Mobs/Player/humanoid.yml
 2024-06-01 09:38:18 +03:00
Nemanja
a1a8f04036
Decouple interactions from hands, cleanup old events, add new fears (#28393) 
* ok basic shit

* second part

* pretend it isn't real it can't hurt you.

* 👁️ 👁️

* shadowcommander review
 2024-05-31 13:26:19 -07:00
Vigers Ray
5775d4cdef
Merge sunrise build (#2) 
* commit
 2024-05-31 02:16:18 +03:00
metalgearsloth
b8a2decb4b
Fix shuttle audio clipping (#27527) 
Changed engine to use grid local-center and very high maxdistance / refdistance values so it's seamless.
 2024-05-29 17:32:20 +10:00
MilenVolf
5172114dbb
Localize emergency shuttle's direction for announcements (#28340) 
Localize emergency shuttle direction
 2024-05-28 10:23:05 -04:00
MilenVolf
de8b663124
Add direction relative to station for emergency shuttle's docking & nearby announcement (#28164) 
* Use nav beacon location for emergency shuttle's docking announcement

Location of the shuttle relative to the nearest nav beacon in docking announcement message of the emergency shuttle

* Add directions relative to station
 2024-05-25 16:20:43 -04:00
Nemanja
8a95cb186c
Remove AlertType and AlertCategory (#27933) 2024-05-23 22:43:04 -04:00
Leon Friedrich
0f6e1196d8
Use non-generic TryComp() for metadata & transform (#28133) 2024-05-20 22:40:35 -07:00
DrSmugleaf
eed560bf3e
Make FTL constants in ShuttleSystem into cvars (#27706) 
* Make FTL constants in ShuttleSystem into cvars

* Fix tests
 2024-05-11 00:00:15 -07:00
metalgearsloth
1e30234539
Revert "Fix turned off thrusters consume power" (#27755) 
Revert "Fix turned off thrusters consume power (#26690)"

This reverts commit 70959e7bb0.
 2024-05-07 20:52:18 +10:00
0x6273
c7a5587e07
Dock device link port (#27646) 
* Add dock device link port

* SpawnAndDeleteAllEntitiesInTheSameSpot moment

* The fuck is TryStopNukeOpsFromConstantlyFailing??

Do we have a new test that can randomly fail?
 2024-05-06 13:59:01 +10:00
metalgearsloth
5896e68752
Content update for UI prediction (#27214) 
* Content update for UI refactor

* Big update

* Sharing

* Remaining content updates

* First big update

* Prototype updates

* AUGH

* Fix UI comp ref

* Cleanup

- Fix predicted message, fix item slots, fix interaction range check.

* Fix regressions

* Make this predictive

idk why it wasn't.

* Fix slime merge

* Merge conflict

* Fix merge
 2024-04-26 18:16:24 +10:00
Tayrtahn
f253067a69
Possible fix for evac shuttle test failures (#27175) 
It couldn't be this easy, could it?
 2024-04-21 07:55:43 +10:00
no
5c69031d11
Admin log shuttle gibbing + Make shuttle gibbing and immovable rods drop organs and correctly put player in ghost (#27114) 
* Add admin log when someone gets gibbed by a shuttle

* Make shuttle gibbing work properly again

* Fix immovable rod gibbing, no longer puts you into nullspace

* Update Content.Server/ImmovableRod/ImmovableRodSystem.cs

* Update Content.Server/Shuttles/Systems/ShuttleSystem.FasterThanLight.cs

---------

Co-authored-by: metalgearsloth <31366439+metalgearsloth@users.noreply.github.com>
 2024-04-20 16:27:38 +10:00
Leon Friedrich
12bb476a2d
Add evac shuttle test. (#27152) 
* Add evac shuttle test.

* Fix typo in comment
 2024-04-20 15:57:55 +10:00
ElectroJr
7aa1818823 Update EmergencyShuttleSystem.cs 2024-04-19 19:00:55 -04:00
ElectroJr
6373454242 Fix emergency shuttle initialization 2024-04-19 18:57:12 -04:00
Leon Friedrich
36eaa8c941
Make station components use StationPostInitEvent (#27126) 2024-04-19 15:26:56 +10:00
lzk
70959e7bb0
Fix turned off thrusters consume power (#26690) 2024-04-04 17:28:33 +11:00
SlamBamActionman
bed9e9ac6a
Coordinates Disks & Shuttle FTL Travel (#23240) 
* Adds the CentComm Disk and configures it to work with direct-use shuttles

* Added functionality for drone shuttles (i.e. cargo shuttle)

* Adds support for pods, and a disk console object for disks to be inserted into. Also sprites.

* Added the disk to HoP's locker

* Removed leftover logs & comments

* Fix for integration test

* Apply suggestions from code review (formatting & proper DataField)

Co-authored-by: 0x6273 <0x40@keemail.me>

* Fix integration test & changes based on code review

* Includes Disk Cases to contain Coordinate Disks, which are now CDs instead of Floppy Disks

* Check pods & non-evac shuttles for CentCom travel, even in FTL

* Import

* Remove CentCom travel restrictions & pod disk consoles

* Major changes that changes the coordinates disk system to work with salvage expeditions

* Missed CC diskcase removal

* Fix build

* Review suggestions and changes

* Major additional changes after merge

* Minor tag miss

* Integration test fix

* review

---------

Co-authored-by: 0x6273 <0x40@keemail.me>
Co-authored-by: metalgearsloth <comedian_vs_clown@hotmail.com>
 2024-04-01 15:50:00 +11:00
Pieter-Jan Briers
3b791459c7
Refactor FTL time tracking code to fix a UI bug (#26538) 
The FTL UI on the shuttle console would reset the FTL progress bar every time you open it. This is because the server only sends "time until completion", not a start/end time. The FTL code now uses a separate start/end time so the exact same progress bar can be preserved.

For convenience, I made a StartEndTime record struct that stores the actual tuple. This is now used by the code and has some helpers.
 2024-03-30 12:40:55 +11:00
Jake Huxell
59e46aab93
Reduced Warning Count By 130 For Full Rebuilds (#26518) 
* remove deprecated entity coordinate extension functions. Reduces warning count by approximately 50

* final toCoords Removed

* Remove all unused variables and dead code paths

* remove always true variable, should be a cvar or something instead

* remove superfluous variables from tests
 2024-03-29 16:28:16 +11:00
Nemanja
766192f4b5
Use nav beacon locations for announcements (#26437) 
* use nav beacon locations for announcements

* :thumbs_up:
 2024-03-28 16:53:18 +11:00
Tayrtahn
964c6d54ca
Code cleanup: Purge obsoleted SharedPhysicsSystem methods (#26287) 
Updated calls to SharedPhysicsSystem methods
 2024-03-25 17:37:25 +11:00
Tayrtahn
ae3d745430
Code Cleanup: Purge obsolete MapManager methods (#26279) 
* GetGrid

* GridExists

* TryGetGrid
 2024-03-22 18:08:40 +11:00
Tayrtahn
4a83c36585
Code cleanup: Dirty(Comp) (#26238) 
* Replaced uses of Dirty(Component) with Dirty(Uid, Component)
Modified some systems (notably pulling-related) to use uids.

* Missed a few

* Revert changes to pulling

* No
 2024-03-19 23:27:02 -04:00
LordCarve
eeaea6c25b
Unify Content's EntitySystem logging (#26216) 
Use Log with generated sawmill name rather than explicitly named one for all non rule-based Content EntitySystems.
 2024-03-18 07:30:27 +11:00
metalgearsloth
02cc9c05dd
Fix rounds restarting in the next round (#25856) 
* Fix rounds restarting in the next round

Doesn't fix them restarting in lobby I think but should fix most of it.

* delta india sierra charlie oscar romeo delta
 2024-03-12 14:54:28 -04:00
ShadowCommander
9e2e514319
Fix arrivals not docking on spinning stations (#26033) 
Fix arrivals not working on spinning stations

Increases the tolerance to .15 instead of .1
 2024-03-12 23:57:35 +11:00
metalgearsloth
e648fe5012
Fix pod launch offset (#25855) 
Was too lazy to fix and forgot.
 2024-03-06 12:44:26 +11:00
metalgearsloth
574c625d12
Fix shuttle disabling on ftl (#25859) 
Branch moment.
 2024-03-05 21:08:44 +11:00
metalgearsloth
bbb78807c4
Fix docking fallback (#25854) 
Only thing that even triggers it atm is escape pods.
 2024-03-05 18:07:17 +11:00
metalgearsloth
c23b3d804e
Fix exped FTL (#25823) 
Also fixed some other stuff I noticed.
 2024-03-04 17:24:24 +11:00
metalgearsloth
4b6e5deb59
Fix drone console docking (#25822) 2024-03-04 16:46:45 +11:00
metalgearsloth
21a95960f0
Fix FTL docks not opening (#25808) 2024-03-04 02:00:52 +11:00
metalgearsloth
92872e546a
Fix FTLToDock (#25803) 
* Fix FTLToDock

- Removed Enabled coz unneeded really.
- Fixed SetCoordinates call that got dumped at some point oop.

* Fix this docking check
 2024-03-03 21:14:16 +11:00
metalgearsloth
c5486873db
Shuttle console + FTL rework (#24430) 
* Add shuttle interior drawing back

Just do it per-tile she'll be right, at least it's done with 1 draw call.

* Revamp shuttle console

* Bunch of cleanup work

* Lables sortito

* dok

* Pixel alignment and colours

* Fix a bunch of drawing bugs

* Shuttle map drawing

* Drawing fixes

* Map parallax working finally

* weh

* Commit all my stuff

* mic

* deez

* Update everything

* Xamlify everything

* uh

* Rudimentary blocker range

* My enemies have succeeded

* Bunch of changes to FTL

* Heaps of cleanup

* Fix FTL bugs

* FTL

* weewoo

* FTL fallback

* wew

* weh

* Basic FTL working

* FTL working

* FTL destination fixes

* a

* Exclusion zones

* Fix drawing / FTL

* Beacons working

* Coordinates drawing

* Fix unknown map names

* Dorks beginning

* State + docking cleanup start

* Basic dock drawing

* Bunch of drawing fixes

* Batching / color fixes

* Cleanup and beacons support

* weh

* weh

* Begin pings

* First draft at map objects

* Map fixup

* Faster drawing

* Fix perf + FTL

* Cached drawing

* Fix drawing

* Best I got

* strips

* Back to lists but with caching

* Final optimisation

* Fix dock bounds

* Docking work

* stinker

* kobolds

* Btns

* Docking vis working

* Fix docking pre-vis

* canasses

* Helldivers 2

* a

* Array life

* Fix

* Fix TODOs

* liltenhead feature club

* dorking

* Merge artifacts

* Last-minute touchup
 2024-03-03 18:39:19 +11:00
Rainfey
4e6c59cfe5
Refactor antag rule code (#23445) 
* Initial Pass, Rev, Thief

* Zombie initial pass

* Rebase, Traitor

* Nukeops, More overloads

* Revert RevolutionaryRuleComponent

* Use TryRoundStartAttempt, Rewrite nukie spawning

* Comments, Add task scheduler to GameRuleSystem

* Zombie initial testing done

* Sort methods, rework GameRuleTask

* Add CCVar, Initial testing continues

* Might as well get rid of the obsolete logging

* Oops, i dont know how to log apparently

* Suggested formatting fixes

* Suggested changes

* Fix merge issues

* Minor optimisation

* Allowed thief to choose other antags

* Review changes

* Spawn items on floor first, then inserting

* minor tweaks

* Shift as much as possible to ProtoId<>

* Remove unneeded

* Add exclusive antag attribute

* Fix merge issues

* Minor formatting fix

* Convert to struct

* Cleanup

* Review cleanup (need to test a lot)

* Some fixes, (mostly) tested

* oop

* Pass tests (for real)

---------

Co-authored-by: Rainfall <rainfey0+git@gmail.com>
Co-authored-by: AJCM <AJCM@tutanota.com>
 2024-02-29 17:25:10 +11:00
metalgearsloth
a9502be29e
Revert "Fix chat bubbles (#25643)" (#25645) 
* Revert "Fix chat bubbles (#25643)"

This reverts commit 23d2c4d924.

* Revert "Fixes obsolete Transform warnings in Content. (#25256)"

This reverts commit f284b43ff6.
 2024-02-28 00:51:20 +11:00
TemporalOroboros
f284b43ff6
Fixes obsolete Transform warnings in Content. (#25256) 
* Fix TransformComponent.MapPosition warnings in Content.Client

* Fix TransformComponent.MapPosition warnings in Content.IntegrationTests

* Fix TransformComponent.MapPosition warnings in Content.Shared

* Fix TransformComponent.MapPosition warnings in Content.Server

* Fix TransformComponent.WorldPosition warnings in Content.Shared

* Fix TransformComponent.WorldPosition warnings in Content.Client
Excepts ClickableComponent b/c that needs to be ECS'd entirely later

* Fix TransformComponent.WorldPosition warnings in Content.Server

* Fix TransformComponent.WorldRotation warnings in Content.*

* Fix TransformComponent.MapPosition warnings I missed

* Fix TransformComponent.WorldMatrix warnings in Content.*

* Fix TransformComponent.InvWorldMatrix warnings in Content.*

* Fix TransformComponent.GetWorldPositionRotationMatrixWithInv warnings in Content.*

* Fix TransformComponent.GetWorldPositionRotationMatrix warnings in Content.*

* Fix TransformComponent.GetWorldPositionRotation warnings in Content.*

* Fix TransformComponent.Anchored.set warnings in Content.*

* Fix TransformComponent.Coordinates.set warnings in Content.*

* Fix TransformComponent.LocalPosition.set warnings in Content.*

* Fix TransformComponent.AttachToGridOrMap warnings in Content.*

* Fix TransformComponent.AttachParent warnings in Content.*

* Preempt TransformComponent.LocalRotation.set warnings in Content.Shared

* Preempt TransformComponent.LocalRotation.set warnings in Content.Client

* Preempt TransformComponent.LocalRotation.set warnings in Content.IntegrationTests

* Preempt TransformComponent.LocalRotation.set warnings in Content.Server

* Fix/Preempt the remaining obsolete TransformComponent properties/methods in Content.*

* ECS ClickableComponent

* Fix obsolete SharedTransformSystem methods in Content.*

* Fix ExplosionOverlay `SharedTransformSystem` dependency

* Maybe fix null eye position breaking tests

* MGS requested changes
 2024-02-27 12:06:20 +11:00
Ed
7a5f81ddb4
Handheld Mass Scanner (#25526) 
* handheld

* Update meta.json

* Update meta.json

* Update cargo.yml

* research

* add to borg

* bruh

* borg to T2

* fix
 2024-02-26 16:19:51 -07:00