Commit Graph

4870 Commits

Author SHA1 Message Date
AeraAulin bcc15f4093
Merge branch 'DeltaV-Station:master' into anomaliteportstuff 2025-10-02 16:39:09 -07:00
William Lemon 3b2eedb802
Merge pull request #4275 from kotobdev/avali-ops
Species - Avali
2025-10-03 08:12:19 +10:00
SirSmith148 96e62b681e Merge branch 'master' into Xenoarch-Merge 2025-10-01 01:08:14 -07:00
kotobdev 8150aba854 WE LOVE SHITMED!!!! 2025-09-27 15:37:40 -07:00
William Lemon 01fe85f77e
Fix Flares, Give Skia Spacewalk (#4417)
* Fix various light sources counting as Light, Give Skia spacewalk

* [pre-commit.ci] auto fixes from pre-commit.com hooks

for more information, see https://pre-commit.ci

* Replace the Ignore Gravity with Jetpack

* Clean up event code + Avoid touching upstream code where possible

* [pre-commit.ci] auto fixes from pre-commit.com hooks

for more information, see https://pre-commit.ci

* Double cone, strategic untouches

* Additional strategic untouch

---------

Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>
2025-09-26 10:03:43 +00:00
Charlie Morley 061b844c99
fix lobby customize save button not appearing on hair/eye changes (#4360) 2025-09-24 12:17:11 +02:00
Charlie Morley 1462f5bd1f
id card computer now sets access when selecting a job preset (#4441) 2025-09-21 21:49:45 +01:00
Charlie Morley 80ad173d2d
(early upstream merge) Fix broken psionics, ai abilities, other powers (#4423)
early merge of upstream "fix: fix non-access checking EntityTargetActions #38731"
2025-09-19 06:00:27 +00:00
kotobdev c638b3df29 mfw didn't read the diff 2025-09-16 15:47:39 -07:00
kotobdev e9bfb32b81 little bit of cleanup 2025-09-14 23:18:37 -07:00
kotobdev e55c66d774 im GOATED! im GOATED! im GOATED 2025-09-14 22:30:38 -07:00
kotobdev 6a409bf61b Revert "i owe elperson 15 dollars"
This reverts commit d8626fd199.
2025-09-14 21:19:08 -07:00
kotobdev d8626fd199 i owe elperson 15 dollars 2025-09-14 21:17:45 -07:00
kotobdev 679fc85f0e danger commit before i touch the upstream code 2025-09-13 19:02:49 -07:00
kotobdev 4e8d8bb52d im actually going insane 2025-09-12 21:40:07 -07:00
kotobdev 0b26d11779 almost 50% functional 2025-09-12 19:33:28 -07:00
AeraAulin 14d0c0a351 hopefully this all goes through well 2025-09-11 08:45:11 -07:00
William Lemon bc8f5a7a20
Even More Skia Tweaks (#4355)
* More Skia tweaks

* Swapped whitelist for EntityWhitelist

* [pre-commit.ci] auto fixes from pre-commit.com hooks

for more information, see https://pre-commit.ci

---------

Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>
2025-09-11 06:02:48 +00:00
EmberAstra ec05ede30c
Fix Book of Mysteries casting (#4367)
* Add recharge component to Force Wall

* Make "time til recharge" string easier to read

* Fix Force Wall name

* Fix Force Wall name

* Update Resources/Prototypes/Magic/forcewall_spells.yml

Co-authored-by: Quanteey <61941975+Quanteey@users.noreply.github.com>
Signed-off-by: EmberAstra <leonardo.cecchini.1997@gmail.com>

* Update Resources/Prototypes/Magic/forcewall_spells.yml

Co-authored-by: Quanteey <61941975+Quanteey@users.noreply.github.com>
Signed-off-by: EmberAstra <leonardo.cecchini.1997@gmail.com>

* Update Resources/Prototypes/Magic/forcewall_spells.yml

Co-authored-by: Quanteey <61941975+Quanteey@users.noreply.github.com>
Signed-off-by: EmberAstra <leonardo.cecchini.1997@gmail.com>

* Update Content.Client/UserInterface/Systems/Actions/Controls/ActionButton.cs

Co-authored-by: Quanteey <61941975+Quanteey@users.noreply.github.com>
Signed-off-by: EmberAstra <leonardo.cecchini.1997@gmail.com>

---------

Signed-off-by: EmberAstra <leonardo.cecchini.1997@gmail.com>
Co-authored-by: Quanteey <61941975+Quanteey@users.noreply.github.com>
2025-09-10 22:00:27 +00:00
Sir Warock 51a3862c6b
Remove Alive Icon (#1252) (#4317)
* Remove Alive Icon (#1252)

<!-- Guidelines:
https://docs.spacestation14.io/en/getting-started/pr-guideline -->
<!-- NOTE: All code submitted to this repository is ALWAYS licensed
under the AGPL-3.0-or-later license.
The REUSE Specification headers or separate .license files indicate a
secondary license (e.g., MPL or MIT) solely to facilitate
integration for projects that do not use the AGPL license. This
secondary license does not replace the fact that AGPL-3.0-or-later
remains the primary and binding license.
Uncomment and modify the following line if you wish to change the
license from the default of AGPL.-->
<!--- LICENSE: AGPL -->
<!-- What did you change? -->
I removed the alive Icon from the Medical HUD.
<!-- Discuss how this would affect game balance or explain why it was
changed. Link any relevant discussions or issues. -->
It blocked vision on speech bubbles and is entirely unnecessary.
Is the entity moving? Probably alive.
Does it not have a dead or critical icon? Probably alive.
We don't need an Icon that blocks the speech bubble to tell us this.
<!-- Summary of code changes for easier review. -->
Added a boolean to not give the icon if an entity is alvie.
Removed the Mob.Alive state from the icon finder table thing.
<!-- Attach media if the PR makes ingame changes (clothing, items,
features, etc).
Small fixes/refactors are exempt. Media may be used in SS14 progress
reports with credit. -->
<img width="89" height="95" alt="grafik"
src="https://github.com/user-attachments/assets/ef9308be-276b-440b-95d4-fddcaece32b9"
/>

<!-- Confirm the following by placing an X in the brackets [X]: -->
- [X] I have read and am following the [Pull Request and Changelog
Guidelines](https://docs.spacestation14.com/en/general-development/codebase-info/pull-request-guidelines.html).
- [X] I have added media to this PR or it does not require an ingame
showcase.
- [X] I can confirm this PR contains no AI-generated content, and did
not use any AI-generated content.
<!-- You should understand that not following the above may get your PR
closed at maintainer’s discretion -->

<!-- List any breaking changes, including namespaces, public
class/method/field changes, prototype renames; and provide instructions
for fixing them.
This will be posted in #codebase-changes. -->

**Changelog**
<!-- Add a Changelog entry to make players aware of new features or
changes that could affect gameplay.
Make sure to read the guidelines and take this Changelog template out of
the comment block in order for it to show up.
Changelog must have a 🆑 symbol, so the bot recognizes the changes and
adds them to the game's changelog. -->

🆑
- remove: Removed the alive Icon - You can finally see if someone is
typing an answer.

---------

Co-authored-by: TheDen-Bot <186991657+TheDen-Bot@users.noreply.github.com>

* Fixes

* Actually correct Comment

---------

Co-authored-by: TheDen-Bot <186991657+TheDen-Bot@users.noreply.github.com>
2025-09-08 21:48:34 +02:00
KOTOB f8ba7fb64f
glimmer shader bugfix 2 electric boogaloo (#4348)
:3
2025-09-08 05:49:22 +00:00
William Lemon 75a995a730
Skia Tweaks + Removes Nightvision form Lathes (#4308)
* Adds Direction Requests

* Fix

* Fixed EntryPoint, added back Sec Lathe, and added as a Salvage Points item

* Moved SpecOpsGoggles to appease gods

* Give Skia Thermal Vision

* Removed thermals from research.

* Removed thermal vision, added comment
2025-09-07 08:11:07 +00:00
William Lemon 01088086dc
Adds Skia (σκιά, shade) as a Midround Antagonist (#4152)
* AAAAAAAAadds skia

* Added to the spawn options table

* Fix EOR, Added shatter ability, Fix Reroll popup

* Fixed the death of the Skia

* [pre-commit.ci] auto fixes from pre-commit.com hooks

for more information, see https://pre-commit.ci

* Fixed taco's silly mistake

* Skia need pry-ability

* Adds Goob Nightvision

* Added some missing Protos

* Appease the Yaml gods

* Did the Delta Fixes

* [pre-commit.ci] auto fixes from pre-commit.com hooks

for more information, see https://pre-commit.ci

* Lathes fix

* Update attributions.yml

* More yaml fixes

* The Yaml Linter shall never be sated

* More fixes

* [pre-commit.ci] auto fixes from pre-commit.com hooks

for more information, see https://pre-commit.ci

* Fixed objective reroll

* Bring up to date

* aaaaaaaaaaa

* [pre-commit.ci] auto fixes from pre-commit.com hooks

for more information, see https://pre-commit.ci

* Fixed damageset, removed unneeded point light

* I'm so sorry Deltandas

* [pre-commit.ci] auto fixes from pre-commit.com hooks

for more information, see https://pre-commit.ci

---------

Signed-off-by: William Lemon <William.Lemon2@gmail.com>
Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>
2025-09-01 08:46:23 +00:00
Elperson 24cc28b532
Actually make LPO's crew monitor actually show people on the station (#4273)
* Simple fix

* maintainer requested changes
2025-08-31 18:31:38 +01:00
ConstantlyConfused 854e546e25
Update the Crime Assist PDA App to match current Space Law (#3927)
* make Grand Felonies a possible crime

* Update the crime assist to match current space law

* re-organize result pages, add missing details

* Re-organize the general flow, add new questions & crimes

* typo ops

* typo ops v2

* Modify the flow further, per feedback

* mrrp

* typo ops 3: revengeance

* rename decorp to POR

* phrasing part one

* theft/possession phrasing changes & minor flow fixes

* remove redundant question, more flow changes

* update OOJ question

* update to include Noöspheric Tampering
2025-08-31 01:27:38 +00:00
No Elka 4126ef130b
Add in-game date to the PDA (#4277)
* Change stuff

* Change stuff

* Comment the XAML

* Change some more stuff

* _DV bruh

* Fix format string
2025-08-29 14:41:37 +00:00
No Elka 4bf3905083
Make some swing animations nicer (#4235)
* Combo attacks when

* Remove stuff
2025-08-21 07:53:56 +00:00
No Elka 6f0c091b06
Cosmic cult bugfix bundle (#4233)
* Change stuff

* Fix more stuff

* Fix just a bit more

* Make non-cultists foxforms censerable too

* [pre-commit.ci] auto fixes from pre-commit.com hooks

for more information, see https://pre-commit.ci

---------

Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>
2025-08-20 19:43:20 +00:00
No Elka a021394ebe
Cosmic glyph rework: activation time and animations. (#4147)
* Refactoring in progress

* Refactoring completed, proceeding to animate a ton

* Don't commit that idiot

* Ballin

* Actually use the animations I made

* More sprites

* [pre-commit.ci] auto fixes from pre-commit.com hooks

for more information, see https://pre-commit.ci

* Change a lot of stuff

* [pre-commit.ci] auto fixes from pre-commit.com hooks

for more information, see https://pre-commit.ci

* Hopefuly finish changing stuff

* [pre-commit.ci] auto fixes from pre-commit.com hooks

for more information, see https://pre-commit.ci

* Prototype

* Change sprites

* Fix test fail

* Cessation sprites

* warding

* Add sounds

* Typo

* Projection

* Truth

* Knowledge

* Fix being able to convert SSD peeps

* Add interaction outline because why the hell not

* Change stuff

* Surely this won't explode

---------

Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>
2025-08-20 10:18:42 +00:00
KOTOB bfa721ea53
Make Glimmer Look Beautiful (#4130)
* about to break this all

* event goidacode

* cleanup

* cleanup 2

* cleanup 3

* cleanup 4

is it even worth bothering with these descriptions. added newline to end of a couple files

* single extra space WAUGH

* toggleable + minor cleanup

* that was reverted already what

why did merge conflict editor add in a line that isn't even present on master?? huh???

* fixops

GlimmerSystem looks like That to avoid extraneous network events being raised if something is attempting to push glimmer over 1000
2025-08-20 03:54:19 +00:00
KOTOB c275c9d55c
Tie xenoarch point output to glimmer (#4164)
* it work i think

* tweakops

* commentops

* newline ops

* direction + bugfix ops

exponential point increase, no more insane glimmer nukes (sad!), analyzer no longer displays negative points
2025-08-19 00:48:50 +00:00
Quanteey 064923a6be
Bugfix: loadacts no longer broken and related issues (#4227)
fix
2025-08-18 13:51:12 +00:00
Quanteey 980bc05edc Merge remote-tracking branch 'origin/master' into upstream-merge-ops 2025-08-14 15:53:14 +02:00
No Elka a7df10b20d
Censer tweaks part 2 (#4171)
* Kill asphyx damage

* UI goidacode

* Locale

* I think this is needed too???

* Code stuff

* Code stuff

* Replace fuel with mindbreaker toxin

* Move censer to lockers

* Halve censer fuel capacity

* I sure hope the branch won't fucking explode

* Remove accidental line break

* blyat

* Update desc

* Move to nested fill
2025-08-13 11:34:50 +00:00
Quanteey 30cd032037 DeltaV: Tweak lobby playtime warnings 2025-08-07 20:20:33 +02:00
Quanteey 942b83fe03
Merge branch 'master' into upstream-merge-ops 2025-08-07 20:00:49 +02:00
deathride58 5bf18aa2ff Playtime Reminders - Raising awareness of addiction by highlighting excessive playtime (#36483)
* grass touch protocol - Rebases to latest master to fix conflicts

* aight local tests are passing lets see if our golf works

* It is 5 am and our ass COMPLETELY overcomplicated this lmaooo

* Addresses feedback - Clarifies comments, swaps internal var names for grasstouchless and selfdestructive, makes the third tier a little less demanding, and fixes 1 hours

* Addresses review - conflict fix

* This too

* Axes playtime exclusion for ghosts

* Use switch expression

code style nit

* Refactor/cleanup

Use IGameTiming.RealTime to track time instead of DateTime. Use nullable instead of magic values.

Expose the current day value through a property that is always up to date, instead of making the API to read the CVar that updates at inconsistent times. This also makes it trivial to debug with VV.

Other minor cleanup like using string interp, code style fixes, comments, etc.

---------

Co-authored-by: PJB3005 <pieterjan.briers+git@gmail.com>
2025-08-07 19:33:32 +02:00
Tayrtahn 567aaa9ae7 Cleanup static `Logger` use in `ChatBox` (#38405)
Convert static logger to resolved, resolve entman
2025-08-07 19:18:51 +02:00
Kyle Tyo 965ec9269d Command resolve killing, LEC conversions, and general cleanup. (#38338)
* i'm just gonna put this here.

* I'm just gonna do it.

* Update ShowHTNCommand.cs

* I feel dumb.

* may as well with this too.

* this does in fact not work

* :/
2025-08-07 19:16:35 +02:00
little-meow-meow 43dead4774 fix: no longer accidentally rotate held items (#38331)
Signed-off-by: little-meow-meow <204685920+little-meow-meow@users.noreply.github.com>
2025-08-07 19:11:43 +02:00
kosticia 282c573c13 predicted hyposprays (#38046)
* G O I D A

* how

* now proper

* a

* Update HypospraySystem.cs

* good catch

* Apply suggestions from code review

---------

Co-authored-by: ScarKy0 <scarky0@onet.eu>
Co-authored-by: slarticodefast <161409025+slarticodefast@users.noreply.github.com>
2025-08-07 19:03:52 +02:00
qrwas 79651839b4 Add group for loadouts (#36951)
Co-authored-by: ArtisticRoomba <145879011+ArtisticRoomba@users.noreply.github.com>
2025-08-07 18:47:24 +02:00
themias b46e9f0046 Fix gas analyzer and anom scanner wrong state (#38285)
* Fix gas analyzer and anomaly scanner UI activation issue

* save

* fix comment

* milkalyzer
2025-08-07 18:09:58 +02:00
Quanteey d7182c5e6a Fix for e85eacb1d4
Sketchyyyyy
2025-08-07 17:22:09 +02:00
Simon e2739943dd Add the instrument names to the MIDI channel selector (#38083)
* Add the instrument to the MIDI channel selector

* Reviews

Adds support for chained masters
Makes the channel UI update on its own when the midi changes (Works with bands too!)

* add to admin logs and limit track count

* Limit track names by length too

* remove left over comment

* Requested changes

* Reviews
2025-08-07 12:04:09 +02:00
Quanteey 40d7ea758f Revert "Add the instrument names to the MIDI channel selector (#38083)"
This reverts commit e16c03ed29.
2025-08-07 02:55:23 +02:00
Simon e16c03ed29 Add the instrument names to the MIDI channel selector (#38083)
* Add the instrument to the MIDI channel selector

* Reviews

Adds support for chained masters
Makes the channel UI update on its own when the midi changes (Works with bands too!)

* add to admin logs and limit track count

* Limit track names by length too

* remove left over comment

* Requested changes

* Reviews
2025-08-07 02:19:03 +02:00
Tayrtahn e6c1401aca Cleanup 2 `SpriteComponent.GetPrototypeTextures` uses (#38263)
Cleanup 2 SpriteComponent.GetPrototypeTextures uses
2025-08-07 02:17:47 +02:00
Tayrtahn e881bd7e86 Replace Speech bubble time accumulator with TimeSpan (#38241)
* Replace SpeechBubble time accumulator with TimeSpan

* CurTime -> RealTime
2025-08-07 02:13:44 +02:00
qwerltaz d2f1995ca0 Fix construction menu grid view quirky button selection (#38214)
* make hover and info use construction proto name, not entity name

* recipeButtons uses IDs as keys, not names

* return making item green when selected
2025-08-07 02:13:31 +02:00