Commit Graph

5621 Commits

Author SHA1 Message Date
Letter N
51143f89e5 Merge remote-tracking branch 'origin/master' into semi-sync 2020-12-29 10:37:06 +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
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
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
silicons
e8fea4cf1b Update human_defines.dm 2020-12-28 00:19:35 -07:00
silicons
e0c928a745 Update respawn.dm 2020-12-27 06:57:15 -07:00
silicons
67d9e79934 fix 2020-12-27 05:27:46 -08:00
silicons
0cd0770549 fix 2020-12-26 21:32:12 -08:00
silicons
fb2b4f05c1 Merge branch 'subtler_tables' of github.com-kevinz000:silicons/Citadel-Station-13 into subtler_tables 2020-12-26 18:43:09 -08:00
silicons
36125c609d ily putnam 2020-12-26 18:41:31 -08:00
silicons
97be4a5d12 Update say_vr.dm 2020-12-26 17:34:31 -07:00
silicons
b885abb69d okay 2020-12-26 16:28:10 -08:00
silicons
27ecbdd6f1 why did i do this 2020-12-26 16:22:14 -08:00
Letter N
1095142a5f Merge remote-tracking branch 'origin/master' into semi-sync 2020-12-26 10:58:12 +08:00
Timothy Teakettle
8c8be2b92e tackle and puddle 2020-12-25 21:45:07 +00:00
DeltaFire
7aec74e9c9 Merge pull request #13845 from Citadel-Station-13/silicons-patch-37
fixes dullahans being hardcoded to ignore config unless it's halloween
2020-12-24 17:47:13 +01:00
Letter N
56fb81d02c Immursive Audio 2 2020-12-24 11:06:49 +08:00
DeltaFire
f9f328a9ea we love this code 2020-12-23 20:12:06 +01:00
Letter N
e9ca58446c Merge remote-tracking branch 'origin/master' into semi-sync 2020-12-23 12:25:24 +08:00
silicons
11722f6f5e Update arachnid.dm 2020-12-22 17:47:53 -07:00
silicons
0f16f866eb Update arachnid.dm 2020-12-22 17:43:41 -07:00
silicons
c1796db295 Update dullahan.dm 2020-12-22 09:47:26 -07:00
DeltaFire
d796952800 Merge pull request #13835 from silicons/pugilist_parry
Pugilists can now parry most things with their bare hands
2020-12-22 17:42:19 +01:00
DeltaFire
d3f30d21cf Merge pull request #13772 from silicons/respawn_system_2
adds a respawn/return to lobby system, tweaks cryo to preserve everything instead of just ""important items""
2020-12-22 17:40:33 +01:00
silicons
5fb90629e3 Merge pull request #13828 from timothyteakettle/tail-entwine-fix
fix: you can only entwine tails with people who have a tail
2020-12-22 09:32:26 -07:00
DeltaFire
65c14cf289 Merge pull request #13537 from silicons/permissions
support update for event manager permissions
2020-12-22 16:12:03 +01:00
silicons
310d4d573b Update death.dm 2020-12-21 21:46:00 -07:00
silicons
ea554b88a4 ok 2020-12-21 17:31:28 -07:00
silicons
5ff244a48c t 2020-12-21 17:20:44 -07:00
silicons
97e4aad75f changes 2020-12-21 17:14:22 -07:00
silicons
ca6df29998 Update death.dm 2020-12-21 13:42:33 -07:00
timothyteakettle
3d897e8fc1 fixes tail entwining 2020-12-21 17:15:51 +00:00
Letter N
abd94d1c03 Merge remote-tracking branch 'origin/master' into semi-sync 2020-12-21 21:19:06 +08:00
Letter N
98ff0a080e ImmursionAudio(TM) 2020-12-21 19:47:11 +08:00
Letter N
a808f805d4 ASYNC EVERYTHING! 2020-12-21 16:24:51 +08:00
silicons
7da6979b54 ok 2020-12-21 00:28:03 -07:00
silicons
97824f4030 ok 2020-12-21 00:14:48 -07:00
silicons
eef2a323ed ok 2020-12-21 00:11:19 -07:00
silicons
ce10278c5a changes 2020-12-20 19:25:49 -07:00
silicons
34f6697e81 Merge pull request #13796 from keronshb/fixedscarpchanges
Scarp Changes and Bundle
2020-12-20 09:23:20 -07:00
Poojawa
6fe6e6d779 Update Citadel_Snowflake.dm 2020-12-18 01:36:56 -06:00
keronshb
3d7c896100 Scarp Changes and Bundle
This should really fix it now.
2020-12-15 20:10:21 -05:00
silicons
0a593013e0 wew 2020-12-15 07:23:46 -07:00
silicons
e87cc27803 modifications 2020-12-15 07:21:06 -07:00
silicons
2844d2e4de fix 2020-12-14 06:01:32 -07:00
silicons
4db78b7868 Merge pull request #13757 from timothyteakettle/better-age-verification
changes the age gate to use date of birth
2020-12-13 23:09:41 -07:00
silicons
13bb064302 Merge pull request #13758 from timothyteakettle/better-holoforms
replaces custom holoform verb with an action, lets holoform AIs emote
2020-12-13 23:09:34 -07:00
silicons
413bd23d0a dnr prevention 2020-12-13 23:07:12 -07:00