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

259 commits

Author SHA1 Message Date
Vigers Ray
ed0a30bb64 Merge remote-tracking branch 'space-wizards/master' 
# Conflicts:
#	Content.Client/Weapons/Ranged/Systems/GunSystem.cs
#	Content.IntegrationTests/Tests/PostMapInitTest.cs
#	Content.Server/Entry/EntryPoint.cs
#	Content.Server/Ghost/GhostSystem.cs
#	Content.Server/IoC/ServerContentIoC.cs
#	Content.Server/Shuttles/Systems/ArrivalsSystem.cs
#	Content.Server/Shuttles/Systems/EmergencyShuttleSystem.cs
#	Content.Server/Storage/EntitySystems/SpawnItemsOnUseSystem.cs
#	Content.Server/Voting/Managers/VoteManager.DefaultVotes.cs
#	Content.Server/Weapons/Ranged/Systems/GunSystem.Battery.cs
#	Content.Server/Weapons/Ranged/Systems/GunSystem.Cartridges.cs
#	Content.Server/Weapons/Ranged/Systems/GunSystem.cs
#	Content.Shared/Damage/Systems/DamageableSystem.cs
#	Content.Shared/Follower/FollowerSystem.cs
#	Resources/Locale/en-US/_strings/actions/actions/dna-scrambler.ftl
#	Resources/Locale/en-US/_strings/administration/commands/change-cvar-command.ftl
#	Resources/Locale/en-US/discord/vote-notifications.ftl
#	Resources/Prototypes/Catalog/Fills/Crates/armory.yml
#	Resources/Prototypes/Catalog/Fills/Lockers/security.yml
#	Resources/Prototypes/Entities/Clothing/OuterClothing/misc.yml
#	Resources/Prototypes/Entities/Objects/Specific/Medical/handheld_crew_monitor.yml
#	Resources/Prototypes/Entities/Objects/Weapons/Guns/Rifles/rifles.yml
#	Resources/Prototypes/Entities/Objects/Weapons/Guns/SMGs/smgs.yml
#	Resources/Prototypes/Entities/Objects/Weapons/Guns/Shotguns/shotguns.yml
#	Resources/Prototypes/Voice/speech_emotes.yml
 2025-02-19 13:16:37 +03:00
ElectroJr
eedc992d57 Merge branch 'master' of https://github.com/space-wizards/space-station-14 into map-load-refactor 2025-02-16 16:52:51 +13:00
Vigers Ray
084c955371 фикс движения в вентиляции 2025-02-10 10:07:46 +03:00
Vigers Ray
3355febe9b Merge remote-tracking branch 'space-wizards/master' 
# Conflicts:
#	Content.Client/StatusIcon/StatusIconSystem.cs
#	Content.Server/Implants/ImplantedSystem.cs
#	Resources/Audio/Effects/attributions.yml
#	Resources/Locale/en-US/markings/ears.ftl
#	Resources/Prototypes/Catalog/Fills/Lockers/security.yml
#	Resources/Prototypes/Catalog/uplink_catalog.yml
#	Resources/Prototypes/Entities/Mobs/Player/observer.yml
#	Resources/Prototypes/Entities/Objects/Weapons/Guns/Projectiles/projectiles.yml
#	Resources/Prototypes/Entities/Objects/Weapons/Guns/SMGs/smgs.yml
#	Resources/Prototypes/Entities/Structures/Machines/lathe.yml
#	Resources/Prototypes/LootTables/suspicion_loot_table.yml
#	Resources/Prototypes/Research/arsenal.yml
#	Resources/ServerInfo/Guidebook/NewPlayer/Controls/Controls.xml
#	Resources/Textures/Objects/Weapons/Guns/SMGs/vector.rsi/equipped-BACKPACK.png
#	Resources/Textures/Objects/Weapons/Guns/SMGs/vector.rsi/meta.json
#	Resources/Textures/Objects/Weapons/Guns/Shotguns/pump.rsi/equipped-BACKPACK.png
#	Resources/manifest.yml
#	Resources/migration.yml
#	RobustToolbox
 2025-02-09 22:17:22 +03:00
