Commit graph

14112 commits

Author SHA1 Message Date
Morb
96dc673904
Replace Lawyer with IAA for Europa station (#1413) 2023-09-13 23:51:33 +03:00
Morb0
5f3e6c4716 Fix maps 2023-09-13 21:20:52 +03:00
Morb0
e92205e9b8 Fix locale 2023-09-13 20:10:00 +03:00
Morb0
0b7a36e623 Update locale 2023-09-13 17:24:31 +03:00
Morb0
d135aabdcd Use corvax admin icons 2023-09-13 17:05:55 +03:00
Morb0
e21ee44f9e Merge remote-tracking branch 'upstream/master' into upstream-sync
# Conflicts:
#	.github/CODEOWNERS
#	Content.IntegrationTests/Tests/Preferences/ServerDbSqliteTests.cs
#	Content.Server/VoiceMask/VoiceMaskSystem.cs
#	Resources/Prototypes/Datasets/verbs.yml
#	Resources/Prototypes/Entities/Mobs/NPCs/silicon.yml
#	Resources/Prototypes/Entities/Mobs/Player/admin_ghost.yml
#	Resources/Prototypes/Maps/aspid.yml
#	Resources/Prototypes/Maps/barratry.yml
#	Resources/Prototypes/Maps/cluster.yml
#	Resources/Prototypes/Maps/kettle.yml
#	Resources/Prototypes/Maps/origin.yml
#	Resources/ServerInfo/Guidebook/Cargo/Salvage.xml
#	Resources/Textures/Structures/Furniture/chairs.rsi/meta.json
2023-09-13 16:51:52 +03:00
Ed
1ff24a7ee1
New station Gate (#1408) 2023-09-13 16:35:01 +03:00
Ubaser
9c2f11d0eb
Add map "Europa" (#19930)
Co-authored-by: metalgearsloth <comedian_vs_clown@hotmail.com>
2023-09-13 22:22:21 +10:00
PJBot
0618874fa6 Automatic changelog update 2023-09-13 08:07:19 -04:00
PJBot
427a48d67d Automatic changelog update 2023-09-13 04:57:19 -04:00
Nairod
6a26771d5e
Orderable Security Barriers (#20103) 2023-09-13 18:56:15 +10:00
PJBot
760c1d965a Automatic changelog update 2023-09-13 04:02:26 -04:00
deltanedas
89b670d0c0
run fixgridatmos on dev (#20099)
Co-authored-by: deltanedas <@deltanedas:kde.org>
2023-09-13 00:52:12 -06:00
mhamster
0d18f83949
Chemical things machine boards translation fixes (#1405) 2023-09-13 08:05:45 +03:00
DrSmugleaf
f23228bda9
Update dragon devour action icon (#20020)
Co-authored-by: metalgearsloth <comedian_vs_clown@hotmail.com>
2023-09-12 22:05:04 -07:00
SyndiCarp
d387108631
Update corvax_avrit.yml (#1409) 2023-09-13 08:04:50 +03:00
SyndiCarp
5e41e09a9f
HotFix corvax_ishimura.yml (#1410) 2023-09-13 08:04:30 +03:00
PJBot
b0e8af46ce Automatic changelog update 2023-09-13 00:36:08 -04:00
PJBot
3b4aebf9e0 Automatic changelog update 2023-09-13 00:26:39 -04:00
deltanedas
486bba4565
prevent mice going under secret doors (#20057)
Co-authored-by: deltanedas <@deltanedas:kde.org>
2023-09-12 18:20:47 -07:00
PJBot
7ea0537551 Automatic changelog update 2023-09-12 17:51:06 -04:00
AndrewEyeke
8084a69ae4
Nukies will be able to buy carp (#20051)
* Nukies will be able to buy carp

* Limited fish to 10 stock

* Limited fish to 10 stock

* Limited fish to 10 stock
2023-09-12 14:50:03 -07:00
PJBot
be7be13f54 Automatic changelog update 2023-09-12 16:55:22 -04:00
Morb
f9144496f7
Stair decals (#20080)
* wip

* done
2023-09-12 14:54:28 -06:00
deltanedas
ef869b1cff
saltern updat (#20075)
Co-authored-by: deltanedas <@deltanedas:kde.org>
2023-09-12 14:25:59 -06:00
deltanedas
1986ca86f4
make hardbombs indestructible (#20073)
* make hardbombs not explode when destroyed

* actually just remove it entirely

---------

Co-authored-by: deltanedas <@deltanedas:kde.org>
2023-09-12 11:29:50 -07:00
PJBot
5354f0c931 Automatic changelog update 2023-09-12 11:10:38 -04:00
JoeHammad1844
3401709e84
Nukies get free microbomb (#20012) 2023-09-12 08:09:32 -07:00
PJBot
70cdb07fbb Automatic changelog update 2023-09-12 10:36:12 -04:00
Aru Moon
f614029f64
remove useless file from prototypes (#20066) 2023-09-12 09:21:38 -05:00
PJBot
cf6377643b Automatic changelog update 2023-09-12 08:35:08 -04:00
metalgearsloth
7064f262b4
Add ore bag area pickups (#19358) 2023-09-12 22:34:04 +10:00
lapatison
92bbc86b86
Fix admin-notes.ftl (#1407) 2023-09-12 14:20:03 +03:00
deltanedas
7d9550bc55
remove sus codewords (#20060)
Co-authored-by: deltanedas <@deltanedas:kde.org>
2023-09-12 00:37:43 -05:00
eclips_e
133ca98655
Hardbombs & Defusables (#15380)
Co-authored-by: Kara <lunarautomaton6@gmail.com>
Co-authored-by: Just-a-Unity-Dev <just-a-unity-dev@users.noreply.github.com>
Co-authored-by: LankLTE <twlowe06@gmail.com>
Co-authored-by: LankLTE <135308300+LankLTE@users.noreply.github.com>
2023-09-11 18:42:38 -07:00
PJBot
effd307e64 Automatic changelog update 2023-09-11 18:58:31 -04:00
PJBot
22886efb71 Automatic changelog update 2023-09-11 15:59:30 -04:00
chromiumboy
c853f0bfb7
Artifact containers can safely store radioactive objects (version 2) (#19652)
* Artifact containers suppress the radioactive of artifacts inside them

* Updated to reflect changes to RobustToolbox

* Made necessary changes after updating RT

* Removed test code

* Made requested change

* Updated due to changes to RobustToolbox

* Renamed function

* Updated to accommodate changes to RobustToolbox

* Actually resolve merge conflict?

* Removed unnecessary change

* Made requested changes

* retrigger checks

* Retrigger checks

---------

Co-authored-by: root <root@DESKTOP-HJPF29C>
2023-09-11 15:58:25 -04:00
lzk
5ca34e5578
crayon.yml cleaning (#20029) 2023-09-11 15:52:54 -04:00
metalgearsloth
a75745491d
Make some more machines snapCardinals (#19781) 2023-09-11 22:56:53 +10:00
DrSmugleaf
a272cd4439
Remove manual localization from action entity prototypes (#20023)
Co-authored-by: metalgearsloth <comedian_vs_clown@hotmail.com>
2023-09-11 22:34:41 +10:00
PJBot
313be95cb2 Automatic changelog update 2023-09-11 07:21:51 -04:00
metalgearsloth
d5bd1c6f86
Predict StorageComponent (#19682) 2023-09-11 21:20:46 +10:00
PJBot
d315ce3c8c Automatic changelog update 2023-09-11 05:05:08 -04:00
PJBot
28e9df0fba Automatic changelog update 2023-09-11 04:17:31 -04:00
drteaspoon420
a7ac4a83c4
Changed produce spills into dynamic from hardcoded. (#19980) 2023-09-11 01:16:26 -07:00
metalgearsloth
28bf3a6240
Remove SharedEye (but content) (#19481) 2023-09-11 16:15:23 +10:00
PJBot
c477e5b0c2 Automatic changelog update 2023-09-11 02:04:20 -04:00
Kara
64a29f0d8a
InAir tweaks & chasm fixes (#19707) 2023-09-11 16:03:16 +10:00
PJBot
414755b455 Automatic changelog update 2023-09-11 01:53:59 -04:00