iertis
d513cda5b6
Фиксы ношения на руках ( #2547 )
2025-07-18 01:47:19 +03:00
Vigers Ray
084c955371
фикс движения в вентиляции
2025-02-10 10:07:46 +03:00
VigersRay
c0ee7e3cc9
Merge remote-tracking branch 'refs/remotes/wizards/master'
...
# Conflicts:
# .github/PULL_REQUEST_TEMPLATE.md
# Content.Client/Lobby/LobbyUIController.cs
# Content.Client/Lobby/UI/HumanoidProfileEditor.xaml.cs
# Content.Client/Players/PlayTimeTracking/JobRequirementsManager.cs
# Content.Server/Administration/Systems/BwoinkSystem.cs
# Content.Server/IoC/ServerContentIoC.cs
# Content.Server/Players/PlayTimeTracking/PlayTimeTrackingSystem.cs
# Content.Server/Shuttles/Systems/ArrivalsSystem.cs
# Content.Shared/Preferences/Loadouts/LoadoutPrototype.cs
# Content.Shared/Roles/JobRequirements.cs
# Resources/Prototypes/Accents/word_replacements.yml
# Resources/Prototypes/Catalog/Fills/Lockers/security.yml
# Resources/Prototypes/Entities/Mobs/Species/base.yml
# Resources/Prototypes/Loadouts/Jobs/Cargo/cargo_technician.yml
# Resources/Prototypes/Loadouts/Jobs/Cargo/quartermaster.yml
# Resources/Prototypes/Loadouts/Jobs/Civilian/bartender.yml
# Resources/Prototypes/Loadouts/Jobs/Civilian/botanist.yml
# Resources/Prototypes/Loadouts/Jobs/Civilian/chaplain.yml
# Resources/Prototypes/Loadouts/Jobs/Civilian/chef.yml
# Resources/Prototypes/Loadouts/Jobs/Civilian/janitor.yml
# Resources/Prototypes/Loadouts/Jobs/Civilian/lawyer.yml
# Resources/Prototypes/Loadouts/Jobs/Civilian/librarian.yml
# Resources/Prototypes/Loadouts/Jobs/Civilian/mime.yml
# Resources/Prototypes/Loadouts/Jobs/Civilian/passenger.yml
# Resources/Prototypes/Loadouts/Jobs/Command/captain.yml
# Resources/Prototypes/Loadouts/Jobs/Command/head_of_personnel.yml
# Resources/Prototypes/Loadouts/Jobs/Engineering/atmospheric_technician.yml
# Resources/Prototypes/Loadouts/Jobs/Engineering/chief_engineer.yml
# Resources/Prototypes/Loadouts/Jobs/Engineering/station_engineer.yml
# Resources/Prototypes/Loadouts/Jobs/Engineering/technical_assistant.yml
# Resources/Prototypes/Loadouts/Jobs/Medical/chemist.yml
# Resources/Prototypes/Loadouts/Jobs/Medical/chief_medical_officer.yml
# Resources/Prototypes/Loadouts/Jobs/Medical/medical_doctor.yml
# Resources/Prototypes/Loadouts/Jobs/Medical/medical_intern.yml
# Resources/Prototypes/Loadouts/Jobs/Medical/paramedic.yml
# Resources/Prototypes/Loadouts/Jobs/Science/research_director.yml
# Resources/Prototypes/Loadouts/Jobs/Science/scientist.yml
# Resources/Prototypes/Loadouts/Jobs/Security/detective.yml
# Resources/Prototypes/Loadouts/Jobs/Security/head_of_security.yml
# Resources/Prototypes/Loadouts/Jobs/Security/security_cadet.yml
# Resources/Prototypes/Loadouts/Jobs/Security/security_officer.yml
# Resources/Prototypes/Loadouts/Jobs/Security/warden.yml
# Resources/Prototypes/Loadouts/Miscellaneous/trinkets.yml
# Resources/Prototypes/Recipes/Lathes/medical.yml
# Resources/Prototypes/Roles/Jobs/Cargo/quartermaster.yml
# Resources/Prototypes/Roles/Jobs/Command/captain.yml
# Resources/Prototypes/Roles/Jobs/Command/head_of_personnel.yml
# Resources/Prototypes/Roles/Jobs/Engineering/chief_engineer.yml
# Resources/Prototypes/Roles/Jobs/Medical/chief_medical_officer.yml
# Resources/Prototypes/Roles/Jobs/Science/research_director.yml
# Resources/Prototypes/Roles/Jobs/Security/head_of_security.yml
# Resources/Textures/Clothing/Mask/sadmime.rsi/meta.json
# Resources/Textures/Clothing/Mask/scaredmime.rsi/meta.json
# Resources/Textures/Clothing/OuterClothing/WinterCoats/coat.rsi/meta.json
# Resources/Textures/Clothing/OuterClothing/WinterCoats/coatatmos.rsi/meta.json
# Resources/Textures/Clothing/OuterClothing/WinterCoats/coatcap.rsi/meta.json
# Resources/Textures/Clothing/OuterClothing/WinterCoats/coatcargo.rsi/meta.json
# Resources/Textures/Clothing/OuterClothing/WinterCoats/coatce.rsi/meta.json
# Resources/Textures/Clothing/OuterClothing/WinterCoats/coatcentcom.rsi/meta.json
# Resources/Textures/Clothing/OuterClothing/WinterCoats/coatchem.rsi/meta.json
# Resources/Textures/Clothing/OuterClothing/WinterCoats/coatcmo.rsi/meta.json
# Resources/Textures/Clothing/OuterClothing/WinterCoats/coatengi.rsi/meta.json
# Resources/Textures/Clothing/OuterClothing/WinterCoats/coatgen.rsi/meta.json
# Resources/Textures/Clothing/OuterClothing/WinterCoats/coathop.rsi/meta.json
# Resources/Textures/Clothing/OuterClothing/WinterCoats/coathos.rsi/meta.json
# Resources/Textures/Clothing/OuterClothing/WinterCoats/coathydro.rsi/meta.json
# Resources/Textures/Clothing/OuterClothing/WinterCoats/coatjani.rsi/meta.json
# Resources/Textures/Clothing/OuterClothing/WinterCoats/coatmed.rsi/meta.json
# Resources/Textures/Clothing/OuterClothing/WinterCoats/coatmime.rsi/meta.json
# Resources/Textures/Clothing/OuterClothing/WinterCoats/coatminer.rsi/meta.json
# Resources/Textures/Clothing/OuterClothing/WinterCoats/coatparamed.rsi/meta.json
# Resources/Textures/Clothing/OuterClothing/WinterCoats/coatqm.rsi/meta.json
# Resources/Textures/Clothing/OuterClothing/WinterCoats/coatrd.rsi/meta.json
# Resources/Textures/Clothing/OuterClothing/WinterCoats/coatrobo.rsi/meta.json
# Resources/Textures/Clothing/OuterClothing/WinterCoats/coatsci.rsi/meta.json
# Resources/Textures/Clothing/OuterClothing/WinterCoats/coatsec.rsi/meta.json
# Resources/Textures/Clothing/OuterClothing/WinterCoats/coatviro.rsi/meta.json
# Resources/Textures/Clothing/OuterClothing/WinterCoats/coatwarden.rsi/meta.json
# Resources/Textures/Structures/Power/apc.rsi/base.png
# Resources/Textures/Structures/Power/apc.rsi/broken.png
# Resources/Textures/Structures/Power/apc.rsi/display-charging.png
# Resources/Textures/Structures/Power/apc.rsi/display-full.png
# Resources/Textures/Structures/Power/apc.rsi/display-lack.png
# Resources/Textures/Structures/Power/apc.rsi/display-remote.png
# Resources/Textures/Structures/Power/apc.rsi/emag-unlit.png
# Resources/Textures/Structures/Power/apc.rsi/frame.png
# Resources/Textures/Structures/Power/apc.rsi/static.png
2024-08-05 17:22:05 +03: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
Vigers Ray
599c3f6b05
Исправление системы переноса гуманоидов
2024-06-09 17:18:58 +03:00
Babaev
f51d4aef47
Возможность брать людей на руки ( #31 )
...
* carry
* fix
* carriable update
* Removed carriable from vox, slime
---------
Co-authored-by: Vigers Ray <60344369+VigersRay@users.noreply.github.com>
2024-06-09 17:01:25 +03:00
brainfood1183
5f063d2d6d
Toilet Upgrade (needs review) ( #22133 )
...
* Toilet Draft
* fixes
* toilets now have secret stash to place items in cistern.
* fixes
* plungers now unblock toilets.
* fix sprite
* new sprites and fix
* fixes
* improve seat sprites.
* fix
* removed visualisersystem changed to genericvisualizers
* flush sound for toilets and copyright for toilet sprites.
* fix atrributions
* fixes
* fix datafield flushtime
* sprite improvements
* fixes
* multiple changes
* fix
* fix
* fixes remove vv
* moved stash related functions to secret stash system from toilet.
* fix
* fix
* changes for recent review.
* fix
* fix
2024-03-31 14:21:18 +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
012e6e6c86
Remove contests ( #25425 )
...
- Not mentioned anywhere ingame.
- Stupid.
2024-02-20 23:39:52 -07:00
Tayrtahn
31207006f5
Fix pressing shift while held triggering escape ( #24878 )
...
* We meet again, my old friend.
* Helper property
2024-02-03 13:14:20 +11:00
Tayrtahn
060fbcfbc8
Make EscapeInventorySystem respect Unremovable (fix glued hamster deletion) ( #24488 )
...
* Made EscapeInventorySystem respect Unremovable
* Oh look, there's a helper method
* Let's fix this too
2024-01-25 09:01:13 -05:00
DrSmugleaf
f560f88eb5
Remove 700 usages of Component.Owner ( #21100 )
2023-10-19 12:34:31 -07:00
Kara
dbb7c7065a
Kill ContainerHelpers ( #20908 )
2023-10-11 20:18:49 +11:00
metalgearsloth
d5bd1c6f86
Predict StorageComponent ( #19682 )
2023-09-11 21:20:46 +10:00
metalgearsloth
5a0fc68be2
Content update for NetEntities ( #18935 )
2023-09-11 09:42:41 +10:00
themias
f1d3f059fe
Fix mice getting trapped in potted plants ( #16745 )
2023-05-24 10:30:08 -07: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
e9dbcc4278
Another round of DoAfter fixes ( #14295 )
2023-03-01 11:51:42 +11:00
keronshb
9ebb452a3c
DoAfter Refactor ( #13225 )
...
Co-authored-by: DrSmugleaf <drsmugleaf@gmail.com>
2023-02-25 01:01:25 +01:00
Leon Friedrich
881a2b2ece
PopupSystem public methods rejig ( #12830 )
2022-12-19 08:41:47 +11:00
Rane
a47f847659
fix inventory escape bug ( #12695 )
2022-11-21 14:34:53 +11:00
Rane
e81510bf3e
Escape inventory refactor ( #10203 )
2022-08-10 18:37:20 +10:00
metalgearsloth
b9e876ca92
The real movement refactor ( #9645 )
...
* The real movement refactor
* ref events
* Jetpack cleanup
* a
* Vehicles partially working
* Balance tweaks
* Restore some shitcode
* AAAAAAAA
* Even more prediction
* ECS compstate trying to fix this
* yml
* vehicles kill me
* Don't lock keys
* a
* Fix problem
* Fix sounds
* shuttle inputs
* Shuttle controls
* space brakes
* Keybinds
* Fix merge
* Handle shutdown
* Fix keys
* Bump friction
* fix buckle offset
* Fix relay and friction
* Fix jetpack turning
* contexts amirite
2022-07-16 13:51:52 +10:00
metalgearsloth
2b6c352aff
Jetpacks ( #9023 )
...
* Movement acceleration
* tweaks
* Weightless refactor coz fuck it
* CCVars
* weightless movement tweaks
* Some cleanup while I'm here
* dorkpacks
* thanks fork
* fixes
* zoomies
* toggles
* hmm
* yamls
* b
* so true
* Effects refactor
* namespace
* review
2022-06-24 17:44:30 +10:00
Rane
1f47d65c91
Two small bugfixes ( #8285 )
2022-05-20 01:29:02 +10:00
keronshb
e2ac92c3b5
Allows pickuppable animals to resist out of inventory ( #7545 )
...
Co-authored-by: ShadowCommander <10494922+ShadowCommander@users.noreply.github.com>
2022-05-12 17:58:27 +10:00
