Commit Graph
38168 Commits
Author SHA1 Message Date
SandPootandGitHub 41e2a0356a Moves pref menu stuff again (#62) 2020-09-04 15:28:59 -03:00
Enric Gabriel 486ca9a81a Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into master 2020-09-04 10:15:54 -03:00
CitadelStationBot 8d7aaa5045 Automatic changelog generation for PR #13324 [ci skip] 2020-09-04 06:10:06 -05:00
siliconsandGitHub 12c5680d58 Merge pull request #13324 from Putnam3145/extools-logging
Added threaded extools logging as an alternative to rust_g logging.
2020-09-04 04:10:02 -07:00
CitadelStationBot 86a845718d Automatic changelog generation for PR #13338 [ci skip] 2020-09-04 06:09:28 -05:00
siliconsandGitHub 3806bd5c71 Merge pull request #13338 from Putnam3145/saving-test-update
Makes the character save test more verbose when failing.
2020-09-04 04:09:25 -07:00
Changelogs eb7221e9cb Automatic changelog compile [ci skip] 2020-09-04 00:21:58 +00:00
Changelogs f41c95a6a4 Automatic changelog compile [ci skip] 2020-09-04 00:13:57 +00:00
Putnam 6fe345dc2c Makes the character save test more verbose when failing. 2020-09-03 15:44:43 -07:00
Sandstorm-bot 12b5101f22 Automatic changelog generation for PR #60 [ci skip] 2020-09-03 16:43:49 -03:00
SandPootandGitHub 3f6733fc72 Ports tgstation/53371 (#60) 2020-09-03 16:43:42 -03:00
Enric Gabriel 05485c4b2c Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into master 2020-09-03 15:26:38 -03:00
CitadelStationBot da003edc4a Automatic changelog generation for PR #13322 [ci skip] 2020-09-02 19:56:44 -05:00
Putnam3145andGitHub bce53f71ce Merge pull request #13322 from timothyteakettle/fix-accents
makes handle_speech in ipc accent actually return the speech args so ipcs can talk
2020-09-02 17:56:40 -07:00
Putnam3145andGitHub fd6bda366f Merge pull request #13325 from Citadel-Station-13/revert-13184-two-joke-sprites
Revert "removes two unused sprites"
2020-09-02 17:33:08 -07:00
Changelogs 186ac60dcb Automatic changelog compile [ci skip] 2020-09-03 00:21:08 +00:00
Changelogs bc974047a3 Automatic changelog compile [ci skip] 2020-09-03 00:14:00 +00:00
CitadelStationBot 1fcf738a6b Automatic changelog generation for PR #13330 [ci skip] 2020-09-02 17:56:58 -05:00
siliconsandGitHub bce78a4e55 Merge pull request #13330 from Ghommie/Ghommie-cit837
Banishing a few blemishes.
2020-09-02 15:56:54 -07:00
Enric Gabriel fd6553faf9 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into master 2020-09-02 14:35:57 -03:00
Ghommie a455092c1f aaaa 2020-09-02 19:27:04 +02:00
Ghommie dc9b024fae Blemishes begone. 2020-09-02 19:16:16 +02:00
Putnam d0a0b30665 guess who forgot travis runs on linux 2020-09-02 01:11:42 -07:00
Putnam 7b8f7aafa8 okay no it's probably this. 2020-09-02 00:57:28 -07:00
Putnam 92ea60a03e Probably actually fixed it. 2020-09-02 00:49:30 -07:00
Changelogs 5fcdd24ec9 Automatic changelog compile [ci skip] 2020-09-02 00:21:15 +00:00
Changelogs 6f5de529c1 Automatic changelog compile [ci skip] 2020-09-02 00:13:45 +00:00
Putnam3145andGitHub c0b73f8d6a Merge pull request #13306 from Citadel-Station-13/silicons-patch-28
new codebase policy do not use potentially volatile procs in character setup of all places so we can stop having the moments when everyone's characters get bricked for the 619634'th time.
2020-09-01 15:37:34 -07:00
Putnam e519627944 Maybe fixes that error-on-exit 2020-09-01 15:34:27 -07:00
Putnam b7a7170f7c Actually I ain't using it so it goes away. 2020-09-01 15:32:22 -07:00
Enric Gabriel ec8c53071c removes this port as cit has their own now. 2020-09-01 13:31:55 -03:00
Enric Gabriel d04a499179 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into master 2020-09-01 11:40:44 -03:00
CitadelStationBot 4f33865ce5 Automatic changelog generation for PR #13305 [ci skip] 2020-08-31 23:21:49 -05:00
siliconsandGitHub 10fdc4427a Merge pull request #13305 from Tupinambis/maintloot2
Removes growth pills and genital autosurgeons from the maint loot table. Shoves them in the kinkmates.
2020-08-31 21:21:46 -07:00
CitadelStationBot e4c758e92e Automatic changelog generation for PR #13307 [ci skip] 2020-08-31 23:21:12 -05:00
siliconsandGitHub 9a4f9aef6e Merge pull request #13307 from raspy-on-osu/pyroanomaly-slimespawn-spam
pyro anomaly spam salt pr (offer_control now supports ignore_category)
2020-08-31 21:21:09 -07:00
CitadelStationBot ed791312d6 Automatic changelog generation for PR #13308 [ci skip] 2020-08-31 23:20:52 -05:00
siliconsandGitHub 0dc96492a1 Merge pull request #13308 from Putnam3145/save_character_unit_test
Adds a character saving unit test
2020-08-31 21:20:48 -07:00
CitadelStationBot 5ffa571e67 Automatic changelog generation for PR #13310 [ci skip] 2020-08-31 23:20:18 -05:00
siliconsandGitHub db28a50953 Merge pull request #13310 from Putnam3145/fix-fusion-display
Makes fusion analyze not assume we're still on fusion v5
2020-08-31 21:20:15 -07:00
CitadelStationBot 2bb19e838b Automatic changelog generation for PR #13316 [ci skip] 2020-08-31 23:19:40 -05:00
siliconsandGitHub 77cf561f7f Merge pull request #13316 from timothyteakettle/ckey-pref
pref for hiding your ckey from roundend report
2020-08-31 21:19:37 -07:00
CitadelStationBot 81645301e1 Automatic changelog generation for PR #13313 [ci skip] 2020-08-31 23:19:12 -05:00
siliconsandGitHub 1670b6f2a6 Merge pull request #13313 from Putnam3145/plastitanium-rapier-fix
Makes plastitanium rapier not silently poison for pacifists.
2020-08-31 21:19:09 -07:00
siliconsandGitHub 6348dd7d13 Revert "removes two unused sprites" 2020-08-31 21:06:18 -07:00
Putnam 735809a69b Commented out threaded FFI. 2020-08-31 20:11:52 -07:00
Putnam 2f3edb4491 Added threaded extools logging as an alternative to rust_g logging. 2020-08-31 19:56:49 -07:00
Enric Gabriel c4bb4e5873 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into master 2020-08-31 21:23:27 -03:00
Changelogs ecad0f1a7c Automatic changelog compile [ci skip] 2020-09-01 00:21:44 +00:00
Changelogs e652591639 Automatic changelog compile [ci skip] 2020-09-01 00:16:02 +00:00