Commit Graph

7393 Commits

Author SHA1 Message Date
VMSolidus
648fea35b6 Revert PR #56 through #76 (#104)
# Description

There was a miscommunication, and I bungled the repository during the
last round of merges. The Mirror Bot is not quite finished yet, and some
polishing needs to happen behind the scenes before we can actually start
doing this. Also new policies from the discord are pending regarding how
these PRs need to be handled. I'll need to either reopen or remake the
reverted PRs, since we do actually still need them. But we need PRs
mirrored from Wizards' Den in order to go through the list properly.


![image](https://github.com/Simple-Station/Einstein-Engines/assets/16548818/cb2df7ff-d85b-4653-93a2-d9001e99f175)
2024-04-13 04:40:03 -04:00
SimpleStation14
9617a474f3 Whitelistremoves now requires either ban or whitelist, not both (#76)
## Mirror of PR #994: [Whitelistremoves now requires either ban or
whitelist, not both](https://github.com/DeltaV-Station/Delta-v/pull/994)
from <img src="https://avatars.githubusercontent.com/u/131613340?v=4"
alt="DeltaV-Station" width="22"/>
[DeltaV-Station](https://github.com/DeltaV-Station)/[Delta-v](https://github.com/DeltaV-Station/Delta-v)

<aside>PR opened by <img
src="https://avatars.githubusercontent.com/u/56081759?v=4"
width="16"/><a href="https://github.com/NullWanderer"> NullWanderer</a>
at 2024-03-21 23:16:47 UTC</aside>
<aside>PR merged by <img
src="https://avatars.githubusercontent.com/u/56081759?v=4"
width="16"/><a href="https://github.com/NullWanderer"> NullWanderer</a>
at 2024-03-27 23:53:10 UTC</aside>
<sup>

`a2a3bcbb869530aa1511af8339d8abc2cc84eba8`

</sup>

---

PR changed 0 files with 0 additions and 0 deletions.

The PR had the following labels:
- Changes: C#


---

<details open="true"><summary><h1>Original Body</h1></summary>

> ## About the PR
> Admins asked for it, and it looks to be a mistake in the code
> 
> **Changelog**
> 🆑
> DELTAVADMIN:
> - fix: whitelistremove now requires either ban or whitelist, not both.
> 
> 


</details>

Co-authored-by: Null <56081759+NullWanderer@users.noreply.github.com>
2024-04-07 23:37:24 -04:00
SimpleStation14
749332debf Revert "Revert "Revert AME buff"" (#70)
## Mirror of PR #996: [Revert "Revert "Revert AME
buff""](https://github.com/DeltaV-Station/Delta-v/pull/996) from <img
src="https://avatars.githubusercontent.com/u/131613340?v=4"
alt="DeltaV-Station" width="22"/>
[DeltaV-Station](https://github.com/DeltaV-Station)/[Delta-v](https://github.com/DeltaV-Station/Delta-v)

<aside>PR opened by <img
src="https://avatars.githubusercontent.com/u/107660393?v=4"
width="16"/><a href="https://github.com/IamVelcroboy"> IamVelcroboy</a>
at 2024-03-23 00:07:05 UTC</aside>
<aside>PR merged by <img
src="https://avatars.githubusercontent.com/u/107660393?v=4"
width="16"/><a href="https://github.com/IamVelcroboy"> IamVelcroboy</a>
at 2024-03-23 00:16:26 UTC</aside>
<sup>

`b4fc2e342be6ef395b1ca21f27787ac08a89df59`

</sup>

---

PR changed 0 files with 0 additions and 0 deletions.

The PR had the following labels:
- Changes: C#


---

<details open="true"><summary><h1>Original Body</h1></summary>

> Reverts DeltaV-Station/Delta-v#939
> 
> We might revert this again if everything burns but it's worth a shot.
Let's gooo
> 
> 
> **Changelog**
> 🆑 Velcroboy
> - tweak: Reverted AME buff. AME will require more than 1 core again to
function properly.


</details>

Co-authored-by: Velcroboy <107660393+IamVelcroboy@users.noreply.github.com>
2024-04-07 23:33:34 -04:00
stellar-novas
b702cbd41d Code Cleanup: Puddles and Spreaders (#39)
# Description

Ports https://github.com/space-wizards/space-station-14/pull/26102.

Co-authored-by: Tayrtahn <tayrtahn@gmail.com>
2024-03-27 19:19:13 -04:00
Danger Revolution!
b083655993 Light Replacer Fix (#21)
https://github.com/space-wizards/space-station-14/pull/26136


# Description

Light Replacer no longer sends out the wrong locale string. Read PR
above for details ^

Cherrypicked from Wizden in the gap between last merge and right now.
2024-03-22 22:13:48 -04:00
Debug
6bd5092853 Fix some trading post oopsies (#956)
Fix 2 oopsies
2024-03-11 19:57:03 +00:00
metalgearsloth
5de30d1379 Fix shuttle disabling on ftl (#25859)
Branch moment.

(cherry picked from commit 574c625d124ba086f03d327be28d961c680dbd73)
2024-03-08 12:54:56 +01:00
metalgearsloth
c30ff6e5ea Fix docking fallback (#25854)
Only thing that even triggers it atm is escape pods.

(cherry picked from commit bbb78807c43a9c22b08cf055339dbb74e8ab5d4c)
2024-03-08 12:54:55 +01:00
metalgearsloth
132d02653c Fix exped FTL (#25823)
Also fixed some other stuff I noticed.

(cherry picked from commit c23b3d804efc7f35cf6c56d872d8dd7fee82ece1)
2024-03-08 12:54:55 +01:00
metalgearsloth
27f43ccf77 Fix drone console docking (#25822)
(cherry picked from commit 4b6e5deb59f53d8d66a2ea9f7af276c0f2aff19d)
2024-03-08 12:54:55 +01:00
metalgearsloth
5ada275547 Fix FTL docks not opening (#25808)
(cherry picked from commit 21a95960f0fd04b6d99cd7c6617985a7eb5e9175)
2024-03-08 12:54:54 +01:00
metalgearsloth
f5a6a11ebd Fix FTLToDock (#25803)
* Fix FTLToDock

- Removed Enabled coz unneeded really.
- Fixed SetCoordinates call that got dumped at some point oop.

* Fix this docking check

(cherry picked from commit 92872e546ad5c281980ab8f56fea970c1921f8e4)
2024-03-08 12:54:53 +01:00
metalgearsloth
f102e8ff75 Shuttle console + FTL rework (#24430)
* Add shuttle interior drawing back

Just do it per-tile she'll be right, at least it's done with 1 draw call.

* Revamp shuttle console

* Bunch of cleanup work

* Lables sortito

* dok

* Pixel alignment and colours

* Fix a bunch of drawing bugs

* Shuttle map drawing

* Drawing fixes

* Map parallax working finally

* weh

* Commit all my stuff

* mic

* deez

* Update everything

* Xamlify everything

* uh

* Rudimentary blocker range

* My enemies have succeeded

* Bunch of changes to FTL

* Heaps of cleanup

* Fix FTL bugs

* FTL

* weewoo

* FTL fallback

* wew

* weh

* Basic FTL working

* FTL working

* FTL destination fixes

* a

* Exclusion zones

* Fix drawing / FTL

* Beacons working

* Coordinates drawing

* Fix unknown map names

* Dorks beginning

* State + docking cleanup start

* Basic dock drawing

* Bunch of drawing fixes

* Batching / color fixes

* Cleanup and beacons support

* weh

* weh

* Begin pings

* First draft at map objects

* Map fixup

* Faster drawing

* Fix perf + FTL

* Cached drawing

* Fix drawing

* Best I got

* strips

* Back to lists but with caching

* Final optimisation

* Fix dock bounds

* Docking work

* stinker

* kobolds

* Btns

* Docking vis working

* Fix docking pre-vis

* canasses

* Helldivers 2

* a

* Array life

* Fix

* Fix TODOs

* liltenhead feature club

* dorking

* Merge artifacts

* Last-minute touchup

(cherry picked from commit c5486873db0d6826122eb1f30007e392fc101082)
2024-03-08 12:54:53 +01:00
Flesh
44613e6544 Made ordering multiple crates at cargo order multiple crates (#25518)
* please tell me this is empty

* it wasn't empty, fixing that

* This should fix it

* fix for the fix

* address changes

* fix

* Added some comments, hoping that failed test was a fluke.

(cherry picked from commit aa4e7c061939fbe314be97a2e7f559477b941c07)
2024-03-08 12:54:53 +01:00
themias
554f664994 Fix centcom cargo gifts (#24701)
(cherry picked from commit 3933490962993e839c71efea46c3e799ac824778)
2024-03-08 12:54:52 +01:00
metalgearsloth
fa3e17de86 Clear cargo orders on approval (#24278)
(cherry picked from commit f82fd23f2c87b7cab852bdc2563cfa30c2d2a6dd)
2024-03-08 12:54:51 +01:00
Debug
76d06416ab Modify trade station for Delta 2024-03-08 12:54:50 +01:00
metalgearsloth
fa61952f51 Add trade stations (#23863) 2024-03-08 09:52:50 +01:00
Debug
e271a5da59 Revert "Revert AME buff" (#939)
Revert "Revert AME buff (#930)"

This reverts commit 152a190d01.
2024-03-08 09:35:57 +01:00
Danger Revolution!
2a195a6eda Listening Post 2.0 (#639)
* updates map, lowers server volume

* Delete PLEASEWORKTHISTIMEIBEGYOUS14.yml

* Update DV-pirateradio.yml

* changes fax machine to *not* alert admins; and start with emagged by default instead of using VV

* Revert "changes fax machine to *not* alert admins; and start with emagged by default instead of using VV"

This reverts commit 05bb5f402d7986214f753dd217765e01b46e69a7.

* Revert "Update DV-pirateradio.yml"

This reverts commit e77fb34e86c994bce2f63205741636be6c0286fd.

* Revert "Delete PLEASEWORKTHISTIMEIBEGYOUS14.yml"

This reverts commit 2000e2c147125827405eeaf1191abb29c7b4c7d8.

* Revert "updates map, lowers server volume"

This reverts commit d99cab6f36c26441c8431ee5c7d2fc2ad1ff68d7.

* adds new syndicate fax, maps it in as well as other QOL changes

* adds cybersun pen to Syndicate PDA's

* Update DV-pirateradio.yml

* adds blacklist to CC Fax + quieter server

* Update PirateRadioSpawnRule.cs

* unfinished scuttling system

* Adding colorblind quality of life.

* Tweaks to map and guards, no more self destruct system

* added guard flavor text

* The reasons for these are now gone

* DONE

* Update events.yml

* Update PirateRadioSpawnRule.cs

* Update DV-pirateradio.yml

* fixes crew monitor server not working at *extreme* ranges

* adds delta-v comment where needed

* Small code optimization and tons of documentation

* Update outpost visuals! Guards have a PDA now

* Update DV-pirateradio.yml

* Update DV-pirateradio.yml

* Goodbye crab. Hello Content.Shared migration

* Cleaning up pirateradio spawn

* Update DV-pirateradio.yml

* reverts pen changes to upstream PDA's

* adds new PDA

* adds new PDA to loadouts.

* Update Resources/Prototypes/DeltaV/Entities/Mobs/NPCs/salvage.yml

Co-authored-by: Debug <49997488+DebugOk@users.noreply.github.com>
Signed-off-by: Danger Revolution! <142105406+DangerRevolution@users.noreply.github.com>

* Maintainer requested changes

* Update salvage.yml

* Update syndicateNPCs.yml

* Cleaning up unneeded stuff

* more code cleanup

* Update PirateRadioSpawnRule.cs

* Update computers.yml

* Revert "Update computers.yml"

This reverts commit cbd0c583d48c66579d9fd6ee2c10cd7a350a955c.

* Last fixes to the math

* Update PirateRadioSpawnRule.cs

* update license.

---------

Signed-off-by: VMSolidus <evilexecutive@gmail.com>
Signed-off-by: Danger Revolution! <142105406+DangerRevolution@users.noreply.github.com>
Co-authored-by: DangerRevoltion <142105406+DangerRevoltion@users.noreply.github.com>
Co-authored-by: VMSolidus <evilexecutive@gmail.com>
Co-authored-by: Debug <49997488+DebugOk@users.noreply.github.com>
2024-03-07 22:35:45 -05:00
Velcroboy
152a190d01 Revert AME buff (#930)
Co-authored-by: Velcroboy <>
2024-03-07 22:13:49 -05:00
Debug
9b2d304326 Merge pull request #937 from DebugOk/2024/03/05-Merge-Master
2024/03/05 merge master
2024-03-07 18:18:05 +01:00
Debug
fc7e32f9cc Fixes 2024-03-07 02:10:29 +01:00
Tayrtahn
3f54180d28 Hotfix for errors in handheld lights and radio jammers (#25880)
(cherry picked from commit e5536e0652ab3605701627474d6450f0884a079c)
2024-03-07 01:52:49 +01:00
Tayrtahn
a8d082374d Remove all obsolete BatteryComponent method calls (#25871)
Removed all obsolete, non-ECS method calls to BatteryComponent

(cherry picked from commit 2935e5bd780d6cd08897521ba0b54adccb3fd0da)
2024-03-07 01:52:46 +01:00
Tayrtahn
549d4f18cd Add SharedPopupSystem.PopupPredicted (#25811)
* Added SharedPopupSystem.PopupPredicted

* Documentation improvement

(cherry picked from commit 0738829510d823bf0f22eaf197f6f5cc3744bbc3)
2024-03-07 01:52:38 +01:00
metalgearsloth
ad056f9318 Fix pod launch offset (#25855)
Was too lazy to fix and forgot.

(cherry picked from commit e648fe50123419e24bec7c0b4ac14dd657498675)
2024-03-07 01:52:31 +01:00
Ilya246
e025ff72f2 buff gas leak event (#25864)
the fog is coming

(cherry picked from commit 27e14d8a9660c9ab7a69470e7566fea0ff1b71c1)
2024-03-07 01:28:42 +01:00
Tayrtahn
c255822389 Add prediction to hand labeler labels (#25869)
Added prediction to labels

(cherry picked from commit f4976a32886850df2033e7866d0c9a5df37be1af)
2024-03-07 01:27:58 +01:00
Menshin
f2db506d1d Enforce Space Heater max/min temperatures server side (#25835)
Actually enforce max/min temperatures server side

(cherry picked from commit bad11742d3cdf23ac5cc9354da98767ff623449a)
2024-03-07 01:25:41 +01:00
Brandon Hu
37f2d417b7 Remove the ability for command or any antag-safe role from being initial infected in zombie mode #25529 (#25785)
* fix(antags): respects canBeAntag = true

* updated more

* includeAllJobs = False??????????

* fixed comma placement

* removed unused dependencies

(cherry picked from commit 511e245de1fe668e0af5d2ae0581c54e44712812)
2024-03-07 01:25:07 +01:00
deltanedas
c0bfa9fc96 fishops nerf real (#25148)
* refactor ops

* inherit dna and fiber when fish hydrated

* :trollface:

* kid named finger

* :trollface:

* move rehydrating to shared :trollface:

* nobody noticed the popup being missing all this time

* method ops

---------

Co-authored-by: deltanedas <@deltanedas:kde.org>
(cherry picked from commit 550612a37f4fd61088c994b289c833ed3d564855)
2024-03-07 01:24:59 +01:00
Ed
da5758ba4e Mineshaft (#25733)
* content

* catwalks

* fix fucking icons

* finish PR

* +1 room

* fix

(cherry picked from commit ace82854406631bad58cd731899fc8e20ef21e65)
2024-03-07 01:24:40 +01:00
Plykiya
38719830b6 Syringe QoL improvements (#25480)
Co-authored-by: Plykiya <plykiya@protonmail.com>
(cherry picked from commit 4f7ff56e87d78a2acc0936466f83a6b841ee8fea)
2024-03-07 01:24:05 +01:00
Julian Giebel
236bba59c2 System for single device net server per station functionality (#23946)
(cherry picked from commit 1ed63d43b00ebacafb5d6bc50d6c39348c7e8b39)
2024-03-07 01:22:35 +01:00
Errant
29230db5c3 Remove doafter from toggling your own internals (#25781)
remove doafter from toggling your own internals

(cherry picked from commit 759b6229c2ff3ae4f0808dbda3a17ac603e23928)
2024-03-07 01:21:53 +01:00
LordCarve
297c97d556 Make ItemSlots more verbose + AME proof of concept (#25779)
* Make itemslots more verbose with AME proof of concept.

* Remove unnecessary [DataField] strings and use null coalescing in whitelist checks.

* Change optional popup fields into LocId.

(cherry picked from commit 06d755a860fa60dd393bfece6495109af8b60c21)
2024-03-07 01:19:38 +01:00
Tayrtahn
b97afd8346 Add prediction for puddle and spillable examines (#25794)
Prediction for puddle and spillable examines

(cherry picked from commit 4943151111c8db9ac94701128b08f857b3abd3e6)
2024-03-07 01:19:36 +01:00
Fildrance
426b208c1d fix: lobby music volume will be changed on options change without restart (also lobby music not looped anymore) (#25530)
* fix: lobby music volume will be changed on options change without restart (also lobby music not looped anymore)

* refactor: now lobby music is part of ContentAudioSystem. Lobby playlist is used instead of single track. Client now selects next lobby soundtrack after previous finished.

* refactor: incapsulated info on current lobby track in simple record

* refactor: fixed inconsistent naming between song and soundtrack for lobbymusic

* refactor: xml-doc for LobbyPlaylistChangedEvent

* fix: inverted invalid _audio.PlayGlobal check to return only if lobby soundtrack play call failed

---------

Co-authored-by: pa.pecherskij <pa.pecherskij@interfax.ru>
(cherry picked from commit 4c87dcd3cb92855df1fa01dea52d2ddd09f2adce)
2024-03-07 01:18:33 +01:00
deltanedas
a3a4f14b96 make thief a subgamemode (#25740)
* add SubGamemodes comp/sys

* remove RuleChance from thief rule

* use SubGamemodes for adding thief rule instead of adding ThiefRule component to random gamemodes

* clean up thief rule prototype

* add better logging + end rule if it fails to start

* march 1st incident

* preset ops

* the dreaded

---------

Co-authored-by: deltanedas <@deltanedas:kde.org>

(cherry picked from commit 7f060eb129f100754647e5221e9ebab2b00e6925)
2024-03-07 01:18:13 +01:00
lzk
15a77b2667 Remove 07 from emote chatsan (#25767)
1

(cherry picked from commit 325349965d7f3a8e504eccbc3410aeae0a4bfd92)
2024-03-07 01:17:38 +01:00
Errant
63e45f9532 Alerts for breathing plasma/tritium (#24484)
* Alert autoremove v0

* Code cleanup and timing

* comment

* Tritium, code compression

* not resolving manually

* reduced lookups, new comp

* fix-fix yes

* use RemCompDeferred, handle OnUnpaused

* missed a todo

* entitysystem resolve

* remove unnecessary component updates

* remove AlertState from comp, move EntityUnpausedEvent actions to AlertStateComponent's Timespan

* Code cleanup

* comments

* combines AutoRemove input into Clear

* minor logic adjustment that does not really change anything but is less ambiguous

(cherry picked from commit ecd2d5a644540c6ad28903ee4fb2af87876e3030)
2024-03-07 01:17:31 +01:00
exincore
795bb78af9 Fix ResearchSystem.Client UpdateClientInterface preconditions. (#25743)
* fix(research): Fix `ResearchSystem.Client` `UpdateClientInterface` preconditions.

Fixes a paradox where selecting a research server requires a research server to already be selected.
This would softlock the research client until it is reconstructed.

* style: Discards the discard operator

Co-authored-by: Nemanja <98561806+EmoGarbage404@users.noreply.github.com>

---------

Co-authored-by: Nemanja <98561806+EmoGarbage404@users.noreply.github.com>
(cherry picked from commit aaf5d0d30254d27d319b2b5f5874ebe787537f0a)
2024-03-07 01:17:24 +01:00
DrSmugleaf
d14135f9e6 Add test to check that there are no pending database model changes (#25762)
(cherry picked from commit 2904ff421ad7477a503e4835624e2e3c82db0cf2)
2024-03-07 01:16:31 +01:00
exincore
b0d948aefa feat(chameleon): Chameleon verb only shows to the wearer (#25746)
(cherry picked from commit 1abd1f615fb0e8423855c1cea9c858db01abad31)
2024-03-07 01:13:41 +01:00
DrSmugleaf
56dd39497a Make the round end sound collection a cvar (#25741)
* Make the round end sound collection a cvar

* Fix comment

* Clarity

(cherry picked from commit 30ccde0a47f65d0f6b0641f5bf92d95650c4fb87)
2024-03-07 01:13:37 +01:00
LordCarve
ba36e5195f Refactor AME to use ItemSlot for Fuel (#25558)
* Using wrench on AME doesn't first try to put it in.

* Refactor AME to use ItemSlot for fuel.

* Apparently these names want to match.

(cherry picked from commit c47391011d0f7f56dfcba8e4db348f0dc0d58c09)
2024-03-07 01:08:04 +01:00
Rainfey
b9d2f5a409 Refactor antag rule code (#23445)
* Initial Pass, Rev, Thief

* Zombie initial pass

* Rebase, Traitor

* Nukeops, More overloads

* Revert RevolutionaryRuleComponent

* Use TryRoundStartAttempt, Rewrite nukie spawning

* Comments, Add task scheduler to GameRuleSystem

* Zombie initial testing done

* Sort methods, rework GameRuleTask

* Add CCVar, Initial testing continues

* Might as well get rid of the obsolete logging

* Oops, i dont know how to log apparently

* Suggested formatting fixes

* Suggested changes

* Fix merge issues

* Minor optimisation

* Allowed thief to choose other antags

* Review changes

* Spawn items on floor first, then inserting

* minor tweaks

* Shift as much as possible to ProtoId<>

* Remove unneeded

* Add exclusive antag attribute

* Fix merge issues

* Minor formatting fix

* Convert to struct

* Cleanup

* Review cleanup (need to test a lot)

* Some fixes, (mostly) tested

* oop

* Pass tests (for real)

---------

Co-authored-by: Rainfall <rainfey0+git@gmail.com>
Co-authored-by: AJCM <AJCM@tutanota.com>

(cherry picked from commit 4e6c59cfe51211064d79a727cc2d37c2a2f55a2c)
2024-03-07 01:06:59 +01:00
c4llv07e
a76703ff6c Fix cryostorage removing minds of players who have entered ghost role (#24991)
* fix cryo removed minds of players who entered ghost role

Signed-off-by: c4llv07e <kseandi@gmail.com>

* better way to handle cryo with mind in it

Signed-off-by: c4llv07e <kseandi@gmail.com>

---------

Signed-off-by: c4llv07e <kseandi@gmail.com>
(cherry picked from commit ee614dec5c412cf5d155303db5ade1cd33fc0c12)
2024-03-07 01:05:31 +01:00
Cojoke
b9cb4bd2f1 Makes the e-sword light plasma fires, as intended. (#25665)
* Makes the e-sword light plasma fires, as intended.

* remove blank line

(cherry picked from commit dddec4dcc66d8ae728c91ff49b5c06ef95545475)
2024-03-07 01:05:13 +01:00