Commit Graph

36638 Commits

Author SHA1 Message Date
nikthechampiongr 725c177ad2
Replace the teleportation logic on the SCRAM implant! (#26429)
* Replace the teleportation logic on the SCRAM implant!

Now instead of just trying to pick a random tile in range 20 times, the
scram teleportation logic now:

- Gets a list of grids in range
- Until a suitable tile is picked it picks a random grid
- From that grid it picks a random tile.
- If the tile is suitable, then it is set as the target and the user
  will be teleported there.
- Grids and tiles are randomly picked as outlined above until a valid
  tile is found, or all valid grids and tiles are exhausted.
- Should no suitable tile be found then they get teleported to the same
  position they are at. Effectively not teleporting them.

* Actually make the defaults sane which I forgor in the last commit

* Extract tile section to its own function. Bias selection for current grid. Use proper coords for box.

* Address reviews as much as possible

* Address reviews

(cherry picked from commit 2ffd616c41)
2024-04-07 14:27:05 +02:00
deltanedas 5e3d7350ba
scoopable ash and foam, solution transfer prediction (#25832)
* move SolutionTransfer to shared and predict as much as possible

* fully move OpenableSystem to shared now that SolutionTransfer is

* fix imports for everything

* doc for solution transfer system

* trolling

* add scoopable system

* make ash and foam scoopable

* untroll

* untroll real

* make clickable it work

* troll

* the scooping room

---------

Co-authored-by: deltanedas <@deltanedas:kde.org>
Co-authored-by: metalgearsloth <comedian_vs_clown@hotmail.com>
(cherry picked from commit 1db178b632)
2024-04-07 14:27:04 +02:00
PJBot c35b655ef6
Automatic changelog update
(cherry picked from commit d9b6e9f127)
2024-04-07 14:26:58 +02:00
c4llv07e ecbef2b8eb
Add door electronics access configuration menu (#17778)
* Add door electronics configuration menu

* Use file-scoped namespaces

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

* Open door electronics configuration menu only with network configurator

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

* Doors will now try to move their AccessReaderComponent to their door electronics when the map is initialized

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

* Make the access list in the id card computer a separate control

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

* Fix merge conflict

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

* Remove DoorElectronics tag

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

* Integrate doors with #17927

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

* Move door electornics ui stuff to the right place

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

* Some review fixes

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

* More fixes

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

* review fix

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

* move all accesses from airlock prototypes to door electronics

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

* rework door electronics config access list

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

* Remove Linq from the door electronics user interface

* [WIP] Add EntityWhitelist to the activatable ui component

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

* Better interaction system

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

* Refactor

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

* Fix some door electronics not working without AccessReaderComponent

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

* Move AccessReaderComponent update code to the AccessReaderSystem

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

* Remove unnecesary newlines in the door access prototypes

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

* Remove unused variables in access level control

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

* Remove unnecessary method from the door electronics configuration menu

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

* [WIP] change access type from string to ProtoId<AccessLevelPrototype>

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

* Remove unused methods

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

* Newline fix

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

* Restored to a functional state

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

* Fix access configurator not working with door electronics AccessReaderComponent

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

* Replace all string access fields with ProtoId

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

* move access level control initialization into Populate method

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

* Review

---------

Signed-off-by: c4llv07e <kseandi@gmail.com>
Co-authored-by: metalgearsloth <comedian_vs_clown@hotmail.com>

(cherry picked from commit 64bb8dbdd5)
2024-04-07 14:26:56 +02:00
PJBot 516e5c6081
Automatic changelog update
(cherry picked from commit 72bdcac1e2)
2024-04-07 14:24:29 +02:00
SlamBamActionman d268105585
Coordinates Disks & Shuttle FTL Travel (#23240)
* Adds the CentComm Disk and configures it to work with direct-use shuttles

* Added functionality for drone shuttles (i.e. cargo shuttle)

* Adds support for pods, and a disk console object for disks to be inserted into. Also sprites.

* Added the disk to HoP's locker

* Removed leftover logs & comments

* Fix for integration test

* Apply suggestions from code review (formatting & proper DataField)

Co-authored-by: 0x6273 <0x40@keemail.me>

* Fix integration test & changes based on code review

* Includes Disk Cases to contain Coordinate Disks, which are now CDs instead of Floppy Disks

* Check pods & non-evac shuttles for CentCom travel, even in FTL

* Import

* Remove CentCom travel restrictions & pod disk consoles

* Major changes that changes the coordinates disk system to work with salvage expeditions

* Missed CC diskcase removal

* Fix build

* Review suggestions and changes

* Major additional changes after merge

* Minor tag miss

* Integration test fix

* review

---------

Co-authored-by: 0x6273 <0x40@keemail.me>
Co-authored-by: metalgearsloth <comedian_vs_clown@hotmail.com>
(cherry picked from commit bed9e9ac6a)
2024-04-07 14:24:24 +02:00
PJBot 2c048be16e
Automatic changelog update
(cherry picked from commit cc35f16839)
2024-04-07 14:24:23 +02:00
Keer-Sar c10accabc5
Add Cyborg Emote Sounds (#26594)
* Hal 9000's first emote

* Add Chime emote & Change variation to 0.05

* Modify Buzz emote

* Add Buzz-two emote

* modified Horn

* add ping emote

* add slowclap emote

* Convert slowclap.ogg to mono, reflect change in attribution.yml

* fix capitalization for all chatMessages && change all catagory to category

* remove all traces of slowclap.ogg

* forgor one file smh

* collating copywrite

* spelling mistakes will be the death of me

* more spelling mistakes

* change yml string to list

(cherry picked from commit cf7567d073)
2024-04-07 14:24:22 +02:00
PJBot da3aa5c57c
Automatic changelog update
(cherry picked from commit 8c5e236de4)
2024-04-07 14:24:18 +02:00
SoulFN 72971afe55
Change assault borg modules texture (#26502)
* Update borg_modules.yml

* Fix borg_modules.yml?

* Uh

---------

Co-authored-by: metalgearsloth <comedian_vs_clown@hotmail.com>
(cherry picked from commit 83766b5d20)
2024-04-07 14:24:17 +02:00
metalgearsloth aa2a8cd6cb
Add ValueList import (#26640)
(cherry picked from commit b7a6fb991f)
2024-04-07 14:24:16 +02:00
PJBot 2ea0496554
Automatic changelog update
(cherry picked from commit 246155bd37)
2024-04-07 14:24:14 +02:00
Tayrtahn 05cfcb0e9e
Combine solution injection systems; Fix embeddable injectors (#26268)
* Combine injection systems

* Update Content.Server/Chemistry/EntitySystems/SolutionInjectOnEventSystem.cs

---------

Co-authored-by: metalgearsloth <31366439+metalgearsloth@users.noreply.github.com>
(cherry picked from commit d0d12760a8)
2024-04-07 14:24:13 +02:00
PJBot c8cf344afa
Automatic changelog update
(cherry picked from commit d8d4feec38)
2024-04-07 14:24:10 +02:00
Flareguy 21aed479e9
Gives all wheeled objects low friction (#26601)
* gives all wheeled objects friction

* adjustments to sum stuff

(cherry picked from commit 29d7b73da7)
2024-04-07 14:24:07 +02:00
Zealith-Gamer 59dd6cfbce
Gave Blast door access permissions (#26606)
Added access reader to all blast doors. Added pre configured blast doors for engineering and science.

(cherry picked from commit 5bb0179c25)
2024-04-07 14:24:02 +02:00
no ce60f06823
Replace drill_hit.ogg and drill_use.ogg with better sounds (#26622)
* Replace drill_hit.ogg and drill_use.ogg with better sounds

* Fix attribution source for drill_hit.ogg

* Update Resources/Audio/Items/attributions.yml

Co-authored-by: Kara <lunarautomaton6@gmail.com>

* Update Resources/Audio/Items/attributions.yml

Co-authored-by: Kara <lunarautomaton6@gmail.com>

---------

Co-authored-by: metalgearsloth <31366439+metalgearsloth@users.noreply.github.com>
Co-authored-by: Kara <lunarautomaton6@gmail.com>
(cherry picked from commit c4f383c9ba)
2024-04-07 14:24:00 +02:00
PJBot 09aa07575d
Automatic changelog update
(cherry picked from commit 1d2bf51488)
2024-04-07 14:23:58 +02:00
nikthechampiongr 9a378a6b06
Fix radio jammer not blocking suit sensors. (#26632)
As it turns out, they are not in fact on their own netid. They are
actually just on wireless. The way I had tested my previous pr led to
this mistake being made. I originally had the radio jammer block
wireless as well, but decided to take out under the flase assumption
that it suit sensors were actually on their own netid and did not
require the ability to block all wireless packets at the last moment.

(cherry picked from commit 29c81bcc05)
2024-04-07 14:23:46 +02:00
Zealith-Gamer cd89dd7e5b
blacklisted throwing knifes from pneumatic cannon (#26628)
(cherry picked from commit adaaf0fefc)
2024-04-07 14:23:43 +02:00
UBlueberry 69bc7ce05a
made the hover text less vague (sorry) (#26630)
(cherry picked from commit ce6b6fd428)
2024-04-07 14:23:35 +02:00
PJBot d8c80d57cb
Automatic changelog update
(cherry picked from commit e53bfed589)
2024-04-07 14:23:32 +02:00
RiceMar1244 58a0245d09
Adds two milk cartons to the BoozeOMat (#26635)
(cherry picked from commit 652de4d321)
2024-04-07 14:23:29 +02:00
eoineoineoin afb70a74dc
Fix some text overflow bugs in HUD (#26615)
* Don't clip text in item status

* Fix overflow in examine tooltip

---------

Co-authored-by: Eoin Mcloughlin <helloworld@eoinrul.es>
(cherry picked from commit 9b08c2c908)
2024-04-07 14:23:26 +02:00
PJBot ba12fcd75d
Automatic changelog update
(cherry picked from commit c62e90afb3)
2024-04-07 14:23:24 +02:00
lzk fab6c56d63
Add briefcase to curadrobe and lawdrobe, and some briefcases cleanup (#26527)
* Add briefcase to curadrobe and some briefcases cleanup

* also add to lawdrobe

(cherry picked from commit 0602e64300)
2024-04-07 14:23:20 +02:00
Wrexbe (Josh) e8201e1b1a
Auto DeAdmin sooner (#26551)
Co-authored-by: wrexbe <wrexbe@protonmail.com>
(cherry picked from commit 6d1511124f)
2024-04-07 14:22:49 +02:00
Leon Friedrich 89ac535f6c
Fix GastTileOverlay sending redundant data (#26623)
Fix GastTileOverlay not updating properly

(cherry picked from commit d2bee7ec91)
2024-04-07 14:22:09 +02:00
PJBot 635ff88190
Automatic changelog update
(cherry picked from commit 3adf6c1ecc)
2024-04-07 14:22:08 +02:00
eoineoineoin 2f65895838
Fix orientation of roller skate sprites (#26627)
Co-authored-by: Eoin Mcloughlin <helloworld@eoinrul.es>
(cherry picked from commit 7e950ea1d5)
2024-04-07 14:22:07 +02:00
avery f5b9f4dd1e
cancelable brig timers (#26557)
brig timers now cancelable. also some screensystem yakshave

(cherry picked from commit 5eff7f169e)
2024-04-07 14:22:06 +02:00
PJBot dc3474438a
Automatic changelog update
(cherry picked from commit 7f2e6ccbb8)
2024-04-07 14:21:59 +02:00
Ubaser 179be5f2e8
Add AP damage to throwing knives (#26380)
* add

* ap

* no more stam dmg

(cherry picked from commit 2a1903dae0)
2024-04-07 14:21:58 +02:00
PJBot 93b3cb078b
Automatic changelog update
(cherry picked from commit 241b153f6a)
2024-04-07 14:21:57 +02:00
lzk 29df38666a
Combine flower crown and wreath (#26605)
* Combine flower crown and wreath

* huh

* huuh :trollface:

(cherry picked from commit 55c77af33c)
2024-04-07 14:21:56 +02:00
Wrexbe (Josh) b8598e479d
Make the buttons on the map ui not squished (#26604)
Make the map ui work

Co-authored-by: wrexbe <wrexbe@protonmail.com>
(cherry picked from commit ad438a7ac2)
2024-04-07 14:21:51 +02:00
nikthechampiongr 9f7680698d
Fix grave digging sound indefinitely playing if dug by aghost. (#26420)
Admins bypass doafters. As such, the code that runs on doafter
completion is ran before the sound is actually created. This then leads
to the sound never being stopped, and as such it would infinitely play.

This commit gets around the issue by manually stopping the sound should
the doafter fail to start. If we could be sure that the doafter would
never fail, then we could just move the call to StartDigging above
starting the doafter but this is currently not possible.

Co-authored-by: metalgearsloth <comedian_vs_clown@hotmail.com>
(cherry picked from commit 8337493526)
2024-04-07 14:21:50 +02:00
PJBot 5e1671c292
Automatic changelog update
(cherry picked from commit d1ad6d9126)
2024-04-07 14:21:49 +02:00
Nemanja d9f1a5f042
disallow unanchoring or opening panels on locked emitters/APEs (#26600)
* disallow unanchoring or opening panels on locked emitters/APEs

* no locking open panels

* oops

* needback feedback

* Update Content.Shared/Lock/LockSystem.cs

* Update Content.Shared/Lock/LockSystem.cs

* Update Content.Shared/Lock/LockSystem.cs

* sanity

---------

Co-authored-by: metalgearsloth <31366439+metalgearsloth@users.noreply.github.com>
Co-authored-by: metalgearsloth <comedian_vs_clown@hotmail.com>
(cherry picked from commit 1b69762816)
2024-04-07 14:21:48 +02:00
metalgearsloth 9b761ec6c0
Update submodule to 217.2.1 (#26599)
(cherry picked from commit d512bc141a)
2024-04-07 14:21:30 +02:00
Plykiya 7182e0f674
Injector UI shows TransferAmount change, Spilling liquid changes Injector mode (#26596)
* Injector UI shows TransferAmount change, spill changes mode

* Update Content.Shared/Fluids/SharedPuddleSystem.Spillable.cs

* Update Content.Shared/Fluids/SharedPuddleSystem.Spillable.cs

---------

Co-authored-by: Plykiya <plykiya@protonmail.com>
Co-authored-by: metalgearsloth <31366439+metalgearsloth@users.noreply.github.com>
(cherry picked from commit d71062a64c)
2024-04-07 14:21:27 +02:00
PJBot eb0e01fbff
Automatic changelog update
(cherry picked from commit 7c7ff5abf6)
2024-04-07 14:21:25 +02:00
lzk a5720dfe23
Remake hairflowers (#25475)
* Add more lily usage (orange hairflower and flowercrown)

* comit 2

* ee

* more fixes

* w

* im stupid

* bring poppy in authodrobe

* weh

---------

Co-authored-by: metalgearsloth <31366439+metalgearsloth@users.noreply.github.com>

(cherry picked from commit d5052697aa)
2024-04-07 14:21:14 +02:00
Velcroboy 7bb64e631d
Remove physics comp from VendingMachineWallmount (#25632)
* Remove physics comp from VendingMachineWallmount

* Fixtures removal

---------

Co-authored-by: Jeff <velcroboy333@hotmail.com>
Co-authored-by: metalgearsloth <comedian_vs_clown@hotmail.com>
(cherry picked from commit f5e5b6b095)
2024-04-07 14:20:32 +02:00
Bixkitts 070d466494
MeleeHitSoundSystem (#25005)
* Began work to unscrew melee noises

* finished

* cleanup

* cleanup

* Update Content.Server/Weapons/Melee/MeleeWeaponSystem.cs

Co-authored-by: Ed <96445749+TheShuEd@users.noreply.github.com>

* _Style

* Fix merge

---------

Co-authored-by: Ed <96445749+TheShuEd@users.noreply.github.com>
Co-authored-by: metalgearsloth <comedian_vs_clown@hotmail.com>
(cherry picked from commit ae8a68b7cd)
2024-04-07 14:20:27 +02:00
Plykiya 3e38dc4de6
Fix: Prevent single-use hyposprays from getting the toggle draw verb (#26595)
Prevent single-use hyposprays from getting the toggle draw verb

Co-authored-by: Plykiya <plykiya@protonmail.com>
(cherry picked from commit 90a880a9be)
2024-04-07 14:20:24 +02:00
metalgearsloth ac273c0912
Revert Paint (#26593)
* Revert "Fix build (#26258)"

This reverts commit 6de5fbfafb.

* Revert "Spray Paint (Review Ready) (#23003)"

This reverts commit e4d5e7f1ae.

# Conflicts:
#	Resources/Prototypes/Entities/Structures/Holographic/projections.yml

(cherry picked from commit c91ed96853)
2024-04-07 14:20:19 +02:00
PJBot c10693899c
Automatic changelog update
(cherry picked from commit 213c075e13)
2024-04-07 14:20:14 +02:00
drteaspoon420 929b8978dd
Fix 'Hypopen shouldn't display solution examine text' (#26453)
* stealthy hypo

* ExaminableSolution hand check when in covert implement.

ExaminableSolution now has 'hidden' datafield to enable chemical inspection only in hand.

* cleaning code

* more cleaning

* Hidden datafield renamed to HeldOnly

* review

---------

Co-authored-by: metalgearsloth <comedian_vs_clown@hotmail.com>
(cherry picked from commit 4e618e9387)
2024-04-07 14:20:11 +02:00
PJBot 13b7bbf0ee
Automatic changelog update
(cherry picked from commit 1ad509173d)
2024-04-07 14:20:09 +02:00