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
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
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
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
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
ce5ab2f3a4
Merge remote-tracking branch 'origin/master' into semi-sync
2020-12-28 09:35:58 +08: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
b51a2e939e
Update miscellaneous.dm
2020-12-28 04:21:52 +08:00
ad9fc238e7
Update hardsuit.dm
2020-12-28 04:19:37 +08:00
67741b7561
Update preferences_savefile.dm
2020-12-27 20:09:32 +00:00
952f5f8716
Update drug_reagents.dm
2020-12-27 12:32:14 -07:00
3f026749c8
Update mutations.dm
2020-12-27 12:15:17 -07:00
824427ce2f
Update mutations.dm
2020-12-27 12:11:27 -07:00
e0c928a745
Update respawn.dm
2020-12-27 06:57:15 -07:00
67d9e79934
fix
2020-12-27 05:27:46 -08:00
d574996db9
Merge pull request #13846 from DeltaFire15/robot-antag-healing
...
Ling & Bloodsucker healing now affects IPCs / Synths
2020-12-27 05:48:48 -07:00
753c1389cc
fix
2020-12-26 22:04:05 -08:00
0cd0770549
fix
2020-12-26 21:32:12 -08:00
46b58fa5ba
file ops
2020-12-26 21:10:12 -08:00
bfb3d087c3
ok
2020-12-26 20:50:28 -08:00
dafc6bf89f
fix
2020-12-26 20:41:21 -08:00
952d744378
done
2020-12-26 20:31:31 -08:00
6044086de0
changes
2020-12-26 20:29:52 -08:00
fb2b4f05c1
Merge branch 'subtler_tables' of github.com-kevinz000:silicons/Citadel-Station-13 into subtler_tables
2020-12-26 18:43:09 -08:00
36125c609d
ily putnam
2020-12-26 18:41:31 -08:00
fcd8d35c76
thank
2020-12-27 02:23:57 +00:00
97be4a5d12
Update say_vr.dm
2020-12-26 17:34:31 -07:00
b885abb69d
okay
2020-12-26 16:28:10 -08:00
27ecbdd6f1
why did i do this
2020-12-26 16:22:14 -08:00
b0b483105a
Merge pull request #13857 from silicons/contractor_fix_for_real
...
fixes contractor pods this time for real (and 25% tested instead of 0%)
2020-12-26 23:52:51 +00:00
zerothebigboy