 r4d6
|
a91f31d9e6
|
Fix a typo
|
2020-01-07 11:21:00 -05:00 |
|
|
r4d6
|
68e48209da
|
Fix
|
2020-01-07 02:04:06 -05:00 |
|
|
r4d6
|
20d5e4f480
|
Make the RCD show its upgrades on examination.
And remove a small copy-pasta.
|
2020-01-07 01:45:59 -05:00 |
|
|
r4d6
|
c3f47e713a
|
Merge branch 'master' into RCD-Updates
|
2020-01-07 00:04:43 -05:00 |
|
|
r4d6
|
d7718c8dd1
|
Revert "Conflict Fix part 1"
This reverts commit 2ab07fdb82.
|
2020-01-06 23:43:27 -05:00 |
|
|
r4d6
|
2ab07fdb82
|
Conflict Fix part 1
|
2020-01-06 23:43:04 -05:00 |
|
|
CitadelStationBot
|
c39862711a
|
Automatic changelog generation for PR #10420 [ci skip]
|
2020-01-06 21:46:45 -06:00 |
|
|
kevinz000
|
4599abde4a
|
Merge pull request #10420 from MrJWhit/radiation-plasma-usage
Increase radiation plasma usage in radiation collector
|
2020-01-06 19:46:42 -08:00 |
|
|
CitadelStationBot
|
bbc8785f5e
|
Automatic changelog generation for PR #10439 [ci skip]
|
2020-01-06 21:45:31 -06:00 |
|
|
kevinz000
|
f6b9396096
|
Merge pull request #10439 from LetterN/tachelon-logs
doppler logs
|
2020-01-06 19:45:28 -08:00 |
|
|
Lin
|
2ce3b7fbf5
|
Merge pull request #10455 from Ghommie/Ghommie-cit501
Porting some runtime fixes.
|
2020-01-07 01:00:25 +00:00 |
|
|
Lin
|
da43d336c3
|
Merge pull request #10047 from Ghommie/Ghommie-cit425
Turns dog/cat petting into an element datum.
|
2020-01-07 00:55:19 +00:00 |
|
|
CitadelStationBot
|
7d4a52a91c
|
Automatic changelog generation for PR #9878 [ci skip]
|
2020-01-06 18:31:26 -06:00 |
|
|
Lin
|
718d4a080d
|
Merge pull request #9878 from Ghommie/Ghommie-cit382
Unmodularize several machinery and structures
|
2020-01-07 00:31:24 +00:00 |
|
|
Lin
|
46420a693d
|
Merge branch 'master' into Ghommie-cit425
|
2020-01-07 00:28:37 +00:00 |
|
|
CitadelStationBot
|
201a2056b9
|
Automatic changelog generation for PR #10384 [ci skip]
|
2020-01-06 14:47:18 -06:00 |
|
|
Ghom
|
d07d436ba2
|
Merge pull request #10384 from Hatterhat/tg-43454-43688-the-one-with-the-cargo
cargo tweaks, new shit, why do digitigrade sprites exist
|
2020-01-06 21:47:15 +01:00 |
|
|
CitadelStationBot
|
9006412a6a
|
Automatic changelog generation for PR #10401 [ci skip]
|
2020-01-06 01:08:52 -06:00 |
|
|
Putnam3145
|
3b6cf8c952
|
Merge pull request #10401 from r4d6/SM
Add three more Supermatter Engine variation for Box
|
2020-01-05 23:08:49 -08:00 |
|
|
CitadelStationBot
|
2533af0cfe
|
Automatic changelog generation for PR #10437 [ci skip]
|
2020-01-05 21:49:54 -06:00 |
|
|
Lin
|
7ad6021472
|
Merge pull request #10437 from Ghommie/Ghommie-cit497
Fixes roundstart mushpeople being unable to MUSH PUUUUUUUUUUUUNCH!!
|
2020-01-06 03:49:52 +00:00 |
|
|
Ghommie
|
dcb2ae77fa
|
Porting some runtime fixes.
|
2020-01-06 02:14:25 +01:00 |
|
|
Letter N
|
de14073956
|
limit
|
2020-01-06 08:34:48 +08:00 |
|
|
CitadelStationBot
|
53747013ee
|
Automatic changelog generation for PR #10427 [ci skip]
|
2020-01-05 16:08:26 -06:00 |
|
|
Ghom
|
869ed7a4aa
|
Merge pull request #10427 from Hatterhat/beakers-but-quirky
beaker tweaks: setting transfer values verb on altclick, value tweaks
|
2020-01-05 23:08:23 +01:00 |
|
|
CitadelStationBot
|
0b74f91268
|
Automatic changelog generation for PR #10350 [ci skip]
|
2020-01-05 16:05:15 -06:00 |
|
|
Ghom
|
e18244671f
|
Merge pull request #10350 from Putnam3145/dojo-ghostrole
Ghost cafe quality-of-life, plus making ghost role eligibility an element
|
2020-01-05 23:05:13 +01:00 |
|
|
Ghom
|
a8741a8462
|
As you command.
|
2020-01-05 23:01:35 +01:00 |
|
|
Ghom
|
329eecb537
|
Merge pull request #10446 from Citadel-Station-13/revert-10246-kevinz000-patch-129
Revert "Makes mob/Stat on a 1 second timer rather than fast-as-possible to tone down highpop lag"
|
2020-01-05 22:54:17 +01:00 |
|
|
kevinz000
|
6e50bb9c03
|
Revert "Makes mob/Stat on a 1 second timer rather than fast-as-possible to tone down highpop lag"
|
2020-01-05 12:47:24 -08:00 |
|
|
CitadelStationBot
|
bd896b4629
|
Automatic changelog generation for PR #10224 [ci skip]
|
2020-01-05 14:29:53 -06:00 |
|
|
Ghom
|
14ec7d963a
|
Merge pull request #10224 from Seris02/traitblacklisting
Makes trait blacklisting remove random positives instead of removing every quirk (new and improved)
|
2020-01-05 21:29:51 +01:00 |
|
|
Ghom
|
28ec50594c
|
Merge pull request #10443 from Citadel-Station-13/kevinz000-patch-4
ports tgstation pr 48583 "don't recheck connected clients in IsBanned and ignore world banchecks"
|
2020-01-05 20:33:34 +01:00 |
|
|
kevinz000
|
a8a5ff819d
|
Update IsBanned.dm
|
2020-01-05 10:06:09 -08:00 |
|
|
kevinz000
|
4589c7c0c6
|
Update IsBanned.dm
|
2020-01-05 08:52:00 -08:00 |
|
|
Ghommie
|
8c7b648a4f
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit425
|
2020-01-05 17:42:54 +01:00 |
|
|
CitadelStationBot
|
b0eed9410b
|
Automatic changelog generation for PR #10317 [ci skip]
|
2020-01-05 09:24:49 -06:00 |
|
|
Ghom
|
db13f748aa
|
Merge pull request #10317 from Trilbyspaceclone/map_redo
Corrects issues with box map
|
2020-01-05 16:24:46 +01:00 |
|
|
CitadelStationBot
|
db4db9a9c4
|
Automatic changelog generation for PR #10433 [ci skip]
|
2020-01-05 09:23:39 -06:00 |
|
|
Ghom
|
59279a7cd4
|
Merge pull request #10433 from Citadel-Station-13/kevinz000-patch-7
nerfs pogscarabs
|
2020-01-05 16:23:37 +01:00 |
|
|
CitadelStationBot
|
714022be83
|
Automatic changelog generation for PR #10435 [ci skip]
|
2020-01-05 09:22:47 -06:00 |
|
|
Ghom
|
516ec585d2
|
Merge pull request #10435 from Hatterhat/tg-40394
biogenerator can print flour sacks and enzyme now, also some boxes idk
|
2020-01-05 16:22:44 +01:00 |
|
|
CitadelStationBot
|
69d5602dd7
|
Automatic changelog generation for PR #10430 [ci skip]
|
2020-01-05 08:51:34 -06:00 |
|
|
Ghom
|
5720afb169
|
Merge pull request #10430 from Citadel-Station-13/VIBE-CHECK
VIBE CHECK
|
2020-01-05 15:51:32 +01:00 |
|
|
Ghom
|
8bf75be8ff
|
Yea no, go away zoomer kevinz
|
2020-01-05 15:38:23 +01:00 |
|
|
Ghom
|
4655815c12
|
Merge pull request #10396 from Hatterhat/revert-8056-tegnerf
reverts that one TEG nerf that forced it to require an arbitrary burnmix
|
2020-01-05 15:36:02 +01:00 |
|
|
CitadelStationBot
|
77c09427ef
|
Automatic changelog generation for PR #10428 [ci skip]
|
2020-01-05 08:33:56 -06:00 |
|
|
Ghom
|
0646a8557b
|
Merge pull request #10428 from Putnam3145/bomb_fix
Made dev bombs kill through bomb armor again
|
2020-01-05 15:33:54 +01:00 |
|
|
CitadelStationBot
|
e62d18ac33
|
Automatic changelog generation for PR #10256 [ci skip]
|
2020-01-05 08:19:50 -06:00 |
|
|
Ghom
|
fdff70b702
|
Merge pull request #10256 from Putnam3145/alcohol-intolerance
Adds an alcohol intolerance trait (NOT light drinker)
|
2020-01-05 15:19:48 +01:00 |
|