Commit graph

11739 commits

Author SHA1 Message Date
Arthur
e4ffbc56e9 Try remove only one label on approve 2022-07-31 21:11:52 +03:00
Arthur
df603cc904 Return Github wiki WIKI_PAGE_ROOT 2022-07-29 23:50:24 +03:00
IanComradeBot
2a5e66db47 Automatic changelog update 2022-07-29 20:21:59 +00:00
lapatison
9a0b229958
Перевод последнего обновления (#331)
* Update blocking.ftl

* Update internals.ftl

* Update sleep.ftl

* Update admin-announce-window.ftl

* Update player-actions-window.ftl

* Update medibot.ftl

* Update chat-manager.ftl

* Update reagent-effects.ftl

* Update communications-console-component.ftl

* Update disease.ftl

* Update port-selector.ftl

* Update reptilian.ftl

* Update pda-component.ftl

* Update frezon.ftl

* Update gases.ftl

* Update toxins.ftl

* Update gas_tanks.ftl

* Update base_clothinghead.ftl

* Update cloaks.ftl

* Update misc_roles.ftl

* Update bots.ftl

* Update silicon.ftl

* Update base.ftl

* Update dwarf.ftl

* Update human.ftl

* Update reptilian.ftl

* Update human.ftl

* Update dwarf.ftl

* Update skeleton.ftl

* Update slime.ftl

* Update vox.ftl

* Update pda.ftl

* Update identification_cards.ftl

* Update gas_tanks.ftl

* Update miners.ftl

* Update gas_canisters.ftl

* Update wires-component.ftl

* Update ammunition.ftl

* Update admin-announce-window.ftl

* Update diagnoser.ftl

* Update job-supervisors.ftl

* Update salvage-system.ftl

* Update general.ftl

* Update security.ftl

* Update jumpskirts.ftl

* Update vox.ftl

* Update human.ftl

* Update drinks.ftl

* Update headsets_alt.ftl

* Update Resources/Locale/ru-RU/wires/components/wires-component.ftl

Co-authored-by: Morber <14136326+Morb0@users.noreply.github.com>

* Update human.ftl

* Update human.ftl

* Update dummy_npcs.ftl

* Update dwarf.ftl

Co-authored-by: Morber <14136326+Morb0@users.noreply.github.com>
2022-07-29 23:20:56 +03:00
Arthur
3474f82f03 Use Github secrets for wiki upload workflow 2022-07-29 20:42:29 +03:00
Morber
61fd72d3f6
Merge pull request #330 from space-syndicate/upstream-sync
Upstream sync
2022-07-29 20:10:24 +03:00
Arthur
19f86b66cc Update locale 2022-07-29 19:57:26 +03:00
Arthur
bd0d76ae0b Merge remote-tracking branch 'upstream/master' into upstream-sync 2022-07-29 19:54:41 +03:00
PJBot
8a2f40f39e Automatic changelog update 2022-07-29 12:23:32 -04:00
Leon Friedrich
98247de13b
Submodule Update (#10135) 2022-07-30 02:22:19 +10:00
Arthur
08c25d5870 Remove clothing component from special operations officer cloak 2022-07-29 18:21:37 +03:00
Arthur
b877259791 Merge remote-tracking branch 'upstream/master' into upstream-sync
# Conflicts:
#	.github/PULL_REQUEST_TEMPLATE.md
#	Content.Server/GameTicking/GameTicker.RoundFlow.cs
#	Resources/Prototypes/Entities/Clothing/Neck/cloaks.yml
#	Resources/Prototypes/Entities/Objects/Materials/Sheets/other.yml
2022-07-29 17:59:17 +03:00
Emisse
63212c8e69
Bagel Update 14.6 (#10130)
* Bagel 14.6

* bagle
2022-07-29 04:28:47 -05:00
Emisse
2750c5c0e4
bogs (#10131) 2022-07-29 04:28:37 -05:00
Emisse
4e44f610cf
marathon 2.8 (#10132) 2022-07-29 04:28:27 -05:00
Jackson
5084665643
Salvage magnet accuracy fix (#10124) 2022-07-28 21:05:01 -07:00
PJBot
750b009df3 Automatic changelog update 2022-07-28 23:15:00 -04:00
Rane
47e84d9d54
Make miasma start being visible later (#10128) 2022-07-28 20:13:56 -07:00
Leon Friedrich
c621712f49
Submodule Update (#10126) 2022-07-29 12:19:10 +10:00
Leon Friedrich
ebe6093af1
Pulling state handling changes (#9952) 2022-07-29 12:13:43 +10:00
Leon Friedrich
7cf67e1323
Move some default window positions (#10007) 2022-07-29 12:13:22 +10:00
Leon Friedrich
c7ad6b709e
Audio System Rejig (#9635) 2022-07-29 12:13:12 +10:00
PJBot
05ee746efb Automatic changelog update 2022-07-28 21:24:14 -04:00
corentt
6b8bb10766
allow syringes in medical belts (#10113) 2022-07-29 11:23:11 +10:00
PJBot
b65a10ddba Automatic changelog update 2022-07-28 21:03:12 -04:00
Leon Friedrich
d279f6172a
Fix item/clothing visual & networking bugs (#10116) 2022-07-28 18:02:09 -07:00
PJBot
e22679501c Automatic changelog update 2022-07-28 21:00:49 -04:00
Rane
b8be23004b
Latejoin traitors (#9783) 2022-07-28 17:59:45 -07:00
PJBot
3433ecee77 Automatic changelog update 2022-07-28 19:22:52 -04:00
Leon Friedrich
47970f2abb
Fix identity bug (#10117) 2022-07-29 09:21:47 +10:00
metalgearsloth
4c298c243a
Don't allow nullspace FTL (#10110)
* Don't allow nullspace FTL

Because other systems are my problemo now.

* Also this
2022-07-28 23:30:42 +10:00
IanComradeBot
7563433a32 Automatic changelog update 2022-07-28 08:22:38 +00:00
lapatison
36b6a5cd91
Фикс перевода одежды священника (#329)
* Update wardrobe.ftl

* Update paper.ftl

* Update jumpskirts.ftl

* Update jumpsuits.ftl
2022-07-28 11:21:35 +03:00
metalgearsloth
ac67ae7b1e
Fix FTL exception (#10099)
Will also just log in future so we know what did it.
2022-07-28 16:27:23 +10:00
PJBot
8caae58a95 Automatic changelog update 2022-07-27 19:33:46 -04:00
Nemanja
b39462c722
missing sprites for syndi bags (#9956) 2022-07-28 09:32:43 +10:00
Rane
38a8a22e5a
Throwing event improvements (#10055) 2022-07-28 09:28:23 +10:00
Leon Friedrich
9020ec6045
yaml linter fix & alert sprite specifier changes (#10015)
* Sprite specifier/serializer update

* Immume

* Fix tests

* hooray, more bad test prototypes

* add some comments
2022-07-28 09:17:51 +10:00
PJBot
4fbf8cb349 Automatic changelog update 2022-07-27 19:16:08 -04:00
FunkySphere
862789edab
renamed mime suit to mime jumpskirt (#9889) 2022-07-28 09:15:04 +10:00
Moony
c6a3c8d547
Rectifying attribution error(s). (#10090)
* Rctifying attribution error(s).

* Update copyright.txt

* Update Resources/Textures/Tiles/copyright.txt

Co-authored-by: ZeWaka <zewakagamer@gmail.com>

Co-authored-by: ZeWaka <zewakagamer@gmail.com>
2022-07-27 14:14:49 -05:00
PJBot
7b4008144f Automatic changelog update 2022-07-27 10:19:19 -04:00
Peptide90
b85b89bef2
ramen description fix (#10078) 2022-07-27 07:18:15 -07:00
metalgearsloth
55692d4d71
Revert map PRs (#10079)
* Revert "Fix Saltern cvar (#10077)"

This reverts commit 0f0420eca9.

* Revert "Map ID fixes (Take 2) (#10075)"

This reverts commit c15e14676d.
2022-07-27 22:27:23 +10:00
metalgearsloth
2f883cad6b
Cleanup species prototypes a bit (#9513)
* Cleanup species prototypes a bit

Skeletons were very stale because they didn't inherit from mobhuman but now they should have similar components as every other species.

I also added a generic abstract base species to make custom species easier (where they may not want to have humans COUGH VILOUS).

* a

* drugs

* gonflicts

* no more conflicts I beg
2022-07-27 20:54:23 +10:00
Kara
258ec0cac1
Clothing/item ECS & cleanup (#9706) 2022-07-27 03:53:47 -07:00
metalgearsloth
0f0420eca9
Fix Saltern cvar (#10077) 2022-07-27 05:37:20 -05:00
Kara
6c30726c7b
freon fixes (#10076) 2022-07-27 03:17:33 -07:00
Peptide90
c15e14676d
Map ID fixes (Take 2) (#10075) 2022-07-27 03:13:55 -07:00
PJBot
dc9ebb01b6 Automatic changelog update 2022-07-27 05:56:31 -04:00