Commit Graph

18546 Commits

Author SHA1 Message Date
silicons
2e071b1e0b Merge pull request #13908 from Citadel-Station-13/tgs-dmapi-update
Automatic TGS DMAPI Update
2020-12-29 01:28:12 -07:00
silicons
a0fb594236 Merge pull request #13900 from Xantholne/Birds
Ports cute birbs from RP
2020-12-29 00:50:58 -07:00
raspy-on-osu
d2c0e1ba41 salicyclic acid 2020-12-29 02:35:42 -05:00
Letter N
dbe01c38ca do-not-force-yet 2020-12-29 14:09:45 +08:00
Letter N
3996f50a00 who is nanotransen 2020-12-29 14:00:58 +08:00
Letter N
3c1cfca9c5 update this! 2020-12-29 11:24:55 +08:00
Letter N
23a7d8777d hash browns 2020-12-29 11:20:26 +08:00
Letter N
f28363ae56 code quality 2020-12-29 11:12:56 +08:00
Putnam
3a7f360fe9 Made the returns make more sense. 2020-12-28 19:06:37 -08:00
Putnam
24b14c40e4 Rearranged rolldown and toggle_jumpsuit_adjust to be sane. 2020-12-28 19:02:30 -08:00
Putnam
b1bd28be3c Makes gear harnesses unusable when unusable 2020-12-28 18:57:48 -08:00
Letter N
51143f89e5 Merge remote-tracking branch 'origin/master' into semi-sync 2020-12-29 10:37:06 +08:00
silicons
e76e9ad34c poi 2020-12-28 18:02:16 -08:00
silicons
2a58afa77e Update wheelchair.dm 2020-12-28 18:57:51 -07:00
silicons
ee9cc135f1 fix 2020-12-28 17:43:50 -08:00
silicons
abb37896a9 please work 2020-12-28 17:35:47 -08:00
silicons
6e86cc7758 wew 2020-12-28 17:27:16 -08:00
tgstation-server
14cefb2d35 Update TGS DMAPI 2020-12-29 00:59:40 +00:00
Timothy Teakettle
74928c0451 data issue 2020-12-28 22:21:44 +00:00
silicons
cc0556267e Merge pull request #13904 from DeltaFire15/summonitem-stuff
Adds some more instant summons safety
2020-12-28 13:53:46 -07:00
zerothebigboy
6f38ec403f help 2020-12-28 15:34:35 -05:00
silicons
0c87c3b0e0 fiX 2020-12-28 12:15:55 -08:00
silicons
1af00db4c1 Merge pull request #13869 from timothyteakettle/powergame-puddle
removes slime layering and stops puddle tackling
2020-12-28 13:15:30 -07:00
silicons
1dfe6d3685 Update miscellaneous.dm 2020-12-28 12:59:05 -07:00
DeltaFire
687c6a9e6f and another one 2020-12-28 19:49:42 +01:00
DeltaFire
0bba554052 e 2020-12-28 19:45:03 +01:00
DeltaFire
51d1e3a87f intendation
sigh
2020-12-28 19:41:39 +01:00
DeltaFire
01f1844781 there 2020-12-28 19:15:59 +01:00
DeltaFire
46a0c65e46 Merge branch 'master' into debris 2020-12-28 19:04:22 +01:00
Timothy Teakettle
bdb05f5e85 Merge remote-tracking branch 'upstream/master' into slime-legs 2020-12-28 17:22:53 +00:00
Timothy Teakettle
d80920a500 oops! all 0s! 2020-12-28 17:10:28 +00:00
Timothy Teakettle
50fd36efa5 oops! all runtime! 2020-12-28 17:04:48 +00:00
Timothy Teakettle
b0fdbd3b1d Update preferences.dm 2020-12-28 17:01:55 +00:00
DeltaFire
b1be0159e2 Merge pull request #13877 from Citadel-Station-13/silicons-patch-43
heretics uses killonce objectives
2020-12-28 17:56:58 +01:00
DeltaFire
13cd2c4424 Merge pull request #13880 from Citadel-Station-13/silicons-patch-46
antag rep configs are now actually possible to set for jobs with more than one word in the title
2020-12-28 17:56:17 +01:00
DeltaFire
3435a99ec7 Merge pull request #13882 from silicons/subtler_tables
adds subtler emote that wraps around adjacent tables
2020-12-28 17:55:27 +01:00
DeltaFire
999b4c403b Merge pull request #13883 from silicons/temporary_flavortext
Set Pose from RP server is now a thing (in reality this just modifies existing temporary flavor text to be better but no one here understands enough code so I'll spare the explanation)
2020-12-28 17:53:32 +01:00
DeltaFire
f89edd5c10 Merge pull request #13886 from Citadel-Station-13/silicons-patch-47
respawn text now shows AFTER motd (probably)
2020-12-28 17:46:36 +01:00
DeltaFire
bd0c799e66 Merge pull request #13896 from Sonic121x/patch-3
cydonia helmet fix & taur(naga&canine)Ert hardsuit
2020-12-28 17:15:49 +01:00
DeltaFire
49252f4eff Merge pull request #13893 from Citadel-Station-13/silicons-patch-51
Nerfs meth and morphine to only remove damage slowdown rather than all slowdown (read this carefully, as this affects lings)
2020-12-28 17:10:26 +01:00
DeltaFire
3a7cda80b7 Merge pull request #13838 from Citadel-Station-13/silicons-patch-32
removes deathgasping on death if already faking death as it's real easy to spot changelings in stasis otherwise
2020-12-28 16:57:11 +01:00
Xantholne
51ac7286e6 aaaaaaa 2020-12-28 00:57:32 -07:00
silicons
e8fea4cf1b Update human_defines.dm 2020-12-28 00:19:35 -07:00
Xantholne
2cca3314a7 Adds to bird crate 2020-12-27 23:55:58 -07:00
Xantholne
121b1bb7fd Ports parrots from RP 2020-12-27 22:51:18 -07:00
Letter N
ce5ab2f3a4 Merge remote-tracking branch 'origin/master' into semi-sync 2020-12-28 09:35:58 +08:00
Timothy Teakettle
b03bd6fe8e Update preferences.dm 2020-12-27 22:03:28 +00:00
Sonic121x
1afcc2cd4c Update hardsuit.dm 2020-12-28 04:46:25 +08:00
Sonic121x
b51a2e939e Update miscellaneous.dm 2020-12-28 04:21:52 +08:00
Sonic121x
ad9fc238e7 Update hardsuit.dm 2020-12-28 04:19:37 +08:00