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

60 commits

Author SHA1 Message Date
Vigers Ray
7eee898afc Merge remote-tracking branch 'space-sunrise/master' 
# Conflicts:
#	Content.Client/Medical/CrewMonitoring/CrewMonitoringWindow.xaml
#	Content.Client/_Sunrise/MentorHelp/MentorHelpControl.xaml.cs
#	Content.Packaging/ServerPackaging.cs
#	Content.Server/Content.Server.csproj
#	Content.Server/Entry/EntryPoint.cs
#	Content.Server/Explosion/EntitySystems/ExplosionSystem.Processing.cs
#	Content.Server/Fax/FaxSystem.cs
#	Content.Server/Medical/CrewMonitoring/CrewMonitoringConsoleSystem.cs
#	Content.Server/_Sunrise/Biocode/Systems/BiocodeDeactivationSystem.cs
#	Content.Shared/CCVar/CCVars.Atmos.cs
#	Content.Shared/Repairable/RepairableSystem.cs
#	Content.Shared/_Sunrise/FleshCult/CauseFleshCultInfection.cs
#	Resources/Locale/en-US/_prototypes/_sunrise/entities/clothing/belt/belts.ftl
#	Resources/Locale/en-US/_prototypes/_sunrise/entities/objects/specific/medical/hypospray.ftl
#	Resources/Locale/en-US/_strings/medical/components/crew-monitoring-component.ftl
#	Resources/Locale/en-US/_strings/reagents/meta/medicine.ftl
#	Resources/Locale/ru-RU/_prototypes/_sunrise/entities/clothing/belt/belts.ftl
#	Resources/Locale/ru-RU/_prototypes/_sunrise/entities/objects/specific/mech/mechs.ftl
#	Resources/Locale/ru-RU/_prototypes/_sunrise/entities/objects/specific/medical/hypospray.ftl
#	Resources/Locale/ru-RU/_strings/_sunrise/markings/vulpkanin.ftl
#	Resources/Locale/ru-RU/_strings/_sunrise/mentor-help/mentor-help-ui.ftl
#	Resources/Locale/ru-RU/_strings/reagents/meta/medicine.ftl
#	Resources/Maps/Nonstations/nukieplanet.yml
#	Resources/Maps/_Sunrise/Nonstations/nukieplanet.yml
#	Resources/Prototypes/Catalog/Fills/Items/belt.yml
#	Resources/Prototypes/Catalog/Fills/Items/firstaidkits.yml
#	Resources/Prototypes/Damage/containers.yml
#	Resources/Prototypes/Entities/Mobs/Cyborgs/base_borg_chassis.yml
#	Resources/Prototypes/Entities/Mobs/Player/humanoid.yml
#	Resources/Prototypes/Entities/Mobs/Species/base.yml
#	Resources/Prototypes/Entities/Objects/Misc/identification_cards.yml
#	Resources/Prototypes/Entities/Objects/Specific/Mech/mechs.yml
#	Resources/Prototypes/Entities/Objects/Specific/Medical/hypospray.yml
#	Resources/Prototypes/Entities/Objects/Specific/Robotics/borg_modules.yml
#	Resources/Prototypes/Entities/Objects/Specific/Robotics/mmi.yml
#	Resources/Prototypes/Entities/Objects/Tools/cable_coils.yml
#	Resources/Prototypes/Entities/Objects/Weapons/Guns/Battery/battery_guns.yml
#	Resources/Prototypes/Entities/Structures/Storage/Closets/Lockers/lockers.yml
#	Resources/Prototypes/Reagents/fun.yml
#	Resources/Prototypes/Reagents/medicine.yml
#	Resources/Prototypes/Reagents/narcotics.yml
#	Resources/Prototypes/Reagents/toxins.yml
#	Resources/Prototypes/Roles/Antags/nukeops.yml
#	Resources/Prototypes/Roles/Jobs/CentComm/cburn.yml
#	Resources/Prototypes/Roles/Jobs/CentComm/deathsquad.yml
#	Resources/Prototypes/Shuttles/shuttle_incoming_event.yml
#	Resources/Prototypes/Store/currency.yml
#	Resources/Prototypes/_Starlight/Entities/Objects/Weapons/Guns/Projectiles/hitscan.yml
#	Resources/Prototypes/_Sunrise/Catalog/ert_uplink_catalog.yml
#	Resources/Prototypes/_Sunrise/Chemistry/medicine.yml
#	Resources/Prototypes/_Sunrise/Entities/Clothing/Belt/belts.yml
#	Resources/Prototypes/_Sunrise/Entities/Mobs/Player/eviltwin.yml
#	Resources/Prototypes/_Sunrise/Entities/Mobs/Player/ghost_roles.yml
#	Resources/Prototypes/_Sunrise/Entities/Objects/Specific/Mech/mechs.yml
#	Resources/Prototypes/_Sunrise/Entities/Objects/Specific/Medical/hypospray.yml
#	Resources/Prototypes/_Sunrise/Entities/Objects/Specific/NTUplink.yml
#	Resources/Prototypes/_Sunrise/Entities/Objects/Specific/Robotics/borg_brains.yml
#	Resources/Prototypes/_Sunrise/Entities/Objects/Tools/biocode.yml
#	Resources/Prototypes/_Sunrise/GameRules/events.yml
#	Resources/Prototypes/_Sunrise/Reagents/gases.yml
#	Resources/Prototypes/_Sunrise/Reagents/narcotics.yml
#	Resources/Prototypes/_Sunrise/Roles/Jobs/Blueshield/blueshield_officer.yml
#	Resources/Prototypes/_Sunrise/Roles/Jobs/Security/senior_officer.yml
#	Resources/ServerInfo/Guidebook/Medical/MedicalDoctor.xml
#	Resources/Textures/_Sunrise/BloodCult/pinpointer.rsi/meta.json
#	Resources/Textures/_Sunrise/BloodCult/pinpointer.rsi/pinonalert.png
#	Resources/Textures/_Sunrise/BloodCult/pinpointer.rsi/pinonalertdirect.png
#	Resources/Textures/_Sunrise/BloodCult/pinpointer.rsi/pinonalertnull.png
#	Resources/Textures/_Sunrise/BloodCult/pinpointer.rsi/pinonclose.png
#	Resources/Textures/_Sunrise/BloodCult/pinpointer.rsi/pinondirect.png
#	Resources/Textures/_Sunrise/BloodCult/pinpointer.rsi/pinondirectlarge.png
#	Resources/Textures/_Sunrise/BloodCult/pinpointer.rsi/pinondirectsmall.png
#	Resources/Textures/_Sunrise/BloodCult/pinpointer.rsi/pinondirectxtrlarge.png
#	Resources/Textures/_Sunrise/BloodCult/pinpointer.rsi/pinonfar.png
#	Resources/Textures/_Sunrise/BloodCult/pinpointer.rsi/pinonmedium.png
#	Resources/Textures/_Sunrise/BloodCult/pinpointer.rsi/pinonnull.png
#	Resources/Textures/_Sunrise/BloodCult/pinpointer.rsi/pinpointer_bloodcult.png
#	Resources/manifest.yml
 2025-12-29 18:37:56 +01:00
