b1bd28be3c
Makes gear harnesses unusable when unusable
2020-12-28 18:57:48 -08:00
51143f89e5
Merge remote-tracking branch 'origin/master' into semi-sync
2020-12-29 10:37:06 +08:00
e76e9ad34c
poi
2020-12-28 18:02:16 -08:00
2a58afa77e
Update wheelchair.dm
2020-12-28 18:57:51 -07:00
964b60c9ca
ok
2020-12-28 17:50:16 -08:00
ee9cc135f1
fix
2020-12-28 17:43:50 -08:00
abb37896a9
please work
2020-12-28 17:35:47 -08:00
a8bc98aa40
ok
2020-12-28 17:29:55 -08:00
6e86cc7758
wew
2020-12-28 17:27:16 -08:00
14cefb2d35
Update TGS DMAPI
2020-12-29 00:59:40 +00:00
74928c0451
data issue
2020-12-28 22:21:44 +00:00
cc0556267e
Merge pull request #13904 from DeltaFire15/summonitem-stuff
...
Adds some more instant summons safety
2020-12-28 13:53:46 -07:00
6f38ec403f
help
2020-12-28 15:34:35 -05:00
0c87c3b0e0
fiX
2020-12-28 12:15:55 -08:00
1af00db4c1
Merge pull request #13869 from timothyteakettle/powergame-puddle
...
removes slime layering and stops puddle tackling
2020-12-28 13:15:30 -07:00
687c6a9e6f
and another one
2020-12-28 19:49:42 +01:00
0bba554052
e
2020-12-28 19:45:03 +01:00
51d1e3a87f
intendation
...
sigh
2020-12-28 19:41:39 +01:00
01f1844781
there
2020-12-28 19:15:59 +01:00
46a0c65e46
Merge branch 'master' into debris
2020-12-28 19:04:22 +01:00
b1e5888ce0
Update tackle.dm
2020-12-28 17:40:04 +00:00
bdb05f5e85
Merge remote-tracking branch 'upstream/master' into slime-legs
2020-12-28 17:22:53 +00:00
d80920a500
oops! all 0s!
2020-12-28 17:10:28 +00:00
50fd36efa5
oops! all runtime!
2020-12-28 17:04:48 +00:00
b0fdbd3b1d
Update preferences.dm
2020-12-28 17:01:55 +00:00
b1be0159e2
Merge pull request #13877 from Citadel-Station-13/silicons-patch-43
...
heretics uses killonce objectives
2020-12-28 17:56:58 +01:00
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
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
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
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
312f3410a1
Merge pull request #13887 from HeroWithYay/Fix_Necrotizing_Fasciitis_description
...
Fix for Necrotizing Fasciitis
2020-12-28 17:43:39 +01:00
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
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
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
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
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
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
8843a830d2
Merge pull request #13897 from keronshb/energybolafix
...
Fixess Energy Bola to be catchable
2020-12-28 17:08:29 +01:00
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
51ac7286e6
aaaaaaa
2020-12-28 00:57:32 -07:00
e8fea4cf1b
Update human_defines.dm
2020-12-28 00:19:35 -07:00
2cca3314a7
Adds to bird crate
2020-12-27 23:55:58 -07:00
121b1bb7fd
Ports parrots from RP
2020-12-27 22:51:18 -07:00
7e2da69d23
explotioin audio is proper now
2020-12-28 10:24:37 +08:00
fd8f5c4afd
Makes coma more precedent.
2020-12-27 17:54:53 -08:00
33358776ec
Makes regen coma properly work at 25% when sleeping
2020-12-27 17:49:15 -08:00
ce5ab2f3a4
Merge remote-tracking branch 'origin/master' into semi-sync
2020-12-28 09:35:58 +08:00
365abe1c5a
Allows Energy Bola to be catchable
...
Allows Energy Bola to be catchable
2020-12-27 17:15:59 -05:00
b03bd6fe8e
Update preferences.dm
2020-12-27 22:03:28 +00:00
1afcc2cd4c
Update hardsuit.dm
2020-12-28 04:46:25 +08:00
Putnam