Commit Graph

245 Commits

Author SHA1 Message Date
kotobdev c638b3df29 mfw didn't read the diff 2025-09-16 15:47:39 -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
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
Minerva a7fff28602
Changes "credits" to "spesos" in the stock market (#4343) 2025-09-08 06:40:14 +02: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
No Elka cb0655798b
Minor cult fix (#4292)
Fix fun
2025-08-30 14:34:28 +00:00
No Elka d76a01b67f
Some loosely connected cosmic cult tweaks (#4284)
* Change stuff

* Cleanup

* [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-30 14:34:17 +00:00
0vrseer f41b542fd6
IPC cult cope ops (#4230)
* Added HumanoidSiliconMetaphysical which emulates BiologicalMetaphysical *while* enabling the same healing regular IPCs get.

* StoredDamageContainer no longer returns "Biological" for everything

* IPCs are now valid ardent censer targets

* 🤪

* Revert "Added HumanoidSiliconMetaphysical which emulates BiologicalMetaphysical *while* enabling the same healing regular IPCs get."

This reverts commit 9589909daae5498082a8949c07679639c5bc5150.

* Remove metaphysical conversion
2025-08-28 01:42:07 +00:00
No Elka a8a2361ccc
Minor-ish cult ability rebalance (#4260)
Change stuff
2025-08-27 17:20:41 +00:00
No Elka ab196255bb
Colossus rebalance take 2 (#4251)
* Change stuff

* ж

* Add passive healing

* Make midround colossus totally not overpowered
2025-08-25 11:47:26 +00:00
No Elka e1fa07f86f
Deal ion damage to silicons on EMP instead of draining their power cells (#4255)
* Change stuff

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

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

* My changes so requested

* Why was that even here

* I can't really build so github will do it for me

---------

Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>
2025-08-23 08:39:03 +00:00
No Elka e5a415dbb1
Add software corruption damage type (#4245)
* Add the damage type

* Add the damage where applicable

# Conflicts:
#	Resources/Prototypes/_DV/CosmicCult/glyphs.yml

* Blyat

* *mild russian dissatisfaction*

* It finally works as intended

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

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

* Rename to ion damage

* Add to disabler bolts for some reason

* Woops

---------

Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>
2025-08-22 10:38:51 +00:00
No Elka 246ac5e61c
Make malign rifts actually (kinda) dangerous (#4216)
* Our cult so cosmic

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

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

* Add more gambling

* Change stuff

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

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

* Use EntityQuerry (what is that even for)

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

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

* Not how it works apparently

---------

Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>
2025-08-22 07:43:25 +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
No Elka 274ada2996
Minor cult audio tweaks (#4213)
* Replace colossus briefing sound

* Voice override for cult armor

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

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

* Why do I keep forgetting those

---------

Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>
2025-08-20 09:28:12 +00:00
No Elka 7cd8fffc17
Make siphon entropy work on crit people... with a twist (#4178)
* Change stuff

* Fixes

* Replace bibleUsers with command staff

* Change stuff

* Блять

* Блять 2

* Kill

* Today I learned how ternary operators work. Yay.
2025-08-18 12:57:15 +00:00
No Elka 1d4a60eaf0
Tweak cosmic cult win conditions (#4156)
* Change stuff

Change more stuff

Change locale.

Don't count cultists that are cuffed

Bruh

Change more stuff

Fuck around

* Blyat

* [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-16 12:24:12 +00:00
No Elka 9e12719c61
Cosmic cult entropy balance tweaks (#4099)
* Decrease entropy value

* Adjust siphoning

* Change entropyDegen

* Un-nerf cosmic equipment debuff

* Unindent by 2 spaces ops
2025-08-15 09:24:29 +03:00
No Elka bac514fc94
Multispectral inhibitor, new cosmic cult structure (#4181)
* JammerSystem additions

* Temporary sprite

* Prototypes

* Locale and guidebook changes

* Revert "JammerSystem additions"

This reverts commit b4019131b2.

* All my homies hate RadioJammerComponent

* Lower the range a tad

* Add actual sprite

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

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

* Fix stuff

* Kill SpriteFade while I'm at it

* Increase range

---------

Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>
2025-08-14 23:51:17 +00:00
Quanteey 1a2b429dac Action refactor things 2025-08-14 15:59:35 +02:00
Quanteey 980bc05edc Merge remote-tracking branch 'origin/master' into upstream-merge-ops 2025-08-14 15:53:14 +02:00
No Elka 737558289b
Make cult less obvious on earlier stages (#4179)
* Random rift spawn

* Change announcements

* Tweak timers

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

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

* Do in fact use ProtoId

* Revert "Do in fact use ProtoId"

This reverts commit cdc0972cac.

* Actually add the event into the pool

* Remove ancient code

---------

Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>
2025-08-14 09:57:13 +00: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
No Elka 8e45b2fa75
Allow cultists to absorb another rift after expending their empowerment (#4166)
* Kill

* Remove action on use
2025-08-13 11:28:27 +00:00
Quanteey c64d0563dc
Merge branch 'master' into upstream-merge-ops
Signed-off-by: Quanteey <61941975+Quanteey@users.noreply.github.com>
2025-08-10 18:59:17 +02:00
No Elka 90974a99b2
Remove do-after on null fragmentation (#4102)
* Change stuff

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

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

* Fix

* How did that even get here

---------

Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>
2025-08-09 14:30:19 +01:00
Quanteey b57229dbfa Fix NoCargoOrderArbitrage and a possible future crash 2025-08-08 12:12:16 +02:00
Quanteey 942b83fe03
Merge branch 'master' into upstream-merge-ops 2025-08-07 20:00:49 +02:00
Quanteey 6e03871555 Migrate _DV GhostRoleSystem.Character.cs to use new outfitsystem 2025-08-07 19:39:40 +02:00
Quanteey 100fe319a9 import unfuck redux 2025-08-07 01:51:49 +02:00
Quanteey eb11a3a9dd Access reader downstream unfucking 2025-08-07 00:52:12 +02:00
Quanteey cef0fe7484 Fixes and migrating downstream yamls to use action system 2025-08-06 20:10:06 +02:00
Quanteey 4a48ba508d Fixes 2025-08-05 15:58:38 +02:00
No Elka fec953f2d9
Fixed coscult finale warning appearing too early (#4134)
* Fix it the stupid way

* Oh shoot I forgot to commit that
2025-08-05 12:22:39 +00:00
Quanteey 45e76947cc fixes 2025-08-04 19:07:04 +02:00
No Elka 5b950420df
Transmutation glyph refactor, make astral razor obtainable (#4114)
* I have no idea what I'm doing

* I have some idea what I'm doing

* This did not take long at all (lie)

* Fill the prototypes

* YOUR CODING TOO WRONG

* Fuck around with the astral razor while i'm at it

* Changes requestedn't

* Well that was weird

* Confused stonks

* I need to get some sleep

* Well, it was "", not null

* Mfw a weak of contributing > 3 years of university
2025-08-01 23:14:07 +01:00
KOTOB 41270182c8
Glimmer event - random animation (#4105)
* goidacode probably

* guh

* tweakops

* tweakops 2

* tweakops 3

* tweakops 4

* ?
2025-08-01 13:58:06 +01:00
No Elka 791304d98f
Fix cosmic subtle mark not being removed properly (#4104)
GOIDA
2025-07-31 17:26:44 +01:00
No Elka 7999b6aa9e
More subtle mark fixes (#4110)
* Remove subtle mark on finale

* Apply star mark at finale instead of stage 3

* No

* б
2025-07-31 12:40:30 +01:00
William Lemon 31718cfbd1
Psionic Eruption (#4078)
* Psionic Eruption

* Art Pass

* Detangles spaghetti

Removed from Nyano namespaces, moved entirely into _DV namespaces and folders where possible.

* Remove nuke behavior (Maybe next time 😢 )

* Various maintainer requested patches

* More cleanup

* I'm blind

---------

Signed-off-by: William Lemon <William.Lemon2@gmail.com>
2025-07-31 12:39:48 +01:00
KOTOB 45f3987994
Glimmer event - psionic nosebleed (#4093)
* did the thing

* 350 is cooler

* changeops
2025-07-30 19:49:07 +01:00
No Elka 4abb6ad59a
Fix vacuous chantry name (#4101)
Fix
2025-07-30 15:28:05 +01:00
No Elka 4d4df32a9d
Make cosmic cult progression smoother take 2 (#4070)
* Adjust thresholds

* Kill pre-finale timer

* Remove false information from stage 3 briefing

* Give astral brand at finale instead of stage 3

* Don't stop spawning rifts

* oly shit the CosmicSubtleMark compiled

* Complete face coverage hides the subtle mark too

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

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

* Very dumb fix because deltanerdas didn't elaborate

* Revert "Very dumb fix because deltanerdas didn't elaborate"

This reverts commit 7732cee647.

* An actually good fix because deltanedas elaborated

---------

Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>
2025-07-28 12:41:01 +01:00
William Lemon 113b92fa2a
Modifies Probers to be more dynamic (#4082)
* Modifies Probers to be more dynamic

 - No-longer auto-locks at 500 Glimmer
 - Dynamically increases both research generation and glimmer generation based on glimmer tier.
 - Adds random event which locks probers like previous behavior, still making them a risk.

* Updates per request

* Sort includes
2025-07-27 19:42:25 +01:00
No Elka b84fd39e95
Improve comic cult evac behavior (#4083)
* Achoo!

* Bless you

* Unfuck comments

* [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-07-25 23:36:29 +01:00
YeenJunk 5af946cfce
Re-add cosmicRadio after IPC pops lock (#4075)
* Re add cosmicRadio after IPC pops lock

* HowIMissOOP

* DeltaReview
2025-07-24 19:17:07 +00:00
deltanedas 9a7d0aaece
actually implement temperature immunity (#4054)
* actually implement temperature immunity

* prevent slowdown and fix evil too

---------

Co-authored-by: deltanedas <@deltanedas:kde.org>
2025-07-21 20:35:27 +01:00
No Elka 6520e17b36
Make Null Glare an actually useful influence (#4048)
* Change stuff

* Nerf duration

* Make the code 0.9% more readable
2025-07-12 15:58:22 +01:00
No Elka 5d47e6915e
Preserve object rotation on cosmic corruption (#4033)
* Holy shit it compiled

* Okay that didn't go well

* Make lights corruptible

* Fix(?) lamp rotation

* Revert "Fix(?) lamp rotation"

This reverts commit c97e8aba39.

* Revert "Make lights corruptible"

This reverts commit acadff11c7.

* Fix test fail

* Fix test fail

Signed-off-by: No Elka <125199100+NoElkaTheGod@users.noreply.github.com>

* Change stuff

* Fix me being stupid

---------

Signed-off-by: No Elka <125199100+NoElkaTheGod@users.noreply.github.com>
2025-07-03 16:53:10 +01:00
0vrseer beeedb3abe
AI no longer destroys small light bulbs when using Light Synthesizer. (#4032)
* Added LightBulb prototype and added logic for it in StationAiShop.

* oops

---------

Co-authored-by: Jadennl <Jnleonard@hotmail.com>
2025-07-03 15:08:41 +01:00
YeenJunk d450f787aa
Cultists (tiles) cant kill artists (work) (#4027)
* Reapply decals on tile after cult conversion

* Z-levels added to crayons

* Reapplies Z-level decals after tile replacement

* Gather further, probably a bad change

* Rearrange imports, readd unintended removal, comments

* More using and comment mess

* Remove decal changes, use SetTile for conversion

* Fix spacing and remove unsed deps and directives

* more directive removal

* Space
2025-07-03 03:39:37 +00:00
Smugman d5f2d3404d
Recruiter uplink (#3232)
* redid everything. again.

* MORE SYNDIE TRASH

* more junk!!!

* togglefun

* treatcoins

* fix

* fixed typos

* rough MVP of hiring reward

* redid job tracking, probably half finished

* attempts to implement payment, probably need to redo

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

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

* Reverted to an older version that worked.

* typo

* fixed sprite issue, actually gave them their briefcase.

* fixed box issue

* fixed old emag mention

* removed old file

* added localisation for treatcoin stacks

* camelcase issue fixed

* Requested changes

* EntityUID for now.

* that doesnt work.

* actually spawns the currency now.

* icon is NOT automatic i think?

* started migration to directory

* split into directories

* migrated into seperate files

* removed kits category

* obsolete mention of kit

* simplified names

* removed fieldname

* gave recruiter a figurine

* requested changes

* Update Content.Shared/_DV/Recruiter/RecruiterPenComponent.cs

Co-authored-by: Tobias Berger <toby@tobot.dev>
Signed-off-by: Smugman <85798843+Smugman@users.noreply.github.com>

* Apply suggestions from code review

Co-authored-by: Tobias Berger <toby@tobot.dev>
Signed-off-by: Smugman <85798843+Smugman@users.noreply.github.com>

* Update Resources/Prototypes/_DV/Entities/Objects/Misc/paper.yml

Co-authored-by: Tobias Berger <toby@tobot.dev>
Signed-off-by: Smugman <85798843+Smugman@users.noreply.github.com>

* Apply suggestions from code review

Co-authored-by: Tobias Berger <toby@tobot.dev>
Signed-off-by: Smugman <85798843+Smugman@users.noreply.github.com>

* Update recruiter.yml

Signed-off-by: Smugman <85798843+Smugman@users.noreply.github.com>

* Update recruiter.yml

Signed-off-by: Smugman <85798843+Smugman@users.noreply.github.com>

* Update currency.yml

Signed-off-by: Smugman <85798843+Smugman@users.noreply.github.com>

* Update recruiter.yml

Signed-off-by: Smugman <85798843+Smugman@users.noreply.github.com>

* Update treatcoins.yml

Signed-off-by: Smugman <85798843+Smugman@users.noreply.github.com>

* Update meta.json

Signed-off-by: Smugman <85798843+Smugman@users.noreply.github.com>

* Update meta.json

Signed-off-by: Smugman <85798843+Smugman@users.noreply.github.com>

* Update meta.json

Signed-off-by: Smugman <85798843+Smugman@users.noreply.github.com>

* untouch

* drink cans shortened

* inheritance

---------

Signed-off-by: Smugman <85798843+Smugman@users.noreply.github.com>
Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>
Co-authored-by: Tobias Berger <toby@tobot.dev>
2025-06-29 03:39:07 +01:00
AftrLite b5b96335b0
Cosmic Cult | Finale emergency hotfix (#3948)
* emergency hotfix moment

* .
2025-06-14 07:03:00 +02:00
Field Command 1ec61d6df6
Midpoint: New EOR destination station (#3894)
* Midpoint

* Midpoint code

* Map polish

* Nav enabled

* Renamed traitor "escape to CC" objective

* meow

* Midpoint Extensions

* Extra beacons

* Latest Fixes

* Revert CC time being only 30 seconds

* Last fix

---------

Co-authored-by: Janet Blackquill <uhhadd@gmail.com>
2025-06-13 13:14:58 -05:00
AftrLite 409cd39883
Cosmic Cult | Patch 1.1.0 (#3905)
* initial commit

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

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

* my whitespace so trailing

* Merge branch 'coscult-tweakandfix' of https://github.com/AftrLite/Delta-v into coscult-tweakandfix

* tweaks

* 2nd content commit

* linter oopsie

* my yml so linter

* ubuntu build test fail my beloathed

* weighting tune

* requested changes + audio changes for licensing

* using begone

* tweak

* begone spawnmenu entry

* yml fix, nyano code tweak, effigy tweak

* review commit

* testfail nonsense begone

* requested changes from a review that doesn't even exist yet

* emote change
2025-06-13 11:51:31 +02:00
SolStar ba27370eef
Fix admins reciving chelps when deadmined (#3938)
* catch null case

* ensure safe execution order
2025-06-11 20:15:15 +00:00
SolStar 429616aea3
Curator Help 2 Electric Boogaloo (#3870)
* Revert #3094

* add button

* Copy over AHelpUIController.cs

* replace ahelp with chelp

* change sound

* updated icon

* check for chelp flag

* switched the files oops

* cwoink

* remove buttons

* Seperate Cwoink System

* loc

* Purple

* fix up cwoink

* check for curatorhelp flag

* Button cleanup

* new cvars yay

* add VV

* description and resizing

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

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

* description update

* fish changes pt 1

* fish guy part 2

* fix fail

* cache so cool

* attributions

* Cwoink verb

* spelling

* file rename

* Update Content.Shared/_DV/CCVars/DCCVars.CHelp.cs

Co-authored-by: Tobias Berger <toby@tobot.dev>
Signed-off-by: SolStar <44028047+SolStar2@users.noreply.github.com>

* Update Content.Client/UserInterface/Systems/MenuBar/Widgets/GameTopMenuBar.xaml

Co-authored-by: Tobias Berger <toby@tobot.dev>
Signed-off-by: SolStar <44028047+SolStar2@users.noreply.github.com>

* Update Content.Client/_DV/Commands/OpenCHelpCommand.cs

Co-authored-by: Tobias Berger <toby@tobot.dev>
Signed-off-by: SolStar <44028047+SolStar2@users.noreply.github.com>

* Update Content.Client/_DV/Curation/Systems/CwoinkSystem.cs

Co-authored-by: Tobias Berger <toby@tobot.dev>
Signed-off-by: SolStar <44028047+SolStar2@users.noreply.github.com>

* Update Content.Client/_DV/Curation/Systems/CwoinkSystem.cs

Co-authored-by: Tobias Berger <toby@tobot.dev>
Signed-off-by: SolStar <44028047+SolStar2@users.noreply.github.com>

* Update Content.Client/_DV/Curation/Systems/CwoinkSystem.cs

Co-authored-by: Tobias Berger <toby@tobot.dev>
Signed-off-by: SolStar <44028047+SolStar2@users.noreply.github.com>

* toby

* Update Content.Client/_DV/Curation/Systems/CwoinkSystem.cs

Co-authored-by: Tobias Berger <toby@tobot.dev>
Signed-off-by: SolStar <44028047+SolStar2@users.noreply.github.com>

* Update Content.Client/_DV/Curation/UI/Cwoink/CwoinkControl.xaml.cs

Co-authored-by: Tobias Berger <toby@tobot.dev>
Signed-off-by: SolStar <44028047+SolStar2@users.noreply.github.com>

* Update Content.Client/_DV/Curation/UI/Cwoink/CwoinkControl.xaml.cs

Co-authored-by: Tobias Berger <toby@tobot.dev>
Signed-off-by: SolStar <44028047+SolStar2@users.noreply.github.com>

* Update Content.Client/_DV/Curation/UI/Cwoink/CwoinkControl.xaml.cs

Co-authored-by: Tobias Berger <toby@tobot.dev>
Signed-off-by: SolStar <44028047+SolStar2@users.noreply.github.com>

* Update Content.Client/_DV/Curation/UI/Cwoink/CwoinkControl.xaml.cs

Co-authored-by: Tobias Berger <toby@tobot.dev>
Signed-off-by: SolStar <44028047+SolStar2@users.noreply.github.com>

* Update Content.Client/_DV/Curation/UI/Cwoink/CwoinkControl.xaml.cs

Co-authored-by: Tobias Berger <toby@tobot.dev>
Signed-off-by: SolStar <44028047+SolStar2@users.noreply.github.com>

* Update Content.Client/_DV/Curation/UI/Cwoink/CwoinkWindow.xaml.cs

Co-authored-by: Tobias Berger <toby@tobot.dev>
Signed-off-by: SolStar <44028047+SolStar2@users.noreply.github.com>

* Update Content.Client/_DV/UserInterfaces/Systems/Cwoink/CHelpUIController.cs

Co-authored-by: Tobias Berger <toby@tobot.dev>
Signed-off-by: SolStar <44028047+SolStar2@users.noreply.github.com>

* Update Content.Client/_DV/UserInterfaces/Systems/Cwoink/CHelpUIController.cs

Co-authored-by: Tobias Berger <toby@tobot.dev>
Signed-off-by: SolStar <44028047+SolStar2@users.noreply.github.com>

* Update Content.Client/_DV/UserInterfaces/Systems/Cwoink/CHelpUIController.cs

Co-authored-by: Tobias Berger <toby@tobot.dev>
Signed-off-by: SolStar <44028047+SolStar2@users.noreply.github.com>

* Update Content.Client/_DV/UserInterfaces/Systems/Cwoink/CHelpUIController.cs

Co-authored-by: Tobias Berger <toby@tobot.dev>
Signed-off-by: SolStar <44028047+SolStar2@users.noreply.github.com>

* Update Content.Client/_DV/UserInterfaces/Systems/Cwoink/CHelpUIController.cs

Co-authored-by: Tobias Berger <toby@tobot.dev>
Signed-off-by: SolStar <44028047+SolStar2@users.noreply.github.com>

* Update Content.Client/_DV/UserInterfaces/Systems/Cwoink/CHelpUIController.cs

Co-authored-by: Tobias Berger <toby@tobot.dev>
Signed-off-by: SolStar <44028047+SolStar2@users.noreply.github.com>

* Update Content.Client/_DV/UserInterfaces/Systems/Cwoink/CHelpUIController.cs

Co-authored-by: Tobias Berger <toby@tobot.dev>
Signed-off-by: SolStar <44028047+SolStar2@users.noreply.github.com>

* Update Content.Client/_DV/UserInterfaces/Systems/Cwoink/CHelpUIController.cs

Co-authored-by: Tobias Berger <toby@tobot.dev>
Signed-off-by: SolStar <44028047+SolStar2@users.noreply.github.com>

* Update Content.Server/_DV/Curation/Systems/CwoinkSystem.cs

Co-authored-by: Tobias Berger <toby@tobot.dev>
Signed-off-by: SolStar <44028047+SolStar2@users.noreply.github.com>

* Update Content.Server/_DV/Curation/Systems/CwoinkSystem.cs

Co-authored-by: Tobias Berger <toby@tobot.dev>
Signed-off-by: SolStar <44028047+SolStar2@users.noreply.github.com>

* Update Content.Server/_DV/Curation/Systems/CwoinkSystem.cs

Co-authored-by: Tobias Berger <toby@tobot.dev>
Signed-off-by: SolStar <44028047+SolStar2@users.noreply.github.com>

* Update Content.Server/_DV/Curation/Systems/CwoinkSystem.cs

Co-authored-by: Tobias Berger <toby@tobot.dev>
Signed-off-by: SolStar <44028047+SolStar2@users.noreply.github.com>

* Update Content.Server/_DV/Curation/Systems/CwoinkSystem.cs

Co-authored-by: Tobias Berger <toby@tobot.dev>
Signed-off-by: SolStar <44028047+SolStar2@users.noreply.github.com>

* Update Content.Server/_DV/Curation/Systems/CwoinkSystem.cs

Co-authored-by: Tobias Berger <toby@tobot.dev>
Signed-off-by: SolStar <44028047+SolStar2@users.noreply.github.com>

* Update Content.Server/_DV/Curation/Systems/CwoinkSystem.cs

Co-authored-by: Tobias Berger <toby@tobot.dev>
Signed-off-by: SolStar <44028047+SolStar2@users.noreply.github.com>

* Update Content.Server/_DV/Curation/Systems/CwoinkSystem.cs

Co-authored-by: Tobias Berger <toby@tobot.dev>
Signed-off-by: SolStar <44028047+SolStar2@users.noreply.github.com>

* Update Content.Server/_DV/Curation/Systems/CwoinkSystem.cs

Co-authored-by: Tobias Berger <toby@tobot.dev>
Signed-off-by: SolStar <44028047+SolStar2@users.noreply.github.com>

* Update Content.Server/_DV/Curation/Systems/CwoinkSystem.cs

Co-authored-by: Tobias Berger <toby@tobot.dev>
Signed-off-by: SolStar <44028047+SolStar2@users.noreply.github.com>

* toby 2

* toby 3

* toby pog

* meow

* Apply suggestions from code review

Co-authored-by: Tobias Berger <toby@tobot.dev>
Signed-off-by: SolStar <44028047+SolStar2@users.noreply.github.com>

* meow

* meow 2

* sawmill

* 2

* Update Content.Client/_DV/UserInterfaces/Systems/Cwoink/CHelpUIController.cs

Co-authored-by: Tobias Berger <toby@tobot.dev>
Signed-off-by: SolStar <44028047+SolStar2@users.noreply.github.com>

* Update Content.Client/_DV/UserInterfaces/Systems/Cwoink/CHelpUIController.cs

Co-authored-by: Tobias Berger <toby@tobot.dev>
Signed-off-by: SolStar <44028047+SolStar2@users.noreply.github.com>

* forgor

* Update Content.Client/_DV/UserInterfaces/Systems/Cwoink/CHelpUIController.cs

Co-authored-by: Tobias Berger <toby@tobot.dev>
Signed-off-by: SolStar <44028047+SolStar2@users.noreply.github.com>

* Update Resources/Locale/en-US/_DV/curation/cwoink.ftl

Signed-off-by: Tobias Berger <toby@tobot.dev>

---------

Signed-off-by: SolStar <44028047+SolStar2@users.noreply.github.com>
Signed-off-by: Tobias Berger <toby@tobot.dev>
Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>
Co-authored-by: Tobias Berger <toby@tobot.dev>
2025-06-10 10:56:50 +00:00
Perry Fraser 6b94d37925
fix: bring back kill traitor objectives (#3889) 2025-06-03 00:08:09 +00:00
KOTOB b7c3da08dd
Accidental Discharges (#3869)
* why does this keep crashing

* its real

* 12.5% -> 10%

* dependencyops

* commentops

* changeops
2025-06-01 06:55:56 +00:00
AftrLite e05796f834
Cosmic Cult | Refactor Chantry/Fragmentation (#3866)
* initial commit

* refactor fragmentation & chantry to not use polymorph

* linter lmao
2025-05-30 13:35:43 +00:00
AftrLite 7879398565
Cosmic Cult | r1.01 (#3851)
initial commit
2025-05-28 05:40:23 +01:00
AftrLite c4f588bc7d
Cosmic Cult | Release Patch (#3811)
* initial commit

* whoops

* guidebook

* typo oof

* fix?

* untouch stuff (WHOOPS), refactor tile detonation, remove remaining rogue ascendant stuff, requested changes

* cosmic void namefix per request

* oh heck last minute fix

* unique deathsound

* requested changes

* this should untouch it..?

* obligatory blank line fix

* requested changes + guidebook update + gameplay communication polish
2025-05-24 17:39:57 +01:00
pathetic meowmeow a465f6d0a5
Revert traitor reputation (#3823) 2025-05-22 23:59:12 +01:00
deltanedas e58c2d814c
Merge pull request #3787 from deltanedas/upstream-ops
upstream merge 18/05/2025
2025-05-21 20:14:43 +01:00
Avalon b94cf51f0e
Revert "Return of warops" (#3807)
Revert "Return of warops (#3561)"

This reverts commit ac1604d0bc.
2025-05-21 01:14:47 -04:00
deltanedas 5c15e32e09
fix ransom buyback not working (#3810)
Co-authored-by: deltanedas <@deltanedas:kde.org>
2025-05-21 01:29:02 +01:00
deltanedas fc95eb8f29
make assist objective failing more robust (#3796)
Co-authored-by: deltanedas <@deltanedas:kde.org>
2025-05-20 14:27:23 +01:00
deltanedas 72ca3275ef
reimplement assist contract traitor picking (#3786)
* reimplement assist contract traitor picking

* goida

---------

Co-authored-by: deltanedas <@deltanedas:kde.org>
2025-05-19 07:57:03 +01:00
deltanedas 4fc95f96d8 merge master 2025-05-19 07:56:08 +01:00
deltanedas ac43c95d24 goida 2025-05-19 07:49:53 +01:00
deltanedas a75a585bfb
show reputation-locked items in the uplink + rep tweaks (#3765)
* update listings to use reputation field

* change reputation condition to a listing field, show in the UI

* a

* Update Content.Shared/_DV/Reputation/ReputationSystem.cs

Co-authored-by: Tobias Berger <toby@tobot.dev>
Signed-off-by: deltanedas <39013340+deltanedas@users.noreply.github.com>

---------

Signed-off-by: deltanedas <39013340+deltanedas@users.noreply.github.com>
Co-authored-by: deltanedas <@deltanedas:kde.org>
Co-authored-by: Tobias Berger <toby@tobot.dev>
2025-05-18 15:57:40 +01:00
deltanedas 58b3988c7d
add crit anomaly objective (#3748)
* add crit anomaly objective

* Update Resources/Prototypes/_DV/Objectives/traitor.yml

Co-authored-by: Tobias Berger <toby@tobot.dev>
Signed-off-by: deltanedas <39013340+deltanedas@users.noreply.github.com>

* Update Content.Server/_DV/Objectives/Systems/CritAnomalyConditionSystem.cs

Co-authored-by: Tobias Berger <toby@tobot.dev>
Signed-off-by: deltanedas <39013340+deltanedas@users.noreply.github.com>

* Update Content.Server/_DV/Objectives/Components/CritAnomalyConditionComponent.cs

Co-authored-by: Tobias Berger <toby@tobot.dev>
Signed-off-by: deltanedas <39013340+deltanedas@users.noreply.github.com>

* remove evil

---------

Signed-off-by: deltanedas <39013340+deltanedas@users.noreply.github.com>
Co-authored-by: deltanedas <@deltanedas:kde.org>
Co-authored-by: Tobias Berger <toby@tobot.dev>
2025-05-18 15:57:28 +01:00
Kirus59 b6bc91ea9b BatteryWeaponPowerCell tweaks (#33500)
* BatteryWeaponPowerCell tweaks

* add update ammo ev & shuttle guns tweaks

* MilonPL requested changes

* revert changes in OnPowerCellChanged

* Add events to get charge info & change current charge

---------

Co-authored-by: Nemanja <98561806+EmoGarbage404@users.noreply.github.com>
2025-05-18 15:45:17 +01:00
deltanedas d1f5b2d1ed
rewrite ai detector (#3774)
Co-authored-by: deltanedas <@deltanedas:kde.org>
2025-05-16 23:13:34 +01:00
pathetic meowmeow 598292a044
Make the natural shuttle call an OOC vote (#3766) 2025-05-16 16:50:13 -04:00
pathetic meowmeow 66205ad772
Add the ability to call a GALPOL exfiltration shuttle (#3722)
* Add the ability to call a GALPOL exfiltration shuttle

* feetback

* format
2025-05-16 15:27:37 -04:00
AftrLite c604decba3
Cosmic Cult | Disable entropic decay popup (Hotfix) (#3747)
remove siphon popup
2025-05-15 21:51:13 -04:00
deltanedas 09fcddc555
make uplink implants work with contracts (#3761)
* add action prototype

* refactor contracts so its stored on the mind

* let uplink implants access contracts

* goida

---------

Co-authored-by: deltanedas <@deltanedas:kde.org>
2025-05-15 17:43:51 +01:00
AftrLite c80945cc96
Cosmic Cult | Another Pre-launch Patch (#3698)
* initial commit

* whoops those files never made the cut lmao

* content

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

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

* polish

* ???

* fix?

* fix..?

* requested changes + polish

* timespan seconds overload

* I'm pretty sure this fulfills the requested changes

* requested changes

* build fail begone

---------

Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>
2025-05-14 03:25:44 +01:00
deltanedas 07496c0efe
no hostage ops feedback (#3743)
Co-authored-by: deltanedas <@deltanedas:kde.org>
2025-05-14 01:26:18 +01:00
deltanedas edf261bcd8
prevent fultoning items in containers (#3741)
* prevent fultoning items in containers

* goida

---------

Co-authored-by: deltanedas <@deltanedas:kde.org>
2025-05-13 23:08:23 +01:00
deltanedas 440c90c72c
fix some contract issues (#3738)
Co-authored-by: deltanedas <@deltanedas:kde.org>
2025-05-13 21:46:42 +01:00
SolStar 514eeef9ef
Fix kitsune fox fires being too dark. (#3726)
Fix kitsune fox fires being too dark
2025-05-13 04:10:00 +00:00
SolStar 1eed74ccf4
Sex applies correctly to kitsune fox form (#3725) 2025-05-13 04:44:32 +01:00
deltanedas ac1b82d406
traitor reputation real (#2913)
* add reputation system

* add contracts button to PDA

* give traitors contracts

* add GetRandomObjective to SharedObjectivesSystem

* add TryRemoveObjective overload

* add everything needed for reputation store and objectives

* "ui"

* giant uplink reputation tagging

* prevent buying reputation-locked gear with uplink implant

* :trollface:

* more ui stuff

* :trollface:

* :trollface:

* remove default objectives

* :trollface:

* UI fixes

* stuff

* objective component changes

* add offerings and stuff to yml

* make some objectives work

* make rcd objective real

* more ui fix

* :trollface:

* ui usable

* bunch of low risk objectives

* syndie jail wip

* more wip

* massive amount of work

* add bad guidebooks

* prevent fultoning anchored things

* fixes

* disable claim buttons when no slots are open

* :trollface:

* :trollface:

* :trollface:

* update ui when a slot unlocks

* move rejecting to offerings, remove rescan (automatic now)

* add verb to attach fulton, fix

* dont get objective to ransom/kill someone you already ransomed

* make offering slots random + maximum count in rep level

* :trollface:

* rela

* update syndie jail

* more syndie jail update

* make marshal real

* fix

* fix power room power

* remove access from timer

* :trollface:

* engine

* allow syndicate items on syndie jail

* add ransom ui

* update map loading

* add ransom purchasing to cargo request console

* warn not error for loading

* ui fixes

* final fixy

* mg book fix

* final fixy II

* remove redundant Announcement word

* more []

* end ransom when leaving the jail

* :trollface:

* 10 tc for roundstart traitors

* make nuke core objective work for traitor

* guidebook gaming

* early merge of guidebook comments

* update bunch of objectives

* add min reputation to kill fellow traitor

* guidebook gaming

* evil

* giant stuff

* dont offer dupe objectives

* evil

* pronoun

* fix

* grr

* blacklist assist and DAGD from assist objective

* grr

* fix linter

* remove objectives from traitor rule test

* nuke disk anti-troll

* evil test

* add objectives test to find bad objective groups

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

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

* fixy

* fix

* fix stuff

* reword ransom announcement

* pro

* goida

---------

Signed-off-by: deltanedas <39013340+deltanedas@users.noreply.github.com>
Co-authored-by: deltanedas <@deltanedas:kde.org>
Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>
2025-05-12 17:16:22 -04:00
pathetic meowmeow ac1604d0bc
Return of warops (#3561)
* Return of warops

* feetback

* Update Content.Server/_DV/Antag/NukieOperationSystem.cs

Co-authored-by: Tobias Berger <toby@tobot.dev>
Signed-off-by: deltanedas <39013340+deltanedas@users.noreply.github.com>

---------

Signed-off-by: deltanedas <39013340+deltanedas@users.noreply.github.com>
Co-authored-by: Stop-Signs <stopsign221@gmail.com>
Co-authored-by: deltanedas <39013340+deltanedas@users.noreply.github.com>
Co-authored-by: Tobias Berger <toby@tobot.dev>
2025-05-12 12:54:33 -04:00
deltanedas 9d3d6c8334
fix kitsune action (#3715)
* fix kitsune action

* fix DisableWhenEmpty

* teleport fires instead of deleting and spawning

---------

Co-authored-by: deltanedas <@deltanedas:kde.org>
2025-05-11 16:13:12 +01:00
pathetic meowmeow 129b6d2fd4
CaptainState rewrite (#3691) 2025-05-10 18:55:30 +01:00
deltanedas 8ae2199a46
pka re-rework (#3671)
* make pka smaller

* re-buffs proto kinetic accelerator (#37012)

* new ruins

* genpop

* nvm

* abc

* fuckin

* turnstyle

* ruins

* stamp

* abc

* bruh

* efg

* pka fixed

* range tweak

* make lavaland 42kpa

* rework pka modkits and quarter damage when in pressure

* add modkits to points shop

* add indoors modkit for traitors

* change range to actually be range

---------

Co-authored-by: deltanedas <@deltanedas:kde.org>
Co-authored-by: TytosB <54259736+TytosB@users.noreply.github.com>
2025-05-09 16:53:26 +01:00
pathetic meowmeow a173996219
Censer needs people to be not-incapacitated for deconversion (#3687) 2025-05-08 20:27:46 +01:00
AftrLite 8f696047b1
Cosmic Cult | Pre-launch Patch #2 (#3681)
* initial commit

* unindented by 1, and made everything else match that same indentation

* Whoopsies
2025-05-08 10:55:36 +01:00
deltanedas 895b9ae6ac
fix bluespace shelter capsules (#3674)
Co-authored-by: deltanedas <@deltanedas:kde.org>
2025-05-07 22:15:58 +01:00
deltanedas f5502edf26
some salv fixes (#3663)
fix oreproc ui and update mining shuttle console more

Co-authored-by: deltanedas <@deltanedas:kde.org>
2025-05-07 14:24:54 +01:00