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

3197 commits

Author SHA1 Message Date
Leon Friedrich
33f5294e2a Power Cell Refactor (#5943) 
Co-authored-by: ShadowCommander <10494922+ShadowCommander@users.noreply.github.com>
 2022-01-05 15:39:29 +03:00
Morbo
33b0ebd504
Merge branch 'space-wizards:master' into master 2022-01-05 04:24:58 +03:00
wrexbe
4571dca1eb
Tiles Name->ID, DisplayName->Name (#5991) 2022-01-04 17:26:07 -07:00
T-Stalker
a153f76c5d
Makes weh.ogg a little louder (#6028) 2022-01-04 17:25:57 -07:00
Peptide90
45a1e57ee4
Quick fixes (firefightercrate fill and rollerbed size) (#6029) 2022-01-04 17:25:51 -07:00
IanComradeBot
60200552dd Automatic changelog update 2022-01-04 14:51:41 +00:00
Arthur
6c56165612 Merge remote-tracking branch 'origin/master' 2022-01-04 17:49:37 +03:00
Arthur
da74db68fe Manually create custom changelog file 2022-01-04 17:48:51 +03:00
SpaceCarp
9eaf2a3ab5
Fix grammatical and punctuation errors in russian translation (#23) 
* fix: Исправлены грамматические и пунктуационные ошибки в переводах
 2022-01-04 17:40:31 +03:00
Peptide90
ace591117f
Removed more copyright materials (bar signs) (#5984) 2022-01-05 00:56:40 +11:00
PJBot
c114b0f2d5 Automatic changelog update 2022-01-04 08:52:27 -05:00
Michael Phillips
b36c9395d6
Additional Hydroponics vegetables - Chili + Recipes (#5966) 2022-01-05 00:51:22 +11:00
PJBot
1aaefb6346 Automatic changelog update 2022-01-04 08:37:40 -05:00
mirrorcult
af785f873f
Optional server whitelists (#5979) 2022-01-05 00:37:06 +11:00
LittleBuilderJane
66deacc322
New Game Map: Reach Transport Shuttle (#5671) 
Co-authored-by: metalgearsloth <31366439+metalgearsloth@users.noreply.github.com>
 2022-01-05 00:36:37 +11:00
PJBot
bc935b70f9 Automatic changelog update 2022-01-04 08:24:15 -05:00
LittleBuilderJane
93cdda6cb4
New Spawnable Map: Boarding Shuttle Dart (#5728) 2022-01-05 00:23:12 +11:00
PJBot
c4512e3c1a Automatic changelog update 2022-01-04 08:06:23 -05:00
router
e4cd2944cf
o7 -> @salutes (#6026) 2022-01-05 00:05:21 +11:00
Arthur
6246bc3829 Merge remote-tracking branch 'upstream/master' 2022-01-04 16:04:26 +03: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
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
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
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
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
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