Commit Graph

40204 Commits

Author SHA1 Message Date
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
CitadelStationBot
8f8ab6ff13 Automatic changelog generation for PR #13926 [ci skip] 2020-12-30 15:48:52 -06:00
silicons
bfa66b2810 Merge pull request #13926 from MrJWhit/revert-kevins-shame
Revert kevinzs' shame
2020-12-30 14:48:49 -07:00
DeltaFire
62a238e556 Merge pull request #13927 from Citadel-Station-13/silicons-patch-56
FUCK OFF WHY IS VORE SHITCODE CAUSING CHERNOBYL AGAIN I HATE VORE CODE
2020-12-30 22:46:36 +01:00
CitadelStationBot
1cf838ed76 Automatic changelog generation for PR #13905 [ci skip] 2020-12-30 15:46:29 -06:00
silicons
1b9a399bbd Merge pull request #13905 from zeroisthebiggay/help
gives codex cicatrix inhands
2020-12-30 14:46:26 -07:00
CitadelStationBot
a8b7ba9565 Automatic changelog generation for PR #13911 [ci skip] 2020-12-30 15:46:07 -06:00
silicons
3ad65d9b76 Merge pull request #13911 from raspy-on-osu/salicyclic-acid
salicyclic acid
2020-12-30 14:46:04 -07:00
CitadelStationBot
5f1536f8f3 Automatic changelog generation for PR #13916 [ci skip] 2020-12-30 15:45:26 -06: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
CitadelStationBot
a7e37c752d Automatic changelog generation for PR #13914 [ci skip] 2020-12-30 15:44:55 -06:00
silicons
813471dbbb Merge pull request #13914 from EmeraldSundisk/cog2020
Some area designation fixes for CogStation.
2020-12-30 14:44:52 -07:00
CitadelStationBot
2b89ca8978 Automatic changelog generation for PR #13915 [ci skip] 2020-12-30 15:44:34 -06: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
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
CitadelStationBot
ca130f19ab Automatic changelog generation for PR #13917 [ci skip] 2020-12-30 11:32:33 -06:00
DeltaFire
f957636a82 Merge pull request #13917 from timothyteakettle/squeak
*squeak
2020-12-30 18:32:30 +01:00
CitadelStationBot
fa3756d0c1 Automatic changelog generation for PR #13902 [ci skip] 2020-12-30 11:25:51 -06: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
CitadelStationBot
7a6e2a3f41 Automatic changelog generation for PR #13892 [ci skip] 2020-12-30 11:17:33 -06: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
CitadelStationBot
f2d25a89c0 Automatic changelog generation for PR #13913 [ci skip] 2020-12-30 10:53:44 -06:00
DeltaFire
1e3c2f802f Merge pull request #13913 from keronshb/scarpparrytweak
Local Martial Artist forgets one line of code (fixes Scarp Parrying)
2020-12-30 17:53:41 +01:00
CitadelStationBot
41eccd97d8 Automatic changelog generation for PR #13903 [ci skip] 2020-12-29 22:09:20 -06: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
Xantholne
5f75cee5ae fucking dashes 2020-12-29 19:21:07 -07:00
Xantholne
76ecd2cbb3 Fixes new bird sprites defaulting to basic parrot when sitting 2020-12-29 19:14:41 -07:00
EmeraldSundisk
ab260dcdec Add files via upload 2020-12-29 12:30:09 -08:00
EmeraldSundisk
6c5c342bb8 Update CogStation.dmm 2020-12-29 12:20:25 -08:00
EmeraldSundisk
b1f76a8566 Update Space_Station_13_areas.dm 2020-12-29 11:38:07 -08:00
EmeraldSundisk
0707f6ecfc Update Space_Station_13_areas.dm 2020-12-29 10:56:58 -08:00
EmeraldSundisk
6af5d180d0 Update Space_Station_13_areas.dm 2020-12-29 10:29:28 -08:00
EmeraldSundisk
3fdcccca56 Merge pull request #73 from Citadel-Station-13/master
12/29
2020-12-29 10:18:35 -08:00
keronshb
99a890b355 Adds block_parry_data
Ooops forgot one line of code
2020-12-29 09:30:29 -05:00
CitadelStationBot
29c24fc1cd Automatic changelog generation for PR #13884 [ci skip] 2020-12-29 02:28:43 -06:00
silicons
a7ed197675 Merge pull request #13884 from Hatterhat/are-you-fucking-kidding-me
":n hey miners don't forget the dock silver" the PR - also includes a box whiteship tinyfan fix
2020-12-29 01:28:39 -07: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
CitadelStationBot
3ba7740641 Automatic changelog generation for PR #13855 [ci skip] 2020-12-29 02:27:52 -06:00
silicons
da25c48b2c Merge pull request #13855 from Chiirno/paramedBoxOffice
Paramed office on box + Surgery remodel
2020-12-29 01:27:49 -07:00
CitadelStationBot
5a0a9393a5 Automatic changelog generation for PR #13900 [ci skip] 2020-12-29 01:51:01 -06: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