Commit Graph

26370 Commits

Author SHA1 Message Date
Timothy Teakettle
5bc7c5a448 revert 2020-12-30 02:21:30 +00:00
silicons
97deaf3482 Update twitch_plays.dm 2020-12-29 15:56:10 -07:00
silicons
95c420ccba Update twitch_plays.dm 2020-12-29 15:55:14 -07:00
EmeraldSundisk
b1f76a8566 Update Space_Station_13_areas.dm 2020-12-29 11:38:07 -08:00
EmeraldSundisk
0707f6ecfc Update Space_Station_13_areas.dm 2020-12-29 10:56:58 -08:00
EmeraldSundisk
6af5d180d0 Update Space_Station_13_areas.dm 2020-12-29 10:29:28 -08:00
Timothy Teakettle
7224d3ad17 oops! all runtimes! 2020-12-29 16:13:44 +00:00
keronshb
99a890b355 Adds block_parry_data
Ooops forgot one line of code
2020-12-29 09:30:29 -05:00
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
da25c48b2c Merge pull request #13855 from Chiirno/paramedBoxOffice
Paramed office on box + Surgery remodel
2020-12-29 01:27:49 -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
silicons
042c7d9b8b wew 2020-12-28 21:07:55 -08:00
silicons
d338d7a14b auto 2020-12-28 21:03:50 -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
964b60c9ca ok 2020-12-28 17:50:16 -08: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
a8bc98aa40 ok 2020-12-28 17:29:55 -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
1af00db4c1 Merge pull request #13869 from timothyteakettle/powergame-puddle
removes slime layering and stops puddle tackling
2020-12-28 13:15:30 -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
01f1844781 there 2020-12-28 19:15:59 +01:00
Timothy Teakettle
b1e5888ce0 Update tackle.dm 2020-12-28 17:40:04 +00: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
312f3410a1 Merge pull request #13887 from HeroWithYay/Fix_Necrotizing_Fasciitis_description
Fix for Necrotizing Fasciitis
2020-12-28 17:43:39 +01:00
DeltaFire
a390816092 Merge pull request #13888 from Citadel-Station-13/silicons-patch-48
adds vv wrapper for snowflake plushies
2020-12-28 17:42:26 +01:00
DeltaFire
9b6d4c1371 Merge pull request #13889 from Citadel-Station-13/silicons-patch-49
adds recursive pulling check to space transitions
2020-12-28 17:39:59 +01:00
DeltaFire
58accc3782 Merge pull request #13898 from Putnam3145/fix-coma-sleep
Makes regen coma properly work at 25% when sleeping; makes coma more precedent
2020-12-28 17:34:14 +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
8b723ab6c7 Merge pull request #13894 from Citadel-Station-13/silicons-patch-52
reduces coldslowdown to tempdiff / 35 instead of tempdiff / 20
2020-12-28 17:11:33 +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
8843a830d2 Merge pull request #13897 from keronshb/energybolafix
Fixess Energy Bola to be catchable
2020-12-28 17:08:29 +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