A-Mironov
885bd26937
Солянка обнов № 4 (#151) 
* mangleness adjustment

* stable

* empty fix

* перебаламс

* Обнова описаний

* stable

* Голо работабт как надо

* fix

* Fix fax

* Update medicine.yml

* Update blood_magic.yml

* Update humanoid.yml

* Update medicine.yml

* Update ghost_roles.yml

* Update mechs.yml

* Update toxins.yml

* Fish comments

* F

* Update hypospray.yml

* Update hypospray.yml

* Update hypospray.yml

* фикс мозгов

* истощение!!!

* Обнова наборов медиков ОБР и ЯО

* Частичный откат фикса факса

* ФИКСЫ ПНТ

* Ещё один нерф культа плоти? В этой экономике? А вообще исправлен баг бесконечных мясников

* Автокрио вернулось на 15 минут, минимум для мажоров опущен до 35 игроков

* Истощение теперь живёт у санрайза

* Не работают комменты там

* Возвращаем бугурт комментов + требование 100 часов СБ на ЭС

* фикс линтера

* Update hypospray.ftl

* Update hypospray.yml

* Считать не умею, фикс боевого медипена
 2025-12-19 01:11:18 +02:00
Hannah Giovanna Dawson
cdbe92d37d
Update DamageableSystem to modern standards (#39417) 
* Update DamageableSystem to modern standards

* DamageContainerId -> DamageContainerID with lint flag

* Replace strings with protoids

* Make CVar subscription declarations all consistently whitespaced

* ChangeDamage -> TryChangeDamage, cope with C# jank

* Revert event signature changes

* Restore a comment

* Re-add two queries

* Init the queries

* Use appearanceQuery in DamageChanged

* Use damageableQuery in TryChangeDamage

* Use damageableQuery in SetDamageModifierSetId

* Final cleanup, fix sandboxing

* Rectify ExplosionSystem:::ProcessEntity's call to TryChangeDamage

* Re-organize DamageableSystem

* first big fuck you breaking change.

* THATS A LOT OF DAMAGE!!!

* Fix test fails

* test fixes 2

* push it

---------

Co-authored-by: Princess Cheeseballs <66055347+Pronana@users.noreply.github.com>
 2025-10-27 19:53:04 +00:00
nikitosych
1bbf094c79
Fix for holoparasite's ability to attack the host through mech (#36659) 2025-06-14 20:22:45 +03:00
bolantej
e5144c5df8
Fixed Holoclown injector not breaking on drop (#37727) 2025-05-23 14:42:30 -07:00
Tayrtahn
44106d5570
Move guardian sounds to component (#36870) 2025-04-24 01:29:49 +02:00
YoungThug
f01c6e9b37
Holoparasite injector fix (#36109) 
* HoloParaTextFix

* PleaseSpeedMergeLmao

* ThankYouOrks

* Update Resources/Locale/en-US/guardian/guardian.ftl

Co-authored-by: Tayrtahn <tayrtahn@gmail.com>

* Update Content.Server/Guardian/GuardianSystem.cs

Co-authored-by: Tayrtahn <tayrtahn@gmail.com>

* Update Content.Server/Guardian/GuardianSystem.cs

Co-authored-by: Tayrtahn <tayrtahn@gmail.com>

---------

Co-authored-by: Tayrtahn <tayrtahn@gmail.com>
 2025-03-31 17:18:21 -04:00
Tayrtahn
e76b81d291
Remove non-networked Dirty call in GuardianSystem (#35916) 2025-03-18 21:37:14 -04:00
No Elka
9fb5517afa
Make holoparasite's damage transfer ignore the host's armor (#35418) 
Change stuff
 2025-02-23 21:03:11 +01:00
deltanedas
02c7662617
prevent using holo inside containers (#32068) 
Co-authored-by: deltanedas <@deltanedas:kde.org>
 2024-09-15 21:04:31 +02:00
Plykiya
b7aa97e203
Replace obsolete EntityCoordiates.InRange() with TransformSystem.InRange() (#29993) 
* Replace EntityCoordiates.InRange() with TransformSystem.InRange()

* nullspace

* I figured it out

* man I have no clue how client side sutff works

* please have mercy

* remove RadiationPulseOverlay changes

* nullspace

---------

Co-authored-by: plykiya <plykiya@protonmail.com>
 2024-07-13 23:25:51 +02:00
Kara
855234aa30
Resolve 'TransformComponent.MapPosition' is obsolete in content (#27939) 
* Resolve `'TransformComponent.MapPosition' is obsolete: 'Use TransformSystem.GetMapCoordinates'` in content

* build?
 2024-05-12 10:31:54 -04:00
Alice "Arimah" Heurlin
2e9c8f691c
Fix guardian damage transfer (#26541) 2024-03-29 21:25:42 -04:00
Tayrtahn
f4cb02fb0c
Code cleanup: Purge calls to obsolete EntityCoordinates methods (#26292) 
* Purge calls to obsolete EntityCoordinates methods

* Pizza defruited; rerun those tests!
 2024-03-21 12:59:56 +11:00
nikthechampiongr
362d56981f
Simplify DoAfterArgs behavior for movement and distance checks (#25226) 
* Merge BreakOnWeightlessMove and BreakOnMove. Provide different theshold for weightless movement.

* Adjust WeightlessMovementThresholds. Put a thing I forgot to put in the doafterargs.

* Make DoAfterArgs only use OnMove to determine whether to check for
movement and MoveThreshold to determine the threshold regardless of
weightlessness. Gave DistanceThreshold a default value which will always
be checked now.

* Fix issue introduced by merge.

* Use interaction system for determining whether a distance is within range

* Fix incorrect doafter args introduced by previous merge.
Forgor to commit these.

* Exorcise ghost.

The execution system should have been deleted when I merged previously.
For a reason I cannot comprehend it came back, but only the execution
system.

* Exorcise ghost Pt. 2

* Allow for movement check to be overriden in zero g and adjust doafter args where needed.

You can now override checking for movement in zero g with the BreakOnWeightlessMove bool. By default it will check.
The following doafters were made to ignore the movement check in zero g:
- Healing yourself with healing items,
- Removing embedded projectiles,
- Using tools like welders and crowbars

* Adjust distance for cuffing/uncuffing to work. Make injections not break on weightless movement.

* Fix evil incorrect and uneeded comments
 2024-03-19 21:09:00 +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
Pieter-Jan Briers
3e3cb10a96
Make some damage sources not cancel do afters (#24635) 
- poison chemicals (HealthChange effect)
- being on fire
- guardians transferring damage to owner
 2024-01-28 10:51:54 +11:00
TemporalOroboros
7a77d6d5dd
Content ecs containers (#22484) 2023-12-28 01:30:03 -04:00
metalgearsloth
269c93245d
Unrevert audio (#21330) 
Co-authored-by: Pieter-Jan Briers <pieterjan.briers@gmail.com>
 2023-11-27 22:12:34 +11:00
Leon Friedrich
fb60a56950
Guardian bugfixes (#21467) 2023-11-06 22:16:32 -05:00
metalgearsloth
5b8f3c48c4
Revert "Update submodule to 175.0.0 (#21318)" (#21319) 2023-10-29 15:29:30 +11:00
metalgearsloth
9b1b3e03ed
Content audio (#20862) 2023-10-29 14:58:23 +11:00
Sirionaut
3a561ed993
fixed localization for guardian (#21101) 2023-10-20 20:06:56 +03:00
Kara
dbb7c7065a
Kill ContainerHelpers (#20908) 2023-10-11 20:18:49 +11:00
Whisper
1b3f4c3d7b
Guardians (Holo and holoclown) have syndicate faction ai (#19816) 2023-09-13 20:51:10 -07:00
metalgearsloth
5a0fc68be2
Content update for NetEntities (#18935) 2023-09-11 09:42:41 +10:00
DrSmugleaf
09bce85f19
Fix actions not being usable, ordering, and containers (#19964) 2023-09-09 16:14:17 -07:00
DrSmugleaf
c71f97e3a2
Refactor actions to be entities with components (#19900) 2023-09-08 18:16:05 -07:00
DrSmugleaf
a88e747a0b
Refactor serialization copying to use source generators (#19412) 2023-08-22 18:14:33 -07:00
brainfood1183
ae5dcbabee
Holoclown (clown only) syndicate uplink item. (#18966) 
* Holoclown (clown only) syndicate uplink item.

* added clumsy to holoclown

* holoclown now uses clown names, holoclown kits box now counts as boxhugs for crafting.

* gibs holoparasite on death if has hands (this will cause the items in hands and pockets to drop.
 2023-08-13 01:18:09 -06:00
liltenhead
54e7ebf83b
[tweak] Minor Holoparasite tweak (#15803) 
* Update holo description

* Reduce shared damage
 2023-04-26 00:52:07 -06:00
metalgearsloth
ae01618874
Revert "Revert "Replace ResourcePath with ResPath (#15308)" (#155… (#15566) 2023-04-20 20:16:01 +10:00
metalgearsloth
acf79a8209
Revert "Replace ResourcePath with ResPath (#15308)" (#15551) 2023-04-20 11:43:54 +10:00
Ygg01
71f358a027
Replace ResourcePath with ResPath (#15308) 2023-04-19 23:39:17 +10:00
Leon Friedrich
19277a2276
More DoAfter Changes (#14609) 
* DoAfters

* Compact Clone()

* Fix mice and cuffables

* Try generalize attempt events

* moves climbabledoafter event to shared, fixes issue with climbable target

* Fix merge (cuffing)

* Make all events netserializable

* handful of doafter events moved

* moves the rest of the events to their respective shared folders

* Changes all mentions of server doafter to shared

* stop stripping cancellation

* fix merge errors

* draw paused doafters

* handle unpausing

* missing netserializable ref

* removes break on stun reference

* removes cuffing state reference

* Fix tools

* Fix door prying.

* Fix construction

* Fix dumping

* Fix wielding assert

* fix rev

* Fix test

* more test fixes

---------

Co-authored-by: keronshb <keronshb@live.com>
 2023-04-02 21:13:48 -04:00
keronshb
9ebb452a3c
DoAfter Refactor (#13225) 
Co-authored-by: DrSmugleaf <drsmugleaf@gmail.com>
 2023-02-25 01:01:25 +01:00
Jezithyr
eeb5b17b34
Mobstate Refactor (#13389) 
Refactors mobstate and moves mob health thresholds to their own component

Co-authored-by: DrSmugleaf <drsmugleaf@gmail.com>
 2023-01-13 16:57:10 -08:00
Leon Friedrich
881a2b2ece
PopupSystem public methods rejig (#12830) 2022-12-19 08:41:47 +11:00
DrSmugleaf
7fbc2608e8
Remove redundant read-only VV from datafields (#12626) 2022-11-16 20:22:11 +01:00
Paul Ritter
79854e59a4
adds a source uid to most damage & mobstate events (#11559) 
Co-authored-by: Flipp Syder <76629141+vulppine@users.noreply.github.com>
 2022-10-08 12:15:27 +02:00
wrexbe
c55a015b77
Small UI refactor pieces (#11026) 
* ActionType rename Name to DisplayName

* Gameplay State rename+move
 2022-09-04 17:21:14 -07:00
Leon Friedrich
685b82e14e
Fix guardian error (#10857) 2022-08-25 23:35:58 +10:00
Kara
50fc190f7f
Visual popup addendum (#9570) 2022-07-09 02:32:06 -07:00
Kara
dc28b58468
Visual popup types (#9523) 
* Visual popup types

* Pass over `PopupCoordinates` and `PopupCursor`

* `PopupEntity` pass

* Disease and reagent popup pass

* COLOUR
 2022-07-09 04:09:52 -05:00
keronshb
f7b1bda3e5
Reorders Sound Systems signatures to match Popup Systems. (#8728) 2022-06-13 09:45:47 +10:00
wrexbe
bc68ac96dd
Cleanup the namespaces (#8132) 2022-05-13 17:59:03 +10:00
Leon Friedrich
ba75934512
Re-add action prototypes (#7508) 
Co-authored-by: DrSmugleaf <DrSmugleaf@users.noreply.github.com>
 2022-04-14 06:17:34 +02:00
Leon Friedrich
dee4d724e7
Fix action interaction checks (#7502) 2022-04-11 23:59:10 +10:00
Leon Friedrich
bfd95c493b
hands ECS (#7081) 2022-03-17 18:13:31 +11:00