iertis
7acaae9ea0
Передвижение в вентиляции (#1233) 2025-02-09 19:54:39 +03:00
SlamBamActionman
e58d031300
Hristov & .60 changes - Hristov Rework, Part 2 (#31662) 
* Initial commit

* Updated values to reflect new resistances

* Review fixes

* Review fixes

* LINQ BEGONETH
 2025-02-04 22:55:09 +01:00
Vigers Ray
cef39bc293 Merge remote-tracking branch 'refs/remotes/wizards/master' 
# Conflicts:
#	Content.Client/UserInterface/Controls/RadialContainer.cs
#	Content.Server/Lathe/LatheSystem.cs
#	Content.Server/Silicons/Laws/SiliconLawSystem.cs
#	Content.Shared/Inventory/InventorySystem.Relay.cs
#	Content.Shared/Materials/SharedMaterialReclaimerSystem.cs
#	Content.Shared/Medical/Cryogenics/SharedCryoPodSystem.cs
#	Content.Shared/VendingMachines/SharedVendingMachineSystem.cs
#	Content.Shared/Wieldable/SharedWieldableSystem.cs
#	Resources/Locale/en-US/_strings/station-events/events/radiation-storm.ftl
#	Resources/Locale/en-US/_strings/store/uplink-catalog.ftl
#	Resources/Prototypes/Atmospherics/gases.yml
#	Resources/Prototypes/Catalog/Fills/Lockers/heads.yml
#	Resources/Prototypes/Datasets/Names/borg.yml
#	Resources/Prototypes/Entities/Mobs/NPCs/silicon.yml
#	Resources/Prototypes/Entities/Mobs/Player/silicon.yml
#	Resources/Prototypes/Entities/Objects/Misc/subdermal_implants.yml
#	Resources/Prototypes/Entities/Objects/Weapons/Guns/Snipers/snipers.yml
#	Resources/Prototypes/Entities/Structures/Specific/Atmospherics/sensor.yml
#	Resources/ServerInfo/Guidebook/Engineering/AME.xml
#	Resources/ServerInfo/Guidebook/Engineering/AirlockSecurity.xml
#	Resources/ServerInfo/Guidebook/Engineering/Atmospherics.xml
#	Resources/ServerInfo/Guidebook/Engineering/Construction.xml
#	Resources/ServerInfo/Guidebook/Engineering/Engineering.xml
#	Resources/ServerInfo/Guidebook/Engineering/Fires.xml
#	Resources/ServerInfo/Guidebook/Engineering/NetworkConfigurator.xml
#	Resources/ServerInfo/Guidebook/Engineering/Networking.xml
#	Resources/ServerInfo/Guidebook/Engineering/Power.xml
#	Resources/ServerInfo/Guidebook/Engineering/RTG.xml
#	Resources/ServerInfo/Guidebook/Engineering/Shuttlecraft.xml
#	Resources/ServerInfo/Guidebook/Engineering/Singularity.xml
#	Resources/ServerInfo/Guidebook/Engineering/TEG.xml
#	Resources/ServerInfo/Guidebook/Security/CriminalRecords.xml
#	Resources/Textures/Clothing/OuterClothing/Vests/hazard.rsi/equipped-OUTERCLOTHING.png
#	Resources/Textures/Clothing/OuterClothing/Vests/hazard.rsi/icon.png
#	Resources/Textures/Clothing/OuterClothing/Vests/hazard.rsi/meta.json
#	Resources/Textures/Objects/Weapons/Guns/Rifles/lecter.rsi/equipped-BACKPACK.png
#	Resources/migration.yml
 2025-01-30 11:33:49 +03:00
SlamBamActionman
5c782d3028
Add conditional camera offset based on cursor - Hristov Rework, Part 1 (#31626) 2025-01-28 00:20:45 +01:00
ElectroJr
5e47d25d7f Merge branch 'master' of https://github.com/space-wizards/space-station-14 into map-load-refactor 2025-01-12 20:19:04 +13:00
Vigers Ray
b40ea4c12e Revert "требует баланса (#938)" 
This reverts commit 39f1e14c
 2024-12-28 06:35:36 +03:00
haiwwkes
39f1e14cb1
требует баланса (#938) 2024-12-27 00:45:08 +03:00
Vigers Ray
9a0f28e893 Merge remote-tracking branch 'refs/remotes/wizards/master' 
# Conflicts:
#	Resources/Prototypes/Entities/Objects/Weapons/Guns/Battery/battery_guns.yml
 2024-12-23 20:56:04 +03:00
mubururu_
4ddd7d3c5f
silent footsteps for ninja (#33280) 
* waow

* nice suggestion

* nullable sound

* fix stuff

---------

Co-authored-by: Ed <96445749+TheShuEd@users.noreply.github.com>
Co-authored-by: slarticodefast <161409025+slarticodefast@users.noreply.github.com>
 2024-12-23 15:24:09 +01:00
ElectroJr
6242567aff Refactor map loading & saving 2024-12-23 02:42:17 +13:00
Vigers Ray
0619ac9206 Merge remote-tracking branch 'refs/remotes/wizards/master' 
# Conflicts:
#	.github/workflows/build-test-debug.yml
#	Content.Client/Atmos/Consoles/AtmosAlarmEntryContainer.xaml.cs
#	Content.IntegrationTests/Tests/PostMapInitTest.cs
#	Content.Server/StoreDiscount/Systems/StoreDiscountSystem.cs
#	Content.Server/Zombies/ZombieSystem.cs
#	Content.Shared/Nutrition/EntitySystems/HungerSystem.cs
#	Resources/Locale/en-US/_strings/atmos/gases.ftl
#	Resources/Locale/en-US/_strings/components/atmos-monitoring-component.ftl
#	Resources/Locale/en-US/_strings/tools/components/tool-component.ftl
#	Resources/Prototypes/Entities/Mobs/Player/silicon.yml
#	Resources/Prototypes/Research/industrial.yml
#	Resources/Prototypes/Voice/speech_emotes.yml
#	Resources/Prototypes/ai_factions.yml
#	Resources/toolshedEngineCommandPerms.yml
 2024-12-21 18:51:37 +03:00
metalgearsloth
a2912e3922
Add MovementSound (#31313) 
Mainly useful for medicalborg so you can get a looping sound and not footsteps playing over and over.

Didn't actually update medborg because footsteps need updating.

Not needed for AI.
 2024-12-20 14:51:17 +03:00
Ed
18fe8b9df0
Sprite Movement working with AI movement (#33494) 
* FINALLY

* Update animals.yml
 2024-12-18 17:15:34 +01:00
Vigers Ray
46d1ed8cc6 Merge remote-tracking branch 'refs/remotes/wizards/master' 
# Conflicts:
#	.github/labeler.yml
#	Content.Client/Lobby/LobbyUIController.cs
#	Resources/Locale/en-US/_strings/movement/pulling.ftl
 2024-12-09 23:32:58 +03:00
Plykiya
8f2b19e103
Popup when being pulled shows who is pulling you (#33612) 
* Popup when being pulled

* Update Content.Shared/Movement/Pulling/Systems/PullingSystem.cs

Co-authored-by: MilenVolf <63782763+MilenVolf@users.noreply.github.com>

* Update Resources/Locale/en-US/movement/pulling.ftl

Co-authored-by: MilenVolf <63782763+MilenVolf@users.noreply.github.com>

---------

Co-authored-by: MilenVolf <63782763+MilenVolf@users.noreply.github.com>
 2024-12-08 21:51:53 -06:00
pacable
a2255aba9d
Включил джетпаки на станциях без гравитации. (#722) 
* adfasvcxzv

* убрал оскорбление :clueless:
 2024-11-27 19:39:56 +03:00
metalgearsloth
11dbf50ed6
Add delay to AutoOrient (#33479) 
It functions identically to how V1 of orientation worked and it's incredibly annoying.
 2024-11-23 17:52:58 +01:00
SlamBamActionman
1e368ae300
Add a Walking alert (#32954) 
* Initial commit

* Review feedback changes

* ProtoId

* TempCommit

* First attempt to have client alerts

* Review changes
 2024-11-08 18:28:24 -06: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
eoineoineoin
dea2781047
Fix some issues with pulling system (#32145) 
Joints were created with pivots at object origin, causing unintuitive behaviour when an object was not centered on the origin. Now puts the pivots at the COM.
Joint limits were set based on fractions of the union of the AABB of objects, which did not make geometric sense. Now uses the pivot length with an additional [arbitrary] length.
Joints were created with a very low spring stiffness, which had a negligible effect most of the time but caused very unintuitive behaviour when the pulled object had a low mass (#28028) - disable the spring limit, and just use the hard min/max limits.

Co-authored-by: Eoin Mcloughlin <helloworld@eoinrul.es>
 2024-09-15 02:29:05 +10:00
Errant
1c6b9aaae7
movercontroller namespace (#31749) 2024-09-12 22:01:36 +02:00
godisdeadLOL
44cf3268c1
Force stop pulling when fall asleep (#31893) 
* break pull at sleep

* TryStopPull without user

---------

Co-authored-by: YourUsername <you@example.com>
 2024-09-06 17:30:24 -06:00
SlamBamActionman
9ee43eed2c
Add Galoshes slowdown over slippery surfaces (#30967) 
* first draft

* Fixed it all, just need to rename stuff

* Rename and add comments

* Clean-up

* Access added
 2024-08-23 19:59:51 +10:00
IgorAnt028
1d2c72da80
Fix bug with holding objects (#31009) 
Main
 2024-08-16 00:53:34 -04:00
Nemanja
fc1446e73a
Cursed Mask (#29659) 
* Cursed Mask

* extra expressions

* block ingestion

* mind returning

* okay fix the removal shit
 2024-08-10 11:14:58 -04:00
Nemanja
2528231ad1
offgrid mob friction (#29383) 
* offgrid mob friction

* save the world...
 2024-08-09 14:52:25 +10:00
Nemanja
ce97225c2d
Replace IClickAlert with events (#30728) 
* Replace IAlertClick with events

* whoop

* eek!
 2024-08-07 15:15:35 +10:00
Ed
fb994e8d21
Add comment into jetpack system, to prevent future grid jetpack PRs (#30682) 
Update SharedJetpackSystem.cs
 2024-08-06 20:51:59 +10:00
slarticodefast
bb2981400c
replace all uses of TryGetContainingContainer with non-obsolete overload (#30583) 
* replace all uses of TryGetContainerContainer with non-obsolete overload

* rerun
 2024-08-04 15:38:53 +10:00
DrSmugleaf
1fd934d5dc
Use EntityQuery for footstep modifier and map grid in SharedMoverController (#30575) 2024-08-02 10:08:46 -04:00
Plykiya
e6b67540e4
Update MoverController.cs to not use Component.Owner (#29965) 
* Update MoverController.cs

* Update a bunch of movement code to use Entity<T>

* Last errors

* wow, there were more errors

---------

Co-authored-by: plykiya <plykiya@protonmail.com>
 2024-08-02 11:32:32 +10:00
Cojoke
b57174007c
Remove all Assigned Values that are Never Used (#30110) 
Remove all Assigned Values that are never used
 2024-07-18 20:22:23 -04:00
Plykiya
48ae8ce0a8
Fixes objects changing physics behavior after being pulled (#29694) 
* Fixes pull rotation logic

* cleaner condition

* even less code

* I CHANGED MY MIND

* first one

* second one

---------

Co-authored-by: plykiya <plykiya@protonmail.com>
 2024-07-04 11:29:07 +10:00
Leon Friedrich
1faa1b5df6
Allow zoom command to modify an eye's PVS range (#29245) 
Allow zoom command to modify an eye's PVS range

Co-authored-by: metalgearsloth <31366439+metalgearsloth@users.noreply.github.com>
 2024-07-03 16:44:55 +10:00
DrSmugleaf
c6d718d126
Fix camera recoil system overriding all other eye offsets (#29146) 2024-07-02 19:51:16 -07:00
Cojoke
7555952738
Add Slowdown to Dragging Items that Slow when Held (#29364) 
* Add slowdown to dragging Items that slow when held

* Heh, fancy

* Heh, fancy

* rename SetMovementSpeedModifiers to GetHeldMovementSpeedModifiers because it was not setting anything
 2024-07-01 15:33:08 +10:00
Leon Friedrich
fa3c89a521
Partial buckling refactor (#29031) 
* partial buckling refactor

* git mv test

* change test namespace

* git mv test

* Update test namespace

* Add pulling test

* Network BuckleTime

* Add two more tests

* smelly
 2024-06-20 01:14:18 +10:00
Leon Friedrich
f121946b12
Fix RotateWhilePulling not working (#29032) 2024-06-16 21:30:35 +10:00
Nemanja
d907e4ef57
make pulled uncuffing slower & reduce uncuff spam cooldown (#29008) 
* prevent people being pulled from uncuffing themselves

* block -> modify duration
 2024-06-14 21:01:22 -07:00
Hannah Giovanna Dawson
d4fe7eda51
SS14-26964 Clown Waddling Replicates, etc (#26983) 2024-06-04 09:23:09 -04:00
Plykiya
c5ff647ca6
Replace obsolete EntityWhitelist IsValid usages part 2 (#28506) 2024-06-03 17:40:03 -04:00
metalgearsloth
af70b9a3c7
Selectively revert PullController (#28126) 
I am leaving the issues open and have updated #26547 with more info on what we should do long-term. This is just to bandaid the short-term complaining.
 2024-05-26 20:11:17 -04:00
metalgearsloth
93f289c7dc
Fix water postshader (#28130) 2024-05-25 16:23:34 -04:00
Leon Friedrich
76e13eed35
Improve InteractionSystem range & BUI checks (#27999) 
* Improve InteractionSystem range & BUI checks

* Ghost fixes

* AAA

* Fix test

* fix nullable

* revert to broadcast event

* Fixes for eengine PR

* Ah buckle code

* )
 2024-05-24 15:03:03 +10: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