Remuchi
1e363c7346
Revert "Merge pull request #462 from WWhiteDreamProject/revert-460-upstream"
...
This reverts commit 092dba42e5e6315c2320
2025-04-20 11:15:45 +07:00
DVONIKS
6c19771020
Revert "Upstream 04.04-18.04"
2025-04-20 06:34:09 +03:00
SleepyScarecrow
7e936e3a95
Fixed Penlight UI and Blind Detection ( #2139 )
...
<!--
This is a semi-strict format, you can add/remove sections as needed but
the order/format should be kept the same
Remove these comments before submitting
-->
# Description
<!--
Explain this PR in as much detail as applicable
Some example prompts to consider:
How might this affect the game? The codebase?
What might be some alternatives to this?
How/Who does this benefit/hurt [the game/codebase]?
-->
Fixed up the penlights again. Made it so that the UI messages stored,
because there was an issue with the UI opening blank since the diagnoses
were already done beforehand, and they weren't readable. Further, I
updated the system to properly detect eye damage and blindess.
---
# TODO
<!--
A list of everything you have to do before this PR is "complete"
You probably won't have to complete everything before merging but it's
good to leave future references
-->
- [x] Fixed Penlights
---
# Changelog
<!--
You can add an author after the `🆑 ` to change the name that appears
in the changelog (ex: `🆑 Death`)
Leaving it blank will default to your GitHub display name
This includes all available types for the changelog
-->
🆑 SleepyScarecrow
- fix: Fixed penlights.
(cherry picked from commit bb7e69c8ac34eab72f6b03e99ee54efff96342a1)
2025-04-18 17:05:26 +03:00
DEATHB4DEFEAT
47b10a01b0
Catch-Up Cherry Pick 2 ( #944 )
...
# Description
Picked 400 commits (and skipped many, many more) from WizDen since #540 .
Stopped at commit 332f54a3aebe669f6e50d26e7b047f0bdc28e0fb (Lobby
Refactor).
---
# TODO
- [x] Pick
- [x] Compile
- [x] Fix runtime errors
- [ ] Fix up humanoid profile editor
- [ ] Test everything
---
# Changelog
🆑
- add: Merged 400 WizDen PRs. Happy testing!
---------
Co-authored-by: Plykiya <58439124+Plykiya@users.noreply.github.com >
Co-authored-by: FungiFellow <151778459+FungiFellow@users.noreply.github.com >
Co-authored-by: osjarw <62134478+osjarw@users.noreply.github.com >
Co-authored-by: Ubaser <134914314+UbaserB@users.noreply.github.com >
Co-authored-by: beck-thompson <107373427+beck-thompson@users.noreply.github.com >
Co-authored-by: Leon Friedrich <60421075+ElectroJr@users.noreply.github.com >
Co-authored-by: Magnus Larsen <i.am.larsenml@gmail.com >
Co-authored-by: Hanz <41141796+Hanzdegloker@users.noreply.github.com >
Co-authored-by: Kukutis96513 <146854220+Kukutis96513@users.noreply.github.com >
Co-authored-by: potato1234_x <79580518+potato1234x@users.noreply.github.com >
Co-authored-by: Gotimanga <127038462+Gotimanga@users.noreply.github.com >
Co-authored-by: Mangohydra <156087924+Mangohydra@users.noreply.github.com >
Co-authored-by: TsjipTsjip <19798667+TsjipTsjip@users.noreply.github.com >
Co-authored-by: lzk <124214523+lzk228@users.noreply.github.com >
Co-authored-by: SlamBamActionman <83650252+SlamBamActionman@users.noreply.github.com >
Co-authored-by: Morb <14136326+Morb0@users.noreply.github.com >
Co-authored-by: MilenVolf <63782763+MilenVolf@users.noreply.github.com >
Co-authored-by: KrasnoshchekovPavel <119816022+KrasnoshchekovPavel@users.noreply.github.com >
Co-authored-by: metalgearsloth <31366439+metalgearsloth@users.noreply.github.com >
Co-authored-by: Nemanja <98561806+EmoGarbage404@users.noreply.github.com >
Co-authored-by: DrSmugleaf <10968691+DrSmugleaf@users.noreply.github.com >
Co-authored-by: Ed <96445749+TheShuEd@users.noreply.github.com >
Co-authored-by: KittenColony <149278380+KittenColony@users.noreply.github.com >
Co-authored-by: ShadowCommander <shadowjjt@gmail.com >
Co-authored-by: Mr. 27 <45323883+Dutch-VanDerLinde@users.noreply.github.com >
Co-authored-by: T-Stalker <43253663+DogZeroX@users.noreply.github.com >
Co-authored-by: ERROR404 <100093430+ERORR404V1@users.noreply.github.com >
Co-authored-by: Errant <35878406+Errant-4@users.noreply.github.com >
Co-authored-by: Jezithyr <jezithyr@gmail.com >
Co-authored-by: Psychpsyo <60073468+Psychpsyo@users.noreply.github.com >
Co-authored-by: no <165581243+pissdemon@users.noreply.github.com >
Co-authored-by: K-Dynamic <20566341+K-Dynamic@users.noreply.github.com >
Co-authored-by: Ciac32 <aknoxlor@gmail.com >
Co-authored-by: deltanedas <39013340+deltanedas@users.noreply.github.com >
Co-authored-by: NotSoDana <75203942+NotSoDana@users.noreply.github.com >
Co-authored-by: Simon <63975668+Simyon264@users.noreply.github.com >
Co-authored-by: Repo <47093363+Titian3@users.noreply.github.com >
Co-authored-by: Tayrtahn <tayrtahn@gmail.com >
Co-authored-by: nao fujiwara <awkwarddryad@gmail.com >
Co-authored-by: Michael <107807667+Doc-Michael@users.noreply.github.com >
Co-authored-by: Vasilis <vasilis@pikachu.systems >
Co-authored-by: Lamrr <96937466+Lamrr@users.noreply.github.com >
Co-authored-by: slarticodefast <161409025+slarticodefast@users.noreply.github.com >
Co-authored-by: Jay <67732946+DuskyJay@users.noreply.github.com >
Co-authored-by: Just-a-Unity-Dev <67359748+Just-a-Unity-Dev@users.noreply.github.com >
Co-authored-by: nikthechampiongr <32041239+nikthechampiongr@users.noreply.github.com >
Co-authored-by: Flareguy <78941145+Flareguy@users.noreply.github.com >
Co-authored-by: Tyzemol <85772526+Tyzemol@users.noreply.github.com >
Co-authored-by: Alzore <140123969+Blackern5000@users.noreply.github.com >
Co-authored-by: Pok <113675512+Pok27@users.noreply.github.com >
Co-authored-by: RumiTiger <154005209+RumiTiger@users.noreply.github.com >
Co-authored-by: Verm <32827189+Vermidia@users.noreply.github.com >
Co-authored-by: Pieter-Jan Briers <pieterjan.briers+git@gmail.com >
Co-authored-by: Killerqu00 <47712032+Killerqu00@users.noreply.github.com >
Co-authored-by: Ty Ashley <42426760+TyAshley@users.noreply.github.com >
Co-authored-by: exincore <me@exin.xyz >
Co-authored-by: 0x6273 <0x40@keemail.me >
Co-authored-by: Kara <lunarautomaton6@gmail.com >
Co-authored-by: Ygg01 <y.laughing.man.y@gmail.com >
Co-authored-by: Łukasz Mędrek <lukasz@lukaszm.xyz >
Co-authored-by: Hannah Giovanna Dawson <karakkaraz@gmail.com >
Co-authored-by: TurboTracker <130304754+TurboTrackerss14@users.noreply.github.com >
Co-authored-by: OnsenCapy <101037138+LGRuthes@users.noreply.github.com >
Co-authored-by: pigeonpeas <147350443+pigeonpeas@users.noreply.github.com >
Co-authored-by: Cojoke <83733158+Cojoke-dot@users.noreply.github.com >
Co-authored-by: Tornado Tech <54727692+Tornado-Technology@users.noreply.github.com >
Co-authored-by: Rio <110139251+Riolume@users.noreply.github.com >
Co-authored-by: vorkathbruh <152932728+vorkathbruh@users.noreply.github.com >
Co-authored-by: Sphiral <145869023+SphiraI@users.noreply.github.com >
Co-authored-by: PrPleGoo <PrPleGoo@users.noreply.github.com >
Co-authored-by: Moomoobeef <62638182+Moomoobeef@users.noreply.github.com >
Co-authored-by: username <113782077+whateverusername0@users.noreply.github.com >
Co-authored-by: Boaz1111 <149967078+Boaz1111@users.noreply.github.com >
Co-authored-by: Джексон Миссиссиппи <tripwiregamer@gmail.com >
Co-authored-by: Brandon Li <48413902+aspiringLich@users.noreply.github.com >
Co-authored-by: Jajsha <101492056+Zap527@users.noreply.github.com >
Co-authored-by: RiceMar1244 <138547931+RiceMar1244@users.noreply.github.com >
Co-authored-by: IProduceWidgets <107586145+IProduceWidgets@users.noreply.github.com >
Co-authored-by: youtissoum <51883137+youtissoum@users.noreply.github.com >
Co-authored-by: ike709 <ike709@users.noreply.github.com >
Co-authored-by: icekot8 <93311212+icekot8@users.noreply.github.com >
Co-authored-by: keronshb <54602815+keronshb@users.noreply.github.com >
Co-authored-by: VMSolidus <evilexecutive@gmail.com >
Co-authored-by: Geekyhobo <66805063+Geekyhobo@users.noreply.github.com >
Co-authored-by: FoxxoTrystan <45297731+FoxxoTrystan@users.noreply.github.com >
# Conflicts:
# Content.Client/Input/ContentContexts.cs
# Content.Client/Lobby/LobbyState.cs
# Content.Client/Lobby/UI/HumanoidProfileEditor.xaml
# Content.Client/Lobby/UI/LobbyGui.xaml
# Content.Client/Lobby/UI/LobbyGui.xaml.cs
# Content.Client/Preferences/UI/CharacterSetupGui.xaml.cs
# Content.Client/UserInterface/Systems/MenuBar/Widgets/GameTopMenuBar.xaml
# Content.Server/Disposal/Unit/EntitySystems/DisposalUnitSystem.cs
# Content.Server/Fluids/EntitySystems/PuddleSystem.Spillable.cs
# Content.Server/GameTicking/GameTicker.Spawning.cs
# Content.Shared/Alert/AlertType.cs
# Content.Shared/Input/ContentKeyFunctions.cs
# Content.Shared/Preferences/HumanoidCharacterProfile.cs
# Content.Shared/Weapons/Melee/MeleeWeaponComponent.cs
# Resources/ConfigPresets/EinsteinEngines/default.toml
# Resources/Prototypes/Alerts/alerts.yml
# Resources/Prototypes/Entities/Clothing/OuterClothing/coats.yml
# Resources/Prototypes/Entities/Clothing/OuterClothing/hardsuits.yml
# Resources/Prototypes/Entities/Clothing/Uniforms/jumpskirts.yml
# Resources/Prototypes/Entities/Objects/Weapons/Melee/e_sword.yml
# Resources/Prototypes/Entities/Objects/Weapons/Melee/sword.yml
# Resources/Prototypes/Recipes/Crafting/Graphs/improvised/makeshiftstunprod.yml
# Resources/Prototypes/Voice/speech_emotes.yml
# Resources/keybinds.yml
2024-10-19 14:53:37 +07:00
SleepyScarecrow
04d01f687f
Added Penlights ( #567 )
...
# Description
Added in penlights that spawn in Medical Staff PDAs.
---
# TODO
- [x] EyeCheck system
- [x] Add in the bloody pens.
---
<details><summary><h1>Media</h1></summary>
<p>
https://github.com/user-attachments/assets/dc746aa2-782e-4d86-b9ef-9e012343fb87
</p>
</details>
---
# Changelog
🆑 Tilkku
- add: Added Pen Lights
- add: Eye Examination
---------
Signed-off-by: SleepyScarecrow <136123749+SleepyScarecrow@users.noreply.github.com >
Co-authored-by: VMSolidus <evilexecutive@gmail.com >
2024-08-06 22:51:21 +01:00
Pieter-Jan Briers
ccea85136b
Random spontaneous cleanup PR ( #25131 )
...
* Use new Subs.CVar helper
Removes manual config OnValueChanged calls, removes need to remember to manually unsubscribe.
This both reduces boilerplate and fixes many issues where subscriptions weren't removed on entity system shutdown.
* Fix a bunch of warnings
* More warning fixes
* Use new DateTime serializer to get rid of ISerializationHooks in changelog code.
* Get rid of some more ISerializationHooks for enums
* And a little more
* Apply suggestions from code review
Co-authored-by: 0x6273 <0x40@keemail.me >
---------
Co-authored-by: 0x6273 <0x40@keemail.me >
(cherry picked from commit 68ce53ae17985876d6d112b764b2144964a9f42e)
2024-02-18 23:02:29 +01:00
deathride58
52d4e2fe92
Blindness hotfix (content side) ( #23465 )
...
* fixes major blindness issues like blindness not scaling with render res
* HEY. get outta there
(cherry picked from commit 6901e930b52d4a2535fa0ffdabaae3b5510b5811)
2024-01-26 21:29:54 +01:00
deathride58
6af522df55
Blindness rework - damaged eyes are now a stylized simulation of legal blindness ( #23212 )
...
* blindness rework - damaged eyes now simulate legal blindness
* hEY THATS FOR DEMONSTRATION PURPOSES ONLY AAA
* attributions
* makes eyeclosecomponent adminbus compatible
* useshader(null)
(cherry picked from commit aa6645c8e956be6abfffb58b43e67f479c45f962)
2024-01-26 21:27:55 +01:00
Tomás Alves
cdd86a8619
Fix: Blindness radius when zooming ( #23130 )
...
* Fix Zoom while Blind
* Fix Zoom while Blind (ContentEyeComponent->EyeComponent)
(cherry picked from commit 345b0e6305c8deca327893cbe37b29576e6dcac8)
2024-01-22 19:01:05 +01:00
Nairod
da901e84cd
Welder Blindness Effect Increase ( #22304 )
2023-12-16 19:39:25 +01:00
Leon Friedrich
29584576e7
Merge ActorSystem and IPlayerManager ( #21314 )
2023-11-12 20:53:33 +01:00
Leon Friedrich
e66c0b5035
Un-revert IPlayerManager refactor ( #21244 )
2023-10-31 19:00:44 +01:00
Leon Friedrich
631fdbffd6
Fix low tickrate eye lerping ( #21001 )
2023-10-20 15:29:04 +02:00
metalgearsloth
98cf505f9f
Remove SharedEye (but content) ( #19481 )
2023-09-27 21:59:12 +02:00
metalgearsloth
1ba517ec84
Fix eye zoom lerp ( #19377 )
2023-08-25 14:41:04 +10:00
DrSmugleaf
a88e747a0b
Refactor serialization copying to use source generators ( #19412 )
2023-08-22 18:14:33 -07:00
Leon Friedrich
818f23352e
Make blurry vision darken the screen ( #15926 )
2023-04-30 11:44:01 +10:00
Leon Friedrich
84299cae63
Blindness refactor ( #15705 )
...
Co-authored-by: metalgearsloth <comedian_vs_clown@hotmail.com >
2023-04-29 15:32:14 +10:00
metalgearsloth
7e886dc95a
Follower fixes ( #15348 )
2023-04-23 20:01:15 +10:00
metalgearsloth
db8ce5ea36
Also lerp paused eyes ( #14545 )
2023-03-10 18:12:21 +11:00
Leon Friedrich
94011ca2b1
Misc changes from replay branch ( #12581 )
2022-11-15 17:34:47 +11:00
Leon Friedrich
e61c7044ff
More eye lerping changes ( #11436 )
2022-09-21 20:40:24 +10:00
metalgearsloth
3b44a44931
Fix eye lerping stuttering ( #11428 )
2022-09-21 10:12:44 +10:00
Leon Friedrich
2cf79bde8f
Fix overlay bugs ( #11406 )
2022-09-19 16:49:02 -07:00
metalgearsloth
06c9afeaa1
Eye lerping tweaks ( #11162 )
2022-09-11 07:51:41 +10:00
metalgearsloth
e81a467f87
Fix camera eye rotations ( #11034 )
2022-09-05 16:19:14 +10:00
metalgearsloth
5b42861539
Smooth docking traversal ( #10822 )
2022-08-29 15:05:53 +10:00
Nemanja
512e96eed4
new eye damage effect ( #10728 )
2022-08-20 15:17:58 -05:00
Rane
572a4f7fb3
Eye damage ( #10262 )
2022-08-13 22:59:14 -07:00
metalgearsloth
87c05f2949
Cleanup overlay shaders when done ( #10432 )
2022-08-13 10:58:53 +10:00
Rane
037feb3ad0
Fix blindfold round cleanup bug ( #9821 )
...
* Blindness public api
* fix blinding round cleanup bug
2022-07-19 17:10:08 +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
Rane
83c03b60a1
[2 lines] fix blinding ( #9690 )
...
* Adds blinding + blindfolds (#8688 )
* Adds blinding + blindfolds
* Don't break examining lol
* moment
* fix toggle lights behavior
* move checks around
* Sloth review
* Added a salvage funny
* review
* woops
* Switch circle shader
Co-authored-by: wrexbe <wrexbe@protonmail.com >
* resolve merge conflict
Co-authored-by: wrexbe <wrexbe@protonmail.com >
2022-07-14 06:58:24 -05:00
Moony
a655891a8d
Revert "Adds blinding + blindfolds ( #8688 )" ( #9689 )
...
This reverts commit 7a7ab5e8c1
2022-07-13 16:50:35 -05:00
Rane
7a7ab5e8c1
Adds blinding + blindfolds ( #8688 )
...
* Adds blinding + blindfolds
* Don't break examining lol
* moment
* fix toggle lights behavior
* move checks around
* Sloth review
* Added a salvage funny
* review
* woops
* Switch circle shader
Co-authored-by: wrexbe <wrexbe@protonmail.com >
2022-07-11 22:55:04 -07:00
Leon Friedrich
fa4c6f63f8
Nullable grid Uid ( #8798 )
2022-06-20 10:14:35 +10:00
Acruid
4f9be42f40
Remove Explicit GridId References ( #8315 )
...
Co-authored-by: metalgearsloth <comedian_vs_clown@hotmail.com >
2022-06-12 11:54:41 +10:00
Flipp Syder
55e86df25b
Eye lerping on entities ( #8151 )
...
* eye lerping on entities
* small improvements
2022-05-14 13:59:49 +10:00
mirrorcult
ec4d4688c7
Seal/abstract/virtual everything ( #6739 )
2022-02-16 18:23:23 +11:00
Vera Aguilera Puerto
525c38b794
Move Eye Lerping to content and fix/improve it a bunch. ( #5900 )
2021-12-27 18:50:00 +01:00
