Commit Graph

40231 Commits

Author SHA1 Message Date
silicons
9cebd096eb Merge pull request #13930 from MrJWhit/fixing-up-sec-on-box
Touchups for sec box
2021-01-01 02:17:16 -07:00
CitadelStationBot
7b9a2656ce Automatic changelog generation for PR #13924 [ci skip] 2021-01-01 01:15:55 -06:00
DeltaFire
a2bb761bee Merge pull request #13924 from SandPoot/master
Allows mass sticking money into your id
2021-01-01 08:15:53 +01:00
DeltaFire
ee6601276d Merge pull request #13935 from Citadel-Station-13/silicons-patch-58
fixes a bug
2021-01-01 08:11:40 +01:00
CitadelStationBot
3533f2f494 Automatic changelog generation for PR #13909 [ci skip] 2020-12-31 21:14:29 -06:00
DeltaFire
38565e0027 Merge pull request #13909 from silicons/twitch_plays
Twitch Plays: Clown Car
2021-01-01 04:14:26 +01:00
silicons
1a027c2fa2 good catch 2020-12-31 13:34:47 -07:00
SandPoot
a0e95b7c3d Update code/modules/mining/ores_coins.dm
Co-authored-by: DeltaFire <46569814+DeltaFire15@users.noreply.github.com>
2020-12-31 16:59:33 -03:00
CitadelStationBot
0a4fe70873 Automatic changelog generation for PR #13885 [ci skip] 2020-12-31 13:38:09 -06:00
silicons
f1205efa0f Merge pull request #13885 from raspy-on-osu/spaceheater-buff
Makes space heaters worth using
2020-12-31 12:38:07 -07:00
CitadelStationBot
0d796f84b2 Automatic changelog generation for PR #13867 [ci skip] 2020-12-31 13:35:42 -06:00
silicons
591aa78c24 Merge pull request #13867 from Citadel-Station-13/zeolite-easy
Makes zeolites far, far easier to make
2020-12-31 12:35:37 -07:00
DeltaFire
c699113061 Merge pull request #13928 from Citadel-Station-13/silicons-patch-57
while we're at it let's make holoparasites not carry radiation either thanks @lbd
2020-12-31 19:01:12 +01:00
silicons
9c0762f35a Update say_vr.dm 2020-12-31 03:41:55 -07:00
MrJWhit
d0aaf0abfc touchups for sec box 2020-12-30 21:00:46 -05: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
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
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
SandPoot
1fa828a3f7 upload files 2020-12-30 13:57:10 -03: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