Commit Graph

6250 Commits

Author SHA1 Message Date
silicons
9c0762f35a Update say_vr.dm 2020-12-31 03:41:55 -07:00
shellspeed1
f02a6cf68b Space 2020-12-31 01:18:30 -08:00
shellspeed1
949aab2a4a extra desc 2020-12-31 01:07:24 -08:00
shellspeed1
3462f3d114 Changes some descriptions. Port of https://github.com/BeeStation/BeeStation-Hornet/pull/3144 2020-12-31 00:43:05 -08:00
silicons
e91b3b7a81 Merge pull request #13916 from timothyteakettle/better-holoforms
reverts the removal of the holoform verb because kevin likes it
2020-12-30 14:45:23 -07:00
silicons
667651aebb Merge pull request #13915 from Xantholne/Birdsitfix
Fixes new bird sprites defaulting to basic parrot when sitting
2020-12-30 14:44:28 -07:00
silicons
a9d831d10d Update guardian.dm 2020-12-30 14:36:39 -07:00
DeltaFire
f957636a82 Merge pull request #13917 from timothyteakettle/squeak
*squeak
2020-12-30 18:32:30 +01:00
DeltaFire
eebb2e945a Merge pull request #13902 from timothyteakettle/slime-legs
slimes can now have digitigrade/avian legs
2020-12-30 18:25:48 +01:00
Xantholne
19c954fb39 asdafsafas 2020-12-29 21:04:08 -07:00
Xantholne
0db821f4f5 Fixes missing electus red from trying to be basic parrot and adds 2020-12-29 19:33:09 -07:00
Timothy Teakettle
e9d5b622a1 squeak 2020-12-30 02:25:53 +00:00
Timothy Teakettle
5bc7c5a448 revert 2020-12-30 02:21:30 +00:00
silicons
a0fb594236 Merge pull request #13900 from Xantholne/Birds
Ports cute birbs from RP
2020-12-29 00:50:58 -07:00
Letter N
51143f89e5 Merge remote-tracking branch 'origin/master' into semi-sync 2020-12-29 10:37:06 +08:00
silicons
abb37896a9 please work 2020-12-28 17:35:47 -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
51d1e3a87f intendation
sigh
2020-12-28 19:41:39 +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
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
Xantholne
121b1bb7fd Ports parrots from RP 2020-12-27 22:51:18 -07:00
silicons
53253bfce1 changes 2020-12-27 10:13:09 -08: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
raspy-on-osu
3738f09ca0 removes setup for ventcrawl implant in case of redundancy 2020-12-27 02:20:19 -05:00
silicons
753c1389cc fix 2020-12-26 22:04:05 -08:00
silicons
0cd0770549 fix 2020-12-26 21:32:12 -08:00
silicons
bfb3d087c3 ok 2020-12-26 20:50:28 -08:00
silicons
dafc6bf89f fix 2020-12-26 20:41:21 -08:00
silicons
952d744378 done 2020-12-26 20:31:31 -08:00
silicons
6044086de0 changes 2020-12-26 20:29:52 -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
raspy-on-osu
0e652cb64c init 2020-12-26 06:02:09 -05: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