Commit Graph

17337 Commits

Author SHA1 Message Date
silicons
45a7c68da1 wow 2020-12-11 15:05:00 -07:00
DeltaFire
bece5971b8 Merge pull request #13745 from Arturlang/soulstone_references
Adds more sanity to construct soul returning
2020-12-11 00:42:30 +01:00
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
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
tgstation-server
5b74596d72 Update TGS DMAPI 2020-12-10 00:47:22 +00:00
Artur
ef13b07dd4 Forgot this 2020-12-09 17:56:28 +02:00
Artur
827920dba7 Paranoid ramblings 2020-12-09 17:54:44 +02: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
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
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
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
silicons
750f81920b Merge pull request #13717 from TheObserver-sys/shuttlefix
Mining and Monastery Shuttle Fixes
2020-12-03 16:34:00 -07: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
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
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
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
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
silicons
6bd13c9054 Merge pull request #13695 from shellspeed1/Better-Ling-change
Better version of ling change
2020-11-28 09:13:12 -07:00
silicons
0f9734b1f7 Merge pull request #13698 from timothyteakettle/communication-hotkeys
ports rebindable communication hotkeys from tg
2020-11-28 09:12:40 -07:00
The0bserver
4559a153c3 Map Tweak 2020-11-27 16:51:55 -05:00
DeltaFire15
a1d38033a4 Merge pull request #13576 from Sonic121x/patch-2
Add a bunch of digitigrade uniform
2020-11-27 22:31:10 +01:00
silicons
47c74c3fac sigh 2020-11-27 06:42:55 -07:00
silicons
ead209f507 sigh 2020-11-27 06:31:05 -07:00
silicons
ae756749cc woops 2020-11-27 05:15:40 -07:00
silicons
a6d73e0344 fix 2020-11-27 04:25:22 -07:00
The0bserver
884fbd0a52 found you. 2020-11-27 03:45:08 -05:00
silicons
564766d11d sigh 2020-11-27 00:16:53 -07:00
silicons
134fd0f858 k 2020-11-26 23:42:39 -07:00
silicons
5e965d099f COME ON 2020-11-26 23:37:27 -07:00
DeltaFire
21734b5d63 there we go 2020-11-26 23:04:39 +01:00
DeltaFire
566d74bd77 E 2020-11-26 16:12:08 +01:00
silicons
46baf7372d Update permissionedit.dm 2020-11-25 22:47:25 -07:00
silicons
211019903e Merge pull request #13709 from Hatterhat/thanks-aleks
funny hands no longer survive off of their host
2020-11-25 22:23:46 -07:00
silicons
a20f14b937 Merge pull request #13705 from Putnam3145/buff-rad-collector
Buffs rad collectors
2020-11-25 22:23:17 -07:00
silicons
8fa69c458b Merge pull request #13707 from DeltaFire15/synthetic-alcohol-intolerance
Makes synthetics inherently immune to alcohol
2020-11-25 22:23:05 -07:00
silicons
a78ebb1f08 Merge pull request #13702 from Putnam3145/harness-tweak
Makes gear harness no longer cover chest/groin.
2020-11-25 22:22:43 -07:00
silicons
bba5cef9be Merge pull request #13697 from Putnam3145/brain-trauma-again
Makes spontaneous brain trauma require min 5 players.
2020-11-25 22:22:20 -07:00
silicons
f301ed4f8f Merge pull request #13689 from DeltaFire15/apc-power-fuckery
Fixes APC recharge power use
2020-11-25 22:21:57 -07:00