Commit graph

29369 commits

Author SHA1 Message Date
SplikZerys
dffc8a9e1d
Added new TTS-voice - Pudge from Dota 2 (#443) 2024-10-03 02:24:08 +03:00
SplikZerys
66f9ffd84b changelog update 2024-10-02 18:29:38 +03:00
SplikZerys
4f2bd141c2 Merge remote-tracking branch 'sunrise-station-public/master' into sunrise-public-master 2024-10-02 18:27:37 +03:00
SplikZerys
ca104cf0cb fixed all our maps 2024-10-02 18:26:47 +03:00
VigersRay
940710da9e Merge remote-tracking branch 'refs/remotes/wizards/master'
# Conflicts:
#	Resources/Prototypes/Catalog/Fills/Lockers/heads.yml
#	Resources/Textures/Tiles/attributions.yml
#	Resources/Textures/Tiles/green_circuit.png
#	Resources/Textures/Tiles/steel.png
2024-10-02 15:50:00 +03:00
VigersRay
e69da2e561 гиб палка делает бам-бам-бам 2024-10-02 15:49:21 +03:00
VigersRay
9ba87959ef Временно убрал Трейн и Рич, пока не будет добавлена проверка на запуск карты. 2024-10-02 15:48:17 +03:00
SplikZerys
6450442ce0 changelog update 2024-10-02 15:35:39 +03:00
SplikZerys
6630824fd2 fixed atmos on delta station 2024-10-02 15:34:31 +03:00
Flareguy
4ad4fd42b1
Steel tile variantization fix (#32596)
steel tile variantization fix
2024-10-02 14:14:44 +02:00
PJBot
58c8a07d2c Automatic changelog update 2024-10-02 12:01:37 +00:00
FluffMe
8961dd35a5
Fix accidental erase of paper contents by spamming save action (#32598)
Fix spammable paper save issue
2024-10-02 14:00:31 +02:00
PJBot
9b4df5b452 Automatic changelog update 2024-10-02 11:45:17 +00:00
deltanedas
8b14e2534d
fix instigator not existing (#32597)
Co-authored-by: deltanedas <@deltanedas:kde.org>
2024-10-02 13:44:11 +02:00
lzk
c55e311c7e
Cleanup pins.yml (#32593)
* Cleanup pins.yml

* oh my

* forgor
2024-10-02 13:23:32 +02:00
PJBot
612732fb84 Automatic changelog update 2024-10-02 10:54:25 +00:00
lzk
edc83b2fab
cleanup and fix dinky star (#32594)
* cleanup dinky star

* fix

* oh
2024-10-02 12:53:19 +02:00
SplikZerys
de24a96613 changelog update 2024-10-02 13:34:10 +03:00
SplikZerys
37ab24f8f5 fixed delta and replaced SMESBasic with SMESExtended 2024-10-02 13:33:03 +03:00
PJBot
7b39d146d3 Automatic changelog update 2024-10-02 09:38:55 +00:00
Toly65
ea3b14faac
Bandaid fix to entityeffects on plant trays (#32576)
prevented the bioluminescent and slippery effects from being applied to the plant (and thus the plant tray)
2024-10-02 11:37:49 +02:00
SplikZerys
7d99bc69b9 changelog update 2024-10-02 12:07:42 +03:00
SplikZerys
40696fbe1a fixed delta.yml 2024-10-02 12:03:23 +03:00
SplikZerys
9e3c1192ad fix newera uplink 2024-10-02 09:38:20 +03:00
PJBot
5a229e7a2b Automatic changelog update 2024-10-02 06:19:03 +00:00
ArchRBX
dd12ac1f8a
MedTek Cartridge (#32450)
* initial commit

* adds cartridge to cmo's locker

* tidies up yml, adds default scanner sound, makes it so the silent property silences the scanner sound too

* fixes ert medic pda not having it preinstalled

* adds attribution

* removes redundant dependencies

* fix agent pda

---------

Co-authored-by: archrbx <punk.gear5260@fastmail.com>
2024-10-01 23:17:57 -07:00
SplikZerys
27ee3abaa8 Revert "Proton (#420)"
This reverts commit 939249a3
2024-10-02 09:05:30 +03:00
SplikZerys
aa18729e0f
NO REACH (#441) 2024-10-02 08:45:53 +03:00
PJBot
c4c786f08d Automatic changelog update 2024-10-02 05:36:54 +00:00
TakoDragon
542817807d
Red circuit floor (#32557)
* red circuit added

* index colour begone
2024-10-01 23:35:48 -06:00
PJBot
b364894228 Automatic changelog update 2024-10-02 05:34:42 +00:00
TakoDragon
936917cd05
Hydroponics doors (#32575)
* spriting done

* yml hydro updates

* Named wrong thing and forgot it inherets
2024-10-01 23:33:35 -06:00
Preston Smith
2df61e4e71
Added LV cables to Marathon SMES room (#32574)
Added LV cables to SMES room, powering light and computers.
2024-10-01 23:30:58 -06:00
PJBot
95f20f13dc Automatic changelog update 2024-10-02 05:28:07 +00:00
Plykiya
2a07e4666a
Fix quick-swap stacks of items (#32560)
* remove picking up stack on quick swap

* better
2024-10-02 15:27:01 +10:00
VigersRay
0411cce1e3 Merge remote-tracking branch 'refs/remotes/wizards/master' 2024-10-02 08:13:26 +03:00
VigersRay
bd918bc542 никакого веселья 2024-10-02 08:13:17 +03:00
GayBot
51b2b26c63 Automatic changelog update 2024-10-02 08:03:43 +03:00
SplikZerys
00acc8a9ff
NEWERA STATION SPONSOR THINGS (#435) 2024-10-02 08:04:28 +03:00
SplikZerys
cb8e240bc3
Added new TTS-voice - Riki from Dota 2 (#434) 2024-10-02 08:04:07 +03:00
PJBot
cfc723e3f8 Automatic changelog update 2024-10-02 05:01:54 +00:00
metalgearsloth
4ca2a2bb8f
Fix sensors blocking doors (#32591) 2024-10-01 23:00:48 -06:00
VigersRay
d9003082e0 мини фикс апстрима 2024-10-02 06:54:41 +03:00
VigersRay
b1cac7e781 Merge remote-tracking branch 'refs/remotes/wizards/master'
# Conflicts:
#	Content.Client/Chat/Managers/IChatManager.cs
#	Content.Client/IoC/ClientContentIoC.cs
#	Content.Server/Administration/Systems/BwoinkSystem.cs
#	Content.Server/Chat/Managers/ChatManager.cs
#	Content.Server/GameTicking/GameTicker.Player.cs
#	Resources/Audio/Machines/attributions.yml
#	Resources/Locale/en-US/_strings/administration/commands/custom-vote-command.ftl
#	Resources/Locale/en-US/_strings/discord/vote-notifications.ftl
#	Resources/Locale/en-US/_strings/npc/firebot.ftl
#	Resources/Locale/en-US/_strings/paper/syndicate-business-card.ftl
#	Resources/Locale/en-US/_strings/store/uplink-catalog.ftl
#	Resources/Prototypes/Entities/Objects/Specific/Robotics/borg_modules.yml
#	Resources/Prototypes/Recipes/Crafting/bots.yml
#	Resources/Textures/Objects/Misc/bureaucracy.rsi/meta.json
#	Resources/Textures/Structures/Walls/solid.rsi/reinf_over0.png
2024-10-02 06:45:10 +03:00
GayBot
2cab08618f Automatic changelog update 2024-10-02 06:38:48 +03:00
Rinary
e39dfe9e64
Мехи (#415)
* initial commit

* some sprites

* mech weapons

* syndi mechs to nuke ops uplink

* some loadouts to Nanotrasen mechs

* spawn mark filled mechs

* construction graphs

* researchable mechs

* i forgor

* locale changes

* aaa

* minor translate(big, later)

* fix items in hands

* fix

* upd translate

* translate electronics

* translate mech weapons

* translate

* translate const

* fix rsi

* fix

* fix

---------

Co-authored-by: NULL882 <gost6865@yandex.ru>
Co-authored-by: VigersRay <vigersray@gmail.com>
2024-10-02 06:39:12 +03:00
GayBot
c3d13c348a Automatic changelog update 2024-10-02 06:35:33 +03:00
Rinary
7850a15234
Ребаланс ОСЩ (#407)
* init

* upd age req
2024-10-02 06:35:58 +03:00
VigersRay
2a523b73d3 Ну а чо я? Я ничо 2024-10-02 06:33:00 +03:00
PJBot
b050e8332e Automatic changelog update 2024-10-02 03:23:15 +00:00