Commit Graph
37672 Commits
Author SHA1 Message Date
Artur 8d073bbce6 Merge remote-tracking branch 'upstream/master' into TGUI_Updoot 2020-09-02 19:05:18 +03:00
Artur 872e22c4b7 travis 2020-09-02 19:05:08 +03:00
Artur c79e9fbc0b https://github.com/tgstation/tgstation/pull/53263 2020-09-02 18:48:09 +03:00
Artur debc300563 https://github.com/tgstation/tgstation/pull/53236/ 2020-09-02 18:39:00 +03:00
Artur d59748ceaa https://github.com/tgstation/tgstation/pull/53168/ 2020-09-02 18:38:47 +03:00
Artur 542453a7f1 Fixes shidd not working 2020-09-02 18:04:36 +03:00
Artur 3bef4ba35e TGUI updates + statpanel 2020-09-02 17:52:47 +03: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
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
Changelogs e652591639 Automatic changelog compile [ci skip] 2020-09-01 00:16:02 +00:00
CitadelStationBot 515e0333fc Automatic changelog generation for PR #13319 [ci skip] 2020-08-31 19:00:01 -05:00
siliconsandGitHub 4936829bac Merge pull request #13319 from BlueWildrose/hungryhungryslimes
Fixed newly created slimes being hungry
2020-08-31 16:59:58 -07:00
Putnam3145andGitHub 5bcae6431b Merge pull request #13323 from silicons/rsc
Fixes external_rsc_urls so we can finally get rid of (about 50% of) this godawful lag
2020-08-31 16:21:32 -07:00
Timothy Teakettle d859d12b9f yes 2020-09-01 00:14:17 +01:00
silicons ee0d86f201 fix 2020-08-31 14:14:53 -07:00
Blue Wildrose cc9648c08d Update slime.dm 2020-08-30 23:19:18 -07:00
timothyteakettle af2c7b295e ah yes 2020-08-31 02:25:54 +01:00
timothyteakettle a9ec2254ba hide your ckey 2020-08-31 01:47:49 +01:00
Changelogs d97d9f564b Automatic changelog compile [ci skip] 2020-08-31 00:15:04 +00:00
CitadelStationBot 55fcd95eba Automatic changelog generation for PR #13294 [ci skip] 2020-08-30 15:15:13 -05:00
siliconsandGitHub 4bfa6d0a06 Merge pull request #13294 from Putnam3145/health-event-fix
Added health exemption to a couple events that need it.
2020-08-30 13:15:10 -07:00
Putnam 6028c66ceb Fixed the combat log issue 2020-08-30 08:26:29 -07:00
Putnam 10586f3c3b trend, trend! 2020-08-30 07:33:17 -07:00
Putnam 4cf040a11a Makes plastitanium rapier not silently poison for pacifists. 2020-08-30 06:25:00 -07:00
Putnam 4626a9a411 Merge branch 'fix-fusion-display' of https://github.com/Putnam3145/Citadel-Station-13 into fix-fusion-display 2020-08-30 05:42:38 -07:00
Putnam 9da959795c Made the text make sense, again. 2020-08-30 05:42:21 -07:00
Putnam3145andGitHub 4d4cfd58d9 Remove bizarre changelog change. 2020-08-30 05:35:03 -07:00
Putnam 15b5b77494 Replaced all the references of fusionpower to instability in results. 2020-08-30 03:06:36 -07:00
Putnam 384170331c Merge branch 'fix-fusion-display' of https://github.com/Putnam3145/Citadel-Station-13 into fix-fusion-display 2020-08-30 03:05:07 -07:00
Putnam 6f2e871ba3 Merge branch 'master' of https://github.com/Putnam3145/Citadel-Station-13 2020-08-30 03:02:40 -07:00
Putnam 5ba883bfe5 Fixes fusion power text to make sense. 2020-08-30 02:53:46 -07:00
CitadelStationBot 282f292347 Automatic changelog generation for PR #13058 [ci skip] 2020-08-30 02:52:58 -05:00
siliconsandGitHub 69f6927275 Update broom.dm (#13058) 2020-08-30 09:52:54 +02:00
Putnam 66899faa72 needs that var/ 2020-08-29 23:10:13 -07:00
Putnam 3097c790b8 Added an extra test. 2020-08-29 23:02:18 -07:00
Putnam e97ef2d84d Added a character saving unit test. 2020-08-29 22:58:04 -07:00
raspy-on-osu c90c46a2d1 mob_spawners 2020-08-30 01:50:55 -04:00
siliconsandGitHub a8f920f88c Update _lists.dm 2020-08-29 22:48:26 -07:00