Commit graph

27432 commits

Author SHA1 Message Date
poeMota
372a252db0
[Maps] New map Split stations (#2022)
Co-authored-by: poeMota <belochuc@gmail.com>
2024-04-08 11:30:30 +03:00
lzk
6c3448da73
Invert status icon side (#2023) 2024-04-08 11:24:03 +03:00
lapatison
898bc34a26
Locale tweaks (#2018) 2024-04-08 11:20:51 +03:00
Zna1kin
8284c0f984
New Gelta shuttles (#2025) 2024-04-08 11:15:53 +03:00
lzk
e9cbb0ed4a
Add new lobby art (#2024) 2024-04-08 11:14:23 +03:00
lzk
b6302192e7
Add plasma stack sprites (#2011) 2024-04-04 10:34:52 +03:00
SonicHDC
253d2094c3
Corvax Retexture pack 2! (#2012) 2024-04-04 10:33:11 +03:00
lapatison
a1fe34a0a0
Translate Upstream #2008 (#2009)
Co-authored-by: lzk <124214523+lzk228@users.noreply.github.com>
2024-04-04 10:19:57 +03:00
Syxapik
0cae902e62
[FixMap] Avrite (#2016) 2024-04-04 10:10:16 +03:00
Zna1kin
e5242db7d4
Update Gelta Station (#2015) 2024-04-04 10:10:08 +03:00
poeMota
9c12d735b1
[Maps] Delta update (#2013)
Co-authored-by: poeMota <belochuc@gmail.com>
2024-04-04 10:09:31 +03:00
KernD0G
c1ecacd16e
Silly island next gen 4k update №2 (#1998) 2024-04-04 10:08:47 +03:00
Morb
7f599b9dd0
Merge pull request #2008 from space-syndicate/upstream-sync
Upstream sync
2024-04-02 13:03:58 +03:00
Morb0
0c357625e0 Fix Avrit 2024-04-02 12:17:44 +03:00
Morb0
838ff874f4 Update locale 2024-04-02 12:03:12 +03:00
Morb0
860f045b08 Merge remote-tracking branch 'upstream/master' into upstream-sync
# Conflicts:
#	Resources/Audio/Machines/attributions.yml
#	Resources/Prototypes/Catalog/Fills/Books/bookshelf.yml
#	Resources/Prototypes/Catalog/Fills/Lockers/security.yml
#	Resources/Prototypes/Catalog/VendingMachines/Inventories/curadrobe.yml
#	Resources/Prototypes/Catalog/VendingMachines/Inventories/lawdrobe.yml
#	Resources/Prototypes/Entities/Objects/Specific/Medical/hypospray.yml
#	Resources/Prototypes/Roles/Jobs/Security/security_officer.yml
#	Resources/Prototypes/Roles/Jobs/Security/warden.yml
#	Resources/Prototypes/Voice/speech_emotes.yml
#	Resources/Textures/Clothing/OuterClothing/Coats/labcoat_cmo.rsi/open-inhand-left.png
#	Resources/Textures/Clothing/OuterClothing/Coats/labcoat_cmo.rsi/open-inhand-right.png
#	Resources/Textures/Objects/Magic/spellbooks.rsi/bookfireball.png
#	Resources/Textures/Objects/Magic/spellbooks.rsi/bookforcewall.png
#	Resources/Textures/Objects/Magic/spellbooks.rsi/bookknock.png
#	Resources/Textures/Objects/Magic/spellbooks.rsi/meta.json
#	Resources/Textures/Objects/Magic/spellbooks.rsi/spellbook.png
#	Resources/Textures/Objects/Misc/books.rsi/book0.png
#	Resources/Textures/Objects/Misc/books.rsi/book1.png
#	Resources/Textures/Objects/Misc/books.rsi/book2.png
#	Resources/Textures/Objects/Misc/books.rsi/book3.png
#	Resources/Textures/Objects/Misc/books.rsi/book4.png
#	Resources/Textures/Objects/Misc/books.rsi/book5.png
#	Resources/Textures/Objects/Misc/books.rsi/book6.png
#	Resources/Textures/Objects/Misc/books.rsi/book7.png
#	Resources/Textures/Objects/Misc/books.rsi/book8.png
#	Resources/Textures/Objects/Misc/books.rsi/book_bar.png
#	Resources/Textures/Objects/Misc/books.rsi/book_boneworking.png
#	Resources/Textures/Objects/Misc/books.rsi/book_borg.png
#	Resources/Textures/Objects/Misc/books.rsi/book_chemistry.png
#	Resources/Textures/Objects/Misc/books.rsi/book_cooking.png
#	Resources/Textures/Objects/Misc/books.rsi/book_demonomicon.png
#	Resources/Textures/Objects/Misc/books.rsi/book_detective.png
#	Resources/Textures/Objects/Misc/books.rsi/book_engineering.png
#	Resources/Textures/Objects/Misc/books.rsi/book_engineering2.png
#	Resources/Textures/Objects/Misc/books.rsi/book_fish.png
#	Resources/Textures/Objects/Misc/books.rsi/book_hacking.png
#	Resources/Textures/Objects/Misc/books.rsi/book_hydroponics_pod_people.png
#	Resources/Textures/Objects/Misc/books.rsi/book_infections.png
#	Resources/Textures/Objects/Misc/books.rsi/book_nuclear.png
#	Resources/Textures/Objects/Misc/books.rsi/book_origami.png
#	Resources/Textures/Objects/Misc/books.rsi/book_particle_accelerator.png
#	Resources/Textures/Objects/Misc/books.rsi/book_space_law.png
#	Resources/Textures/Objects/Misc/books.rsi/meta.json
2024-04-02 11:32:48 +03:00
PJBot
bd5031fd9e Automatic changelog update 2024-04-02 05:19:43 +00:00
PJBot
c9374969b1 Automatic changelog update 2024-04-02 05:18:38 +00:00
Simon
307a1c534d
Make cyborgs hands explosion proof. (#26515)
* Make the advanced treatment modules beakers explosion-proof.

* undo changes

* Epic rename fail

* Explosion recursion data field

* Logic for data field
2024-04-01 22:18:31 -07:00
osjarw
5d31335f98
Fixed air injector visuals (#26654) 2024-04-01 22:17:26 -07:00
PJBot
a4d46091e0 Automatic changelog update 2024-04-02 00:51:49 +00:00
osjarw
4b0f47c95b
Resprite ambuzol plus pills (#26651) 2024-04-01 20:50:43 -04:00
PJBot
144798ba75 Automatic changelog update 2024-04-01 21:01:16 +00:00
Ed
7464d8284c
Infinity books (#25840)
* setup text data

* roundstart reshuffling keywords with gibberish words

* saved data categorized

* add book with hints

* start redrawing books

* +4 book design

* +books +random visual upgrade

* finish first file

* finish lore file

* finish with books.rsi now authorbooks.rsi...

* aurora! and some fix

* nuke author books

* speelbuke update

* finish respriting work

* fix scientist guide visual

* setup datasets

* setup stupid funny random story

* restore author books, upgrade hint generation

* add variety to story generator

* add learning system

* minor textgen edit

* file restruct, hint count variation

* more restruct

* more renaming
add basis learning system logic. Spears locked for special book for test.

* nuke all systems, for splitting PR gods

* typo fix

* update migration with deleted books

* add random story books to maint

* Update construction-system.ftl

* Update Resources/Prototypes/Datasets/Names/books.yml

Co-authored-by: chromiumboy <50505512+chromiumboy@users.noreply.github.com>

* Update Resources/Prototypes/Datasets/Names/books.yml

Co-authored-by: chromiumboy <50505512+chromiumboy@users.noreply.github.com>

* Update Resources/Prototypes/Datasets/Names/books.yml

Co-authored-by: chromiumboy <50505512+chromiumboy@users.noreply.github.com>

* Update Resources/Prototypes/Datasets/Names/books.yml

Co-authored-by: chromiumboy <50505512+chromiumboy@users.noreply.github.com>

* Update Resources/Prototypes/Datasets/Names/books.yml

Co-authored-by: chromiumboy <50505512+chromiumboy@users.noreply.github.com>

* Update Resources/Prototypes/Datasets/Names/books.yml

Co-authored-by: chromiumboy <50505512+chromiumboy@users.noreply.github.com>

* Update Resources/Prototypes/Datasets/Names/books.yml

Co-authored-by: Hrosts <35345601+Hrosts@users.noreply.github.com>

* Update Resources/Prototypes/Datasets/Names/books.yml

Co-authored-by: chromiumboy <50505512+chromiumboy@users.noreply.github.com>

* Update Resources/Prototypes/Datasets/Names/books.yml

Co-authored-by: chromiumboy <50505512+chromiumboy@users.noreply.github.com>

* Update Resources/Prototypes/Datasets/Names/books.yml

Co-authored-by: chromiumboy <50505512+chromiumboy@users.noreply.github.com>

* Update Resources/Prototypes/Datasets/Names/books.yml

Co-authored-by: chromiumboy <50505512+chromiumboy@users.noreply.github.com>

* Update Resources/Prototypes/Datasets/Names/books.yml

Co-authored-by: chromiumboy <50505512+chromiumboy@users.noreply.github.com>

* typo fix

* interchangeably

* final

* Update Resources/Prototypes/Datasets/Names/books.yml

Co-authored-by: Hrosts <35345601+Hrosts@users.noreply.github.com>

* "."

* Update Content.Server/Paper/PaperRandomStorySystem.cs

Co-authored-by: Hrosts <35345601+Hrosts@users.noreply.github.com>

* Ubazer fix

* inadequate

* localized

* Update meta.json

* fuck merge conflicts

* fix jani book

---------

Co-authored-by: chromiumboy <50505512+chromiumboy@users.noreply.github.com>
Co-authored-by: Hrosts <35345601+Hrosts@users.noreply.github.com>
2024-04-01 14:00:10 -07:00
PJBot
eace2378e7 Automatic changelog update 2024-04-01 20:50:07 +00:00
Sk1tch
bc31c193c2
Added chat window transparency slider to options (#24990)
* Adds a new slider to the misc tab in options that lets the player set chat window transparency

* Tweaked variable names

* Fixed order to match UI

* Renamed set chat window transparency function

* Changed and refactored to opacity instead of transparency

* Remove unnecessary int to float conversions

Slider used to be 0-100 while the CCVar was 0.0-1.0f. This is confusing and was only used for rounding to 2 decimal points.

* Round the value to two decimal points

* Remove rounding for now

* Rename

* Unhardcode chat color by moving to stylesheet

* Fix indent

* Make opacity slider only change opacity

---------

Co-authored-by: Your Name <you@example.com>
Co-authored-by: ShadowCommander <10494922+ShadowCommander@users.noreply.github.com>
2024-04-01 13:48:02 -07:00
eoineoineoin
a05f95269f
Fix clipping/overlap in lathe machine UIs (#26646)
* Add scrollbars to lathe material list when necessary

* Fix bug where shrinking window would cause elements to overlap

---------

Co-authored-by: Eoin Mcloughlin <helloworld@eoinrul.es>
2024-04-01 19:36:07 +11:00
PJBot
5e15abc5ed Automatic changelog update 2024-04-01 08:30:19 +00:00
Ed
a4ec01d471
Anomalies behaviours (#24683)
* Added new anomaly particle

* Add basic anomaly behaviour

* +2 parametres

* add functional to new particle

* add components to behaviours

* big content

* add shuffle, moved thing to server

* clean up

* fixes

* random pick redo

* bonjour behavioUr

* fix AJCM

* fix

* add some new behaviours

* power modifier behaviour

* rmeove timer

* new event for update ui fix

* refactor!

* fixes

* enum

* Fix mapinit

* Minor touches

---------

Co-authored-by: metalgearsloth <comedian_vs_clown@hotmail.com>
2024-04-01 19:29:13 +11:00
PJBot
de8b788856 Automatic changelog update 2024-04-01 07:21:43 +00:00
f0x-n3rd
085a71eac8
Changes in chemicals page in guidebook (#25831)
* Added pages to chemical categories

The chemical categories have their own page now. Added the "Chemical Tabs" in /ServerInfo/Guidebook. Moved the Chemicals code from shiftsandjobs.yml to its own .yml file which is "chemicals.yml".

* Update guides.ftl

* Update chemicals.yml

Changed the guide entry's ID for the medical tab from Medicine to Medicinal.
Hope this works...

* Update Resources/ServerInfo/Guidebook/Chemical Tabs/Biological.xml

Co-authored-by: exincore <me@exin.xyz>

* Update Resources/ServerInfo/Guidebook/Chemical Tabs/Foods.xml

Co-authored-by: exincore <me@exin.xyz>

* Update Resources/ServerInfo/Guidebook/Chemical Tabs/Elements.xml

Co-authored-by: exincore <me@exin.xyz>

* Update Resources/ServerInfo/Guidebook/Chemical Tabs/Narcotics.xml

Co-authored-by: exincore <me@exin.xyz>

* Update Resources/ServerInfo/Guidebook/Chemical Tabs/Toxins.xml

Co-authored-by: exincore <me@exin.xyz>

* Fixed a few errors and stuff!

A few typos have been fixed thanks to exincore. Added dedicated .xml files to be used for the dedicated category pages (Medicinal and Botanical pages). Made it so it doesn't use any duplicated IDs anymore.
If there's more problems, please do tell so I can fix it!

* Update settings.json

* Fix?

---------

Co-authored-by: exincore <me@exin.xyz>
2024-04-01 07:20:37 +00:00
IProduceWidgets
da69b0ab49
Add ERT Chaplain (#25956)
* ERT Chaplain

* Make BibleUser

* It was not intended

* reword my poor words

* 1984 a comment that I decided was unnecessary.

* Update Resources/Prototypes/Entities/Clothing/OuterClothing/hardsuits.yml

---------

Co-authored-by: metalgearsloth <31366439+metalgearsloth@users.noreply.github.com>
2024-04-01 17:48:49 +11:00
PJBot
16e3aed249 Automatic changelog update 2024-04-01 06:42:20 +00:00
Firewatch
ea3e98e120
Bartender "Essentials" (#25367)
* drinks round 1

saving my progress before my hard drive explodes

* test 2

please work

* name fixes

whoops

* Update drinks.yml

* various fixes

am dumb

* add sol dry to vends

more fixes and changes, yippee!

* more fixes & ingame testing

shrimple tests

* last fixes :trollface:

should be ready for pr now

* Update soda.yml

sate thirst
2024-04-01 17:41:14 +11:00
Wrexbe (Josh)
5613c3d3dd
Refactored AdvertiseComponent (#26598)
* Made it better

* ok

* alright

---------

Co-authored-by: wrexbe <wrexbe@protonmail.com>
2024-04-01 17:36:31 +11:00
nikthechampiongr
2ffd616c41
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
2024-04-01 17:31:36 +11:00
deltanedas
1db178b632
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>
2024-04-01 17:27:39 +11:00
PJBot
d9b6e9f127 Automatic changelog update 2024-04-01 06:07:20 +00:00
c4llv07e
64bb8dbdd5
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>
2024-04-01 17:06:13 +11:00
PJBot
72bdcac1e2 Automatic changelog update 2024-04-01 04:51:06 +00:00
SlamBamActionman
bed9e9ac6a
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>
2024-04-01 15:50:00 +11:00
PJBot
cc35f16839 Automatic changelog update 2024-04-01 04:36:27 +00:00
Keer-Sar
cf7567d073
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
2024-04-01 15:35:21 +11:00
PJBot
8c5e236de4 Automatic changelog update 2024-04-01 04:22:17 +00:00
SoulFN
83766b5d20
Change assault borg modules texture (#26502)
* Update borg_modules.yml

* Fix borg_modules.yml?

* Uh

---------

Co-authored-by: metalgearsloth <comedian_vs_clown@hotmail.com>
2024-04-01 15:21:11 +11:00
metalgearsloth
b7a6fb991f
Add ValueList import (#26640) 2024-04-01 14:41:57 +11:00
PJBot
246155bd37 Automatic changelog update 2024-04-01 03:40:40 +00:00
Tayrtahn
d0d12760a8
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>
2024-04-01 14:39:34 +11:00
PJBot
d8d4feec38 Automatic changelog update 2024-04-01 03:25:06 +00:00
Flareguy
29d7b73da7
Gives all wheeled objects low friction (#26601)
* gives all wheeled objects friction

* adjustments to sum stuff
2024-03-31 20:23:59 -07:00