Eris
d6f3265e83
MODsuits (Port From Goob #1242 ) ( #1640 )
...
# Description
Ports MODsuits from Goobstation PR
https://github.com/Goob-Station/Goob-Station/pull/1242 . The PR author
has confirmed that he is okay with me doing this.
---
# TODO
- [X] Port in sprites
- [x] Port in YMLs
- [X] Port code
- [x] Port code PATCHES
- [x] Update EE with required fixes
---
<details><summary><h1>Media</h1></summary>
<p>
## Modsuit crafting
https://github.com/user-attachments/assets/8ff03d3a-0fc1-4818-b710-bfc43f0e2a68
## Modsuit sealing
https://github.com/user-attachments/assets/6671459a-7767-499b-8678-062fc1db7134
</p>
</details>
---
# Changelog
🆑
- add: Modsuits have been ported from Goobstation!
---------
Signed-off-by: Eris <erisfiregamer1@gmail.com >
Co-authored-by: DEATHB4DEFEAT <77995199+DEATHB4DEFEAT@users.noreply.github.com >
Co-authored-by: VMSolidus <evilexecutive@gmail.com >
(cherry picked from commit cb06c41fc07275e1f15af916babb44368c0c26c2)
2025-01-29 20:09:26 +03:00
DocNITE
05c30059d3
Better Progress Bar ( #1648 )
...
# Description
DoAfter progress bar like in ss13 forks.
---
---
# Changelog
Fuck it, no need this, im not a contributor.
---------
Signed-off-by: sleepyyapril <123355664+sleepyyapril@users.noreply.github.com >
Co-authored-by: sleepyyapril <123355664+sleepyyapril@users.noreply.github.com >
(cherry picked from commit 1ef0bd0f47aadfb3b0ea8f48c8c693c3f9118ad4)
2025-01-25 14:46:18 +03:00
Spatison
a2557f75a6
Upstream ( #129 )
2024-11-21 17:49:04 +07: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
SimpleStation14
e4b8f701e3
Mirror: Add a toggle for colorblind friendly progress bar colors ( #130 )
...
## Mirror of PR #25318 : [Add a toggle for colorblind friendly progress
bar
colors](https://github.com/space-wizards/space-station-14/pull/25318 )
from <img src="https://avatars.githubusercontent.com/u/10567778?v=4 "
alt="space-wizards" width="22"/>
[space-wizards](https://github.com/space-wizards )/[space-station-14](https://github.com/space-wizards/space-station-14 )
###### `f3f4616c49317898aeeff304160b0b50df9ee851`
PR opened by <img
src="https://avatars.githubusercontent.com/u/98561806?v=4 "
width="16"/><a href="https://github.com/EmoGarbage404 ">
EmoGarbage404</a> at 2024-02-16 17:40:39 UTC
PR merged by <img
src="https://avatars.githubusercontent.com/u/19864447?v=4 "
width="16"/><a href="https://github.com/web-flow "> web-flow</a> at
2024-03-09 11:43:20 UTC
---
PR changed 8 files with 169 additions and 84 deletions.
The PR had the following labels:
- Changes: UI
- Status: Needs Review
---
<details open="true"><summary><h1>Original Body</h1></summary>
> <!-- Please read these guidelines before opening your PR:
https://docs.spacestation14.io/en/getting-started/pr-guideline -->
> <!-- The text between the arrows are comments - they will not be
visible on your PR. -->
>
> ## About the PR
> <!-- What did you change in this PR? -->
> Adds a toggle in the accessibility menu that lets 'progress bars'
(doafters, medhud) toggle between a standard rainbow palette and the
colorblind-friendly Viridis palette.
>
> also makes the medhud bar unshaded to match the icon and to improve
readability.
>
> ## Why / Balance
> <!-- Why was it changed? Link any discussions or issues here. Please
discuss how this would affect game balance. -->
> Medical huds used a (frankly) bastardized version of Viridis without
proper smoothing. Doafters used the standard rainbow palette but with
actual smoothing. I personally don't really like the medhud colors, but
i figured if i wanted to get rid of them it was best to unify and make
it an option broadly so that people who needed it could get more use out
of it.
>
> ## Technical details
> <!-- If this is a code change, summarize at high level how your new
code works. This makes it easier to review. -->
> Makes a new static method in ProgressColorSystem that handles the
CVAR. also adds a new checkbox to MiscTab.xaml
>
> ## Media
> <!--
> PRs which make ingame changes (adding clothing, items, new features,
etc) are required to have media attached that showcase the changes.
> Small fixes/refactors are exempt.
> Any media may be used in SS14 progress reports, with clear credit
given.
>
> If you're unsure whether your PR will require media, ask a maintainer.
>
> Check the box below to confirm that you have in fact seen this (put an
X in the brackets, like [X]):
> -->
>
>
https://github.com/space-wizards/space-station-14/assets/98561806/743c2c31-6504-4693-ab6b-7f54e0d65e06
>
> - [x] I have added screenshots/videos to this PR showcasing its
changes ingame, **or** this PR does not require an ingame showcase
>
> **Changelog**
> <!--
> Make players aware of new features and changes that could affect how
they play the game by adding a Changelog entry. Please read the
Changelog guidelines located at:
https://docs.spacestation14.io/en/getting-started/pr-guideline#changelog
> -->
>
> 🆑
> - add: Added a new "colorblind friendly" toggle in the accessibility
menu. This allows you to toggle between a standard and
colorblind-friendly palette for things like progress bars and the
medical HUD.
> - tweak: The medical HUD is now bright, even in low light levels.
>
</details>
Co-authored-by: Nemanja <98561806+EmoGarbage404@users.noreply.github.com >
2024-05-08 23:47:48 -04:00
TemporalOroboros
35b45cb955
Makes thieving gloves sneakier ( #21398 )
...
* Hidden DoAfters
* Fix formatting warnings
* Hide progress bar and pickup animation
* Copy Hidden field in copy constructor
2023-11-12 20:31:38 +01:00
metalgearsloth
21fdea5e5a
Remove lights compref ( #19531 )
2023-09-27 21:59:12 +02:00
metalgearsloth
68480af109
Update content vectors to numerics ( #17759 )
2023-07-08 14:08:32 +10: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
metalgearsloth
d9a26c76e0
Fix texture crimes ( #12900 )
2022-12-06 14:35:44 +11:00
metalgearsloth
f51248ecaa
Melee refactor ( #10897 )
...
Co-authored-by: metalgearsloth <metalgearsloth@gmail.com >
2022-09-29 15:51:59 +10:00
metalgearsloth
0dcac22e42
Don't scale do_afters ( #10553 )
2022-08-13 23:01:23 +10:00
metalgearsloth
71ffca2257
Move do_afters to an overlay ( #10463 )
2022-08-13 14:32:23 +10:00
