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

7219 commits

This branch
This branch
All branches
Author SHA1 Message Date
Arthur
6246bc3829 Merge remote-tracking branch 'upstream/master' 2022-01-04 16:04:26 +03:00
Arthur
8a29f90469 Add multiple changelog merging 2022-01-04 16:01:04 +03:00
Vera Aguilera Puerto
675a29ed33
ECS MindComponent (#5917) 2022-01-04 13:37:50 +01:00
PJBot
b0ee574c70 Automatic changelog update 2022-01-04 07:06:08 -05:00
Rane
9603e47096
Added difficulty overrides for several traitor objectives (#6018) 2022-01-04 13:05:05 +01:00
PJBot
e4d940bb75 Automatic changelog update 2022-01-04 04:23:30 -05:00
ShadowCommander
b335ef5e7f
Prevent Holoparasites from attacking their host (#6019) 2022-01-04 10:22:28 +01:00
mirrorcult
5249ea057a
Kill bobby 2.0 (#6023) 2022-01-04 10:17:39 +01:00
ShadowCommander
0a626353ab
Make disconnected players in AdminNameOverlay different from connected players (#5931) 
* Set transparency for disconnected players in the AdminNameOverlay

* Change to white instead of transparent
 2022-01-03 16:40:45 -08:00
Arthur
a0d2ea8284 Merge remote-tracking branch 'upstream/master' 2022-01-04 02:02:28 +03:00
Arthur
a4a38d53d6 Update russian translation to new changes 2022-01-04 02:02:00 +03:00
PJBot
dade209585 Automatic changelog update 2022-01-03 16:33:30 -05:00
Rane
b73f8918f7
Fire & Air Alarm Electronics now constructable (#6015) 2022-01-03 14:32:28 -07:00
Leon Friedrich
2791215bcd
Fix eject sounds sometimes not playing. (#6013) 2022-01-03 14:32:22 -07:00
Alex Evgrashin
c5a98129ff
Sync station rotation with a spawned salvage rotation (#5998) 
Co-authored-by: Paul Ritter <ritter.paul1@googlemail.com>
Co-authored-by: Alexander Evgrashin <evgrashin.adl@gmail.com>
 2022-01-03 14:32:16 -07:00
Morbo
7fa5226713
Merge branch 'space-wizards:master' into master 2022-01-03 20:29:11 +03:00
PJBot
437ed1dd90 Automatic changelog update 2022-01-03 04:54:11 -05:00
mirrorcult
72dcef4203
Reduce locker/crate hp and resistances, add spear wielding (#6001) 2022-01-03 10:53:09 +01:00
ShadowCommander
92d70b0587
Add teleport verbs (#5954) 
* Add teleport verbs

* Add ftl file

* Make the verbs run the command serverside
 2022-01-03 01:07:33 -08:00
PJBot
c6b393a55e Automatic changelog update 2022-01-03 02:48:39 -05:00
ZeroDayDaemon
b45bd3b396
Adds Ducks (#5997) 
* Add Ducks

* Update cargo_livestock.yml
 2022-01-02 23:47:35 -08:00
PJBot
947d0b5883 Automatic changelog update 2022-01-03 02:39:40 -05:00
Rane
8049be06ad
Tweaks doctor and CMO starting items (#6007) 2022-01-02 23:38:37 -08:00
PJBot
605af88df7 Automatic changelog update 2022-01-03 00:52:46 -05:00
T-Stalker
70209f5895
Weh! (#6005) 2022-01-02 22:51:42 -07:00
Paul
33572c5cc8 submodule update & fixes the ahelpwindow further 2022-01-03 04:14:10 +01:00
Paul
7e266b41ff removes a bit of jank from bwoinkwindow 
sorta fixes sorting
 2022-01-03 02:36:25 +01:00
E F R
df9aecb6a0
Administration: Ahelp tabs (#5965) 2022-01-03 01:54:44 +01:00
Morbo
40de02cbb5
Merge branch 'space-wizards:master' into master 2022-01-02 09:10:27 +03:00
PJBot
a3f21e9603 Automatic changelog update 2022-01-02 01:01:24 -05:00
ShadowCommander
cd865b9aaa
Remove crit and dead mobs from GhostRole list (#5992) 2022-01-01 23:00:21 -07:00
PJBot
883729b575 Automatic changelog update 2022-01-02 00:58:49 -05:00
Lamrr
85297d11b6
Changes tile crafting recipe to make four floor tiles per unit of material used. (#5993) 2022-01-01 22:57:46 -07:00
PJBot
207e514cab Automatic changelog update 2022-01-02 00:41:47 -05:00
Delete69
a09509b385
Small Bar Salvage (#5936) 2022-01-02 16:40:44 +11:00
Neith
b8b1bb45b2
Added a new salvage map depicting an emergency shuttle. (#5949) 2022-01-02 16:39:44 +11:00
wrexbe
332ff89609
Convert RandomPlant to entity system (#5952) 
Co-authored-by: ShadowCommander <10494922+ShadowCommander@users.noreply.github.com>
 2022-01-01 22:27:54 -07:00
PJBot
b544366fee Automatic changelog update 2022-01-01 23:57:27 -05:00
Flipp Syder
b1584793bf
Adds fire/air alarms (#5018) 
Co-authored-by: Vera Aguilera Puerto <6766154+Zumorica@users.noreply.github.com>
Co-authored-by: E F R <602406+Efruit@users.noreply.github.com>
Co-authored-by: metalgearsloth <31366439+metalgearsloth@users.noreply.github.com>
Co-authored-by: metalgearsloth <comedian_vs_clown@hotmail.com>
 2022-01-02 15:56:24 +11:00
Morbo
b3ba023573
Merge branch 'space-wizards:master' into master 2022-01-02 06:36:37 +03:00
PJBot
903f796b0f Automatic changelog update 2022-01-01 21:01:04 -05:00
Rane
37b510901f
Makes the uplink purchase sound much quieter (#5989) 2022-01-01 19:00:01 -07:00
Morbo
9509d94bbf
Merge branch 'space-wizards:master' into master 2022-01-02 03:29:23 +03:00
DrSmugleaf
0b8233909c Ignore EFCore SensitiveDataLoggingEnabledWarning 2022-01-02 00:33:29 +01:00
PJBot
89833ce709 Automatic changelog update 2022-01-01 17:55:46 -05:00
Charlese2
02ea48330c
Lower the damage of flash bullets and make the damage blunt. (#5932) 
* Lower the damage of flash bullets and make the damage blunt.

* Shotgun flash bullets still do a lot of damage

* Make base flash bullet blunt to match the others.
 2022-01-01 23:54:43 +01:00
PJBot
37244cfcf1 Automatic changelog update 2022-01-01 17:47:02 -05:00
Rane
e3de9bcd72
Rebalance traitor objective difficulty (#5988) 
* Adjusted traitor steal objectives

* Added theft target to cargo

* Rebalanced difficulty
 2022-01-01 23:46:00 +01:00
ShadowCommander
007f4c6cbe
Fix inventory UI not showing entities (#5981) 
* Update inventory UI on init

* Add resolve pattern

* Update Content.Client/Inventory/ClientInventorySystem.cs

Co-authored-by: Paul Ritter <ritter.paul1@googlemail.com>

* Fix errors

Co-authored-by: Paul Ritter <ritter.paul1@googlemail.com>
 2022-01-01 23:35:30 +01:00
Morbo
c29c89fa22
Merge branch 'space-wizards:master' into master 2022-01-02 01:26:00 +03:00