Commit Graph

39621 Commits

Author SHA1 Message Date
silicons
a4e6df8f9a Merge pull request #13738 from DeltaFire15/heretic-tweaks
Updates the heretics gamemode with a bunch of changes from /tg/
2020-12-09 21:47:46 -07:00
CitadelStationBot
aa6bcd3859 Automatic changelog generation for PR #13704 [ci skip] 2020-12-09 22:47:09 -06:00
silicons
821c3becc3 Merge pull request #13704 from Putnam3145/make-emotes-local
Makes emotes show up in the "local" filter with TGUI
2020-12-09 21:47:06 -07:00
silicons
a508e0e4da Merge pull request #13732 from Citadel-Station-13/tgs-dmapi-update
Automatic TGS DMAPI Update
2020-12-09 21:45:46 -07:00
tgstation-server
5b74596d72 Update TGS DMAPI 2020-12-10 00:47:22 +00:00
CitadelStationBot
2a199bdbec Automatic changelog generation for PR #13740 [ci skip] 2020-12-09 10:58:10 -06:00
DeltaFire
16e7d8baf0 Merge pull request #13740 from Linzolle/nitpick
the biggest nitpick in the entire universe
2020-12-09 17:58:06 +01:00
CitadelStationBot
a2834b8ebc Automatic changelog generation for PR #13741 [ci skip] 2020-12-08 11:51:37 -06:00
silicons
b9c326388c Merge pull request #13741 from DeltaFire15/critical-objective-fix
[s] Objective fixes : screaming lizard edition
2020-12-08 10:51:33 -07:00
DeltaFire
69a1d6e603 oop 2020-12-08 16:32:34 +01:00
DeltaFire
86661a4fe0 aaaaaaaaaaaaaa 2020-12-08 16:30:09 +01:00
Linzolle
ad200fbb71 a stupid nitpick 2020-12-07 17:52:07 -06:00
CitadelStationBot
be5bccd847 Automatic changelog generation for PR #13736 [ci skip] 2020-12-07 17:18:38 -06:00
Lin
e38543ae48 Merge pull request #13736 from DeltaFire15/abductor-surgery-robotstuff
Makes the experimental organ replacement surgery work on robots
2020-12-07 23:18:35 +00:00
DeltaFire
b186ec96ad rune invisible to sillycones. 2020-12-07 22:19:30 +01:00
DeltaFire
73d3234882 buncha changes 2020-12-07 22:15:04 +01:00
DeltaFire
33e4486c53 Merge remote-tracking branch 'upstream/master' into heretic-tweaks 2020-12-07 21:18:11 +01:00
DeltaFire
ff29b7ee14 e 2020-12-07 21:16:40 +01:00
Lin
d2949c64db Merge pull request #13728 from Citadel-Station-13/silicons-patch-12
adds 8 save slots
2020-12-06 22:10:48 +00:00
DeltaFire
dd4f60a24b *snap 2020-12-06 17:37:46 +01:00
CitadelStationBot
86b9161fc9 Automatic changelog generation for PR #13711 [ci skip] 2020-12-06 00:36:31 -06:00
Lin
3b6553899b Merge pull request #13711 from DeltaFire15/medbot-synthetic-ignore
Medibots now only treat those they can actually treat
2020-12-06 06:36:28 +00:00
CitadelStationBot
8cf6f11609 Automatic changelog generation for PR #13733 [ci skip] 2020-12-06 00:13:01 -06:00
Lin
cbcf60ff76 Merge pull request #13733 from DeltaFire15/tail-entwine-fix
Tailcoilies fix
2020-12-06 06:12:57 +00:00
DeltaFire
663fff03c6 Merge pull request #13720 from timothyteakettle/podpeople-green-blood
podpeople have green blood but done correctly
2020-12-06 03:43:19 +01:00
DeltaFire
0c4e9ca1c5 better phrasing 2020-12-05 02:56:03 +01:00
DeltaFire
f0c1890a65 fix 2020-12-05 02:48:33 +01:00
Lin
c2954d1d6f Merge pull request #13727 from Citadel-Station-13/silicons-patch-11
no more typing indicators while dead
2020-12-04 22:52:04 +00:00
CitadelStationBot
e34a6cb544 Automatic changelog generation for PR #13717 [ci skip] 2020-12-03 17:34:02 -06:00
silicons
750f81920b Merge pull request #13717 from TheObserver-sys/shuttlefix
Mining and Monastery Shuttle Fixes
2020-12-03 16:34:00 -07:00
CitadelStationBot
b6092086da Automatic changelog generation for PR #13719 [ci skip] 2020-12-03 17:33:51 -06:00
silicons
8d398b3e24 Merge pull request #13719 from shellspeed1/Adds-construction-bags-from-tg
Ports construction bags and makes it easier to get material bags. (READY)
2020-12-03 16:33:47 -07:00
Lin
a6eeb5d418 Merge pull request #13692 from Citadel-Station-13/silicons-patch-7
fixes windoor spraycanning
2020-12-03 20:34:16 +00:00
silicons
b721cf3128 Update preferences.dm 2020-12-03 05:41:56 -07:00
silicons
31cf8842e4 Update death.dm 2020-12-02 23:45:18 -07:00
silicons
d43086572d Update carbon.dm 2020-12-02 23:44:35 -07:00
silicons
c891a456e8 Update typing_indicator.dm 2020-12-02 23:43:00 -07:00
Putnam
4e9bb126e8 recompiled, thanks tgui 2020-12-02 08:18:10 -08:00
Putnam
809e270290 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into make-emotes-local 2020-12-02 08:16:22 -08:00
CitadelStationBot
2f34f2dac5 Automatic changelog generation for PR #13721 [ci skip] 2020-12-02 09:08:48 -06:00
DeltaFire
ad4d10239d Merge pull request #13721 from MrJWhit/moar-crimmas
moar crimmas
2020-12-02 16:08:45 +01:00
MrJWhit
19420a6274 moar crimmas 2020-12-01 04:08:39 -05:00
Timothy Teakettle
d0ebd6c2d8 green blood 2020-11-30 19:22:54 +00:00
shellspeed1
3735efbfca Ports construction bags 2020-11-29 18:29:03 -08:00
DeltaFire
da3c28675a Merge pull request #13714 from Citadel-Station-13/silicons-patch-10
fixes admin rank copy not transferring over exclude/can_edit_rights
2020-11-29 18:18:45 +01:00
CitadelStationBot
bd980fb981 Automatic changelog generation for PR #13687 [ci skip] 2020-11-29 11:13:15 -06:00
DeltaFire
6bdb54117b Merge pull request #13687 from Citadel-Station-13/silicons-patch-6
https://github.com/tgstation/tgstation/pull/54991 - tail intertwining
2020-11-29 18:13:12 +01:00
CitadelStationBot
f84817b85a Automatic changelog generation for PR #13695 [ci skip] 2020-11-28 10:13:15 -06:00
silicons
6bd13c9054 Merge pull request #13695 from shellspeed1/Better-Ling-change
Better version of ling change
2020-11-28 09:13:12 -07:00
CitadelStationBot
1b5432c807 Automatic changelog generation for PR #13715 [ci skip] 2020-11-28 10:12:59 -06:00