Commit graph

32253 commits

Author SHA1 Message Date
lzk
0ea3cf25b7
fix guidebook typo (#2645) 2024-10-22 18:57:07 +02:00
lzk
04dbd2103d
Add more tts sanitize (#2689) 2024-10-22 18:55:06 +02:00
NotSoDamn
997aec27e9
[Maps] Glacier hotfix #4 (#2701) 2024-10-22 19:16:34 +03:00
IanComradeBot
cf6ae499ce Automatic changelog update 2024-10-22 05:51:56 +00:00
Ko4ergaPunk
c9f8428f3a
Corvax Ruins (#2700) 2024-10-22 08:49:46 +03:00
IanComradeBot
9e1ffc09f4 Automatic changelog update 2024-10-21 16:09:03 +00:00
NotSoDamn
6cb0806664
[Maps] Glacier Major update (#2699) 2024-10-21 19:04:58 +03:00
IanComradeBot
5579c9c030 Automatic changelog update 2024-10-21 00:28:10 +00:00
TiFeRi
d2633c4a4d
[Maps] Paper hotfix (#2698) 2024-10-21 03:24:57 +03:00
IanComradeBot
a688f80979 Automatic changelog update 2024-10-20 21:01:01 +00:00
Meguneri
ae882de127
[Maps] Maus halloween (#2697) 2024-10-20 23:57:29 +03:00
IanComradeBot
c4fdca5c88 Automatic changelog update 2024-10-20 18:55:36 +00:00
Ko4ergaPunk
155667a936
[Maps] Avrite, Pilgrim, Tushkan halloween (#2696) 2024-10-20 21:52:54 +03:00
IanComradeBot
4c51b9c08c Automatic changelog update 2024-10-20 17:46:27 +00:00
Doctorjakes
45a3f7f592
[Maps] Silly halloween (#2694) 2024-10-20 20:43:53 +03:00
IanComradeBot
bd7d87972c Automatic changelog update 2024-10-20 17:20:45 +00:00
Stubaretka24
e241e5c821
[Maps] Awesome halloween (#2695) 2024-10-20 20:12:38 +03:00
IanComradeBot
785918a389 Automatic changelog update 2024-10-20 15:57:05 +00:00
lastPechkin
0c62c03499
[Maps] Astra halloween (#2691) 2024-10-20 18:54:27 +03:00
IanComradeBot
8bf0040cfb Automatic changelog update 2024-10-20 05:07:22 +00:00
Doctorjakes
1585d2b781
[Maps] Silly Island (#2690) 2024-10-20 08:04:28 +03:00
IanComradeBot
4d83dd4435 Automatic changelog update 2024-10-19 04:07:01 +00:00
MureixloI
e1fce96843
[Resprite] Some scraps (#2692) 2024-10-19 16:04:59 +12:00
lzk
87496d0ded
make meteorswarms later again (#2659) 2024-10-17 02:30:34 +03:00
lzk
09bf99a81a
remove bad name from datasets (#2684) 2024-10-16 21:13:18 +02:00
lzk
f16991f187
fix hydro airlock (#2683) 2024-10-16 18:35:53 +02:00
IanComradeBot
b252b4e87c Automatic changelog update 2024-10-16 16:14:03 +00:00
Ko4ergaPunk
ba6d770ffb
[Maps] Pilgrim update #6 (#2681) 2024-10-16 19:06:06 +03:00
IanComradeBot
8e97ed3b8e Automatic changelog update 2024-10-16 05:53:06 +00:00
SonicHDC
ddca85f165
Hydroponics airlocks resprite (#2679) 2024-10-16 17:50:03 +12:00
IanComradeBot
179dda8f12 Automatic changelog update 2024-10-15 23:07:24 +00:00
MureixloI
4fefe8f90c
Resprite intercom's panel & fix robes sprites (#2670) 2024-10-16 11:03:29 +12:00
IanComradeBot
4d9e365cb9 Automatic changelog update 2024-10-15 18:17:56 +00:00
Meguneri
2f1bf3fca6
[Maps] Maus update (#2674) 2024-10-15 21:03:37 +03:00
IanComradeBot
72c08fdcad Automatic changelog update 2024-10-15 17:59:53 +00:00
Stubaretka24
a05b6083c7
[Maps] Awesome MachineGun Fix (#2675) 2024-10-15 20:56:12 +03:00
Morb
5c487f1213
Merge pull request #2677 from space-syndicate/upstream-sync
Upstream sync
2024-10-15 19:23:23 +03:00
Morb0
807791cd2a Update locale 2024-10-15 18:48:35 +03:00
Morb0
70c93b5fa4 Merge branch 'master' into upstream-sync 2024-10-15 18:43:40 +03:00
Evgencheg
c6264ee41a
Fix locale scripts (#2648)
Co-authored-by: mhamster <81412348+mhamsterr@users.noreply.github.com>
Co-authored-by: Morb0 <14136326+Morb0@users.noreply.github.com>
2024-10-15 18:41:27 +03:00
Morb0
74885605cf Fix upstream 2024-10-15 18:13:43 +03:00
Morb0
0eba25c0eb Merge remote-tracking branch 'wizards/master' into upstream-sync
# Conflicts:
#	.github/CODEOWNERS
#	Content.Server/GameTicking/Rules/NukeopsRuleSystem.cs
#	Content.Server/Station/Systems/StationSpawningSystem.cs
#	Resources/Prototypes/GameRules/events.yml
#	Resources/Prototypes/GameRules/midround.yml
#	Resources/Prototypes/GameRules/roundstart.yml
#	Resources/Prototypes/Loadouts/loadout_groups.yml
#	Resources/Textures/Clothing/Head/Hats/warden.rsi/equipped-HELMET.png
#	Resources/Textures/Clothing/Head/Hats/warden.rsi/meta.json
#	Resources/Textures/Clothing/Uniforms/Jumpskirt/ce.rsi/equipped-INNERCLOTHING.png
#	Resources/Textures/Clothing/Uniforms/Jumpskirt/ce.rsi/icon.png
#	Resources/Textures/Clothing/Uniforms/Jumpskirt/ce_turtle.rsi/equipped-INNERCLOTHING-monkey.png
#	Resources/Textures/Clothing/Uniforms/Jumpskirt/ce_turtle.rsi/equipped-INNERCLOTHING.png
#	Resources/Textures/Clothing/Uniforms/Jumpskirt/ce_turtle.rsi/icon.png
#	Resources/Textures/Clothing/Uniforms/Jumpskirt/ce_turtle.rsi/inhand-left.png
#	Resources/Textures/Clothing/Uniforms/Jumpskirt/ce_turtle.rsi/inhand-right.png
#	Resources/Textures/Clothing/Uniforms/Jumpskirt/ce_turtle.rsi/meta.json
#	Resources/Textures/Clothing/Uniforms/Jumpsuit/ce.rsi/equipped-INNERCLOTHING-monkey.png
#	Resources/Textures/Clothing/Uniforms/Jumpsuit/ce.rsi/equipped-INNERCLOTHING.png
#	Resources/Textures/Clothing/Uniforms/Jumpsuit/ce.rsi/icon.png
#	Resources/Textures/Clothing/Uniforms/Jumpsuit/ce.rsi/meta.json
#	Resources/Textures/Clothing/Uniforms/Jumpsuit/ce_turtle.rsi/equipped-INNERCLOTHING-monkey.png
#	Resources/Textures/Clothing/Uniforms/Jumpsuit/ce_turtle.rsi/equipped-INNERCLOTHING.png
#	Resources/Textures/Clothing/Uniforms/Jumpsuit/ce_turtle.rsi/icon.png
#	Resources/Textures/Clothing/Uniforms/Jumpsuit/ce_turtle.rsi/inhand-left.png
#	Resources/Textures/Clothing/Uniforms/Jumpsuit/ce_turtle.rsi/inhand-right.png
#	Resources/Textures/Clothing/Uniforms/Jumpsuit/ce_turtle.rsi/meta.json
#	Resources/Textures/Structures/Wallmounts/posters.rsi/meta.json
2024-10-15 17:04:40 +03:00
PJBot
d871313899 Automatic changelog update 2024-10-15 08:29:36 +00:00
K-Dynamic
7e2c6ea3ea
Adds nitrogen to engi tank dispenser (#32565)
nitrogen to engi tank dispenser
2024-10-15 10:28:28 +02:00
PJBot
7532d6f26e Automatic changelog update 2024-10-14 22:00:15 +00:00
Ada
a7741fe9e2
Arcade Prize Additions (#32309)
* rearranged existing arcade rewards for clarity and added more

* removed tesla toy

* removed plushie throngler

* removed singularity toy, readded tesla toy

* removed tesla toy again :(

* Readded accidentally removed PlushieRainbowLizard
2024-10-14 23:59:07 +02:00
NotSoDamn
c326f58bb6
fix locale (#2672) 2024-10-14 21:21:17 +02:00
NotSoDamn
b9de29468b
tweak SmartFridge locale name (#2671) 2024-10-14 20:02:36 +02:00
mubururu_
6654e00411
organ sprite touch-ups (#32762)
* does work?

* fix

* shrunk organs to normal size of small

* made brains and liver look better

* made stomach slightly less bright

* unique sprite for diona lungs + inhands

* unique sprite for vox lungs + inhands
2024-10-14 13:32:32 +02:00
scrivoy
8c17624896
Marathon: Add EVA Helmets to Perma and add Disposal Unit front of Atmos (#32799)
add: EVA helmets to perma, disposals bin atmos
2024-10-14 05:23:41 -06:00