Commit Graph

18009 Commits

Author SHA1 Message Date
silicons 1b9a399bbd Merge pull request #13905 from zeroisthebiggay/help
gives codex cicatrix inhands
2020-12-30 14:46:26 -07:00
silicons 3ad65d9b76 Merge pull request #13911 from raspy-on-osu/salicyclic-acid
salicyclic acid
2020-12-30 14:46:04 -07: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
silicons 909b25892f Update belly_obj.dm 2020-12-30 14:22:32 -07:00
silicons 23e77db584 Update belly_obj.dm 2020-12-30 14:19:37 -07:00
MrJWhit 258c6f3818 Update arousal.dm 2020-12-30 16:14:03 -05: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
DeltaFire 3dbf4830f0 Merge pull request #13892 from Citadel-Station-13/silicons-patch-50
rebalances changeling combat mutations
2020-12-30 18:17:30 +01:00
SandPoot 1fa828a3f7 upload files 2020-12-30 13:57:10 -03:00
Timothy Teakettle a4a2765735 Update client_procs.dm 2020-12-30 16:56:03 +00:00
Lin b062104c2f Merge pull request #13903 from DeltaFire15/ling-deathgasps
Lings no longer deathgasp twice when entering regen stasis
2020-12-30 04:09:17 +00:00
Xantholne 19c954fb39 asdafsafas 2020-12-29 21:04:08 -07:00
Lin f303151b5f Merge pull request #13910 from Citadel-Station-13/silicons-patch-55
override movespeed for wheelchairs
2020-12-30 03:59:40 +00: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
Timothy Teakettle 7224d3ad17 oops! all runtimes! 2020-12-29 16:13:44 +00: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 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
Letter N dbe01c38ca do-not-force-yet 2020-12-29 14:09:45 +08:00
Letter N 3996f50a00 who is nanotransen 2020-12-29 14:00:58 +08:00
Letter N 3c1cfca9c5 update this! 2020-12-29 11:24:55 +08:00
Letter N 23a7d8777d hash browns 2020-12-29 11:20:26 +08:00
Letter N f28363ae56 code quality 2020-12-29 11:12:56 +08:00
Putnam 3a7f360fe9 Made the returns make more sense. 2020-12-28 19:06:37 -08:00
Putnam 24b14c40e4 Rearranged rolldown and toggle_jumpsuit_adjust to be sane. 2020-12-28 19:02:30 -08:00
Putnam b1bd28be3c Makes gear harnesses unusable when unusable 2020-12-28 18:57:48 -08:00
Letter N 51143f89e5 Merge remote-tracking branch 'origin/master' into semi-sync 2020-12-29 10:37:06 +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 ee9cc135f1 fix 2020-12-28 17:43:50 -08:00
silicons abb37896a9 please work 2020-12-28 17:35:47 -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 0c87c3b0e0 fiX 2020-12-28 12:15:55 -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
silicons 1dfe6d3685 Update miscellaneous.dm 2020-12-28 12:59:05 -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 51d1e3a87f intendation
sigh
2020-12-28 19:41:39 +01:00
DeltaFire 01f1844781 there 2020-12-28 19:15:59 +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