NikoTeam/CatStation
4
0
Fork 0
mirror of https://github.com/space-syndicate/space-station-14.git synced 2026-10-10 02:41:18 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions 4
21874 commits 14 branches 0 tags 2.9 GiB
Commit graph

21874 commits

This branch
This branch
All branches
Author SHA1 Message Date
Morb
94de2bea3d
News fix (#1417) 2023-09-15 00:12:11 +03:00
Morb
96dc673904
Replace Lawyer with IAA for Europa station (#1413) 2023-09-13 23:51:33 +03:00
Morb
8a74d25f1a
Merge pull request #1412 from space-syndicate/upstream-sync 
Upstream sync
 2023-09-13 21:24:39 +03:00
Morb0
5f3e6c4716 Fix maps 2023-09-13 21:20:52 +03:00
Morb0
d34fad151c Use NetEntity 2023-09-13 20:29:59 +03:00
Morb0
e92205e9b8 Fix locale 2023-09-13 20:10:00 +03:00
Morb0
dd162a01e3 Fix loadout system 2023-09-13 17:28:46 +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
metalgearsloth
7dc3347181
Fix planet docking (#20104) 2023-09-13 22:06:15 +10: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
metalgearsloth
ac66224a3a
Fulton fixes (#20102) 2023-09-13 18:01:22 +10:00
DrSmugleaf
5c15f52703
Fix entities getting shuffled in the map renderer (#20100) 2023-09-13 00:12:35 -07: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
Doru991
266dc47b80
welder fix (#20090) 2023-09-13 14:35:04 +10:00
PJBot
3b4aebf9e0 Automatic changelog update 2023-09-13 00:26:39 -04:00
metalgearsloth
a936f68bfa
Fix eye target not updating on rider shutdown (#20094) 2023-09-13 14:25:34 +10:00
metalgearsloth
0a4fcd71ff
Update submodule to 159.0.3 (#20087) 2023-09-13 11:58:50 +10:00
Morb
80543c322d
Rotating character preview & lobby preview change (#19741) 2023-09-12 21:57:38 -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
DrSmugleaf
4b13d0cbc2
Fix the map renderer not rendering entities (#20082) 2023-09-12 14:39:41 -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
b53e5d6661
ninja hotfixes (#20032) 
* check that slot is power cell slot

* add BatteryChangedEvent

* use BatteryChangedEvent when enabling gloves and replacing battery

* sort gloves dependencies

* increase stun duration and cooldown

* play sound when stunning people

* remove dirty for non networked field

* NinjaBatteryChangedEvent

* real

* fake

---------

Co-authored-by: deltanedas <@deltanedas:kde.org>
 2023-09-12 14:54:18 -06:00
deltanedas
ef869b1cff
saltern updat (#20075) 
Co-authored-by: deltanedas <@deltanedas:kde.org>
 2023-09-12 14:25:59 -06:00
drteaspoon420
a7980be623
Ensure plants always have some reagents after crossing (#20078) 2023-09-12 11:40:11 -08: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
metalgearsloth
da2502e9bc
Update submodule to 159.0.2 (#20069) 2023-09-13 00:35:08 +10: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
metalgearsloth
fd60d39bc7
Remove instruments compref (#19560) 2023-09-12 14:43:06 +10:00