Commit Graph

39085 Commits

Author SHA1 Message Date
timothyteakettle
5566c00a69 fixes 2020-12-06 17:24:12 +00:00
timothyteakettle
a478da678e bugfixes 2020-12-06 15:50:33 +00:00
timothyteakettle
cbbcc0c386 fix the migration 2020-12-06 00:16:56 +00:00
timothyteakettle
dc42a07489 b 2020-12-06 00:02:23 +00:00
timothyteakettle
d05992ee44 Revert "a"
This reverts commit 640a86582a.
2020-12-06 00:02:17 +00:00
timothyteakettle
fa26f4c402 b 2020-12-06 00:02:14 +00:00
timothyteakettle
640a86582a a 2020-12-06 00:02:06 +00:00
Timothy Teakettle
afdbac31fa test 2020-12-05 22:35:27 +00:00
timothyteakettle
b1379dd49e still not working 2020-10-27 21:11:42 +00:00
timothyteakettle
e35b3e4a33 color editing 2020-10-26 00:47:40 +00:00
timothyteakettle
926b63ba06 stop using double spaces 2020-10-25 22:54:53 +00:00
Timothy Teakettle
0c2e1997ce more loadout 2 2020-10-25 22:49:39 +00:00
timothyteakettle
71134ed8c3 better loadout flags 2020-10-25 01:08:35 +00:00
timothyteakettle
a39dea1b4d json loadout 2020-10-24 00:31:45 +01:00
Timothy Teakettle
78d8e1fcee debug 2020-10-23 22:03:21 +01:00
timothyteakettle
2166bdac79 okay this aint going well 2020-10-21 00:11:40 +01:00
Timothy Teakettle
e6895bec04 better loadout 2020-10-20 21:02:17 +01:00
Timothy Teakettle
36040e0689 Revert "better taurs"
This reverts commit c649dbe6c6.
2020-10-20 20:05:16 +01:00
Timothy Teakettle
608e5147de Revert "Revert "add color type to all polychromics""
This reverts commit 587a2f8f19.
2020-10-20 20:05:11 +01:00
Timothy Teakettle
587a2f8f19 Revert "add color type to all polychromics"
This reverts commit 02912aa4ad.
2020-10-15 23:05:07 +01:00
Timothy Teakettle
c649dbe6c6 better taurs 2020-10-15 23:04:55 +01:00
Timothy Teakettle
02912aa4ad add color type to all polychromics 2020-10-15 20:57:45 +01:00
Timothy Teakettle
37030baa70 Merge remote-tracking branch 'upstream/master' into loadout-json 2020-10-15 20:05:56 +01:00
Timothy Teakettle
f337061c51 more defines 2020-10-15 20:05:39 +01:00
silicons
c3cdeb0507 fixes movespeed configurations (#13555)
* Update config_entry.dm

* Update game_options.dm

* Update config_entry.dm

* Update code/controllers/configuration/config_entry.dm

Co-authored-by: Ghom <42542238+Ghommie@users.noreply.github.com>
2020-10-15 13:53:21 +02:00
CitadelStationBot
b0523c570e Automatic changelog generation for PR #13552 [ci skip] 2020-10-15 06:38:53 -05:00
Putnam3145
bcf697e8d7 Fixes a race condition in the surgery unit test that causes it to fail at random (#13552)
* Fixes a race condition in the surgery unit test

* Increases the sleep a bit.
2020-10-15 13:38:49 +02:00
CitadelStationBot
2315471479 Automatic changelog generation for PR #13554 [ci skip] 2020-10-15 06:37:12 -05:00
Vynzill
cbe9f6c12a makes eyes glow once again with high luminosity (#13554) 2020-10-15 13:37:09 +02:00
CitadelStationBot
f1be55c283 Automatic changelog generation for PR #13549 [ci skip] 2020-10-15 05:54:26 -05:00
BlueWildrose
6080253759 Fixes cloning computer UI not updating when pressing certain buttons - also adds extra check for names to update a message (#13549)
* fixes cloning computer UI not updating when pressing certain buttons

* forgot a few things
2020-10-15 12:54:22 +02:00
CitadelStationBot
66aa95c54d Automatic changelog generation for PR #13561 [ci skip] 2020-10-15 05:44:11 -05:00
DeltaFire15
1e1a92983a [s] Objective fixes : Cryo edition (#13561)
* no more free wins from cryo

* Kicks travis with an empty commit

* Update code/game/gamemodes/objective.dm

Co-authored-by: Ghom <42542238+Ghommie@users.noreply.github.com>
2020-10-15 12:44:08 +02:00
CitadelStationBot
f0ab98bcaf Automatic changelog generation for PR #13563 [ci skip] 2020-10-15 04:49:09 -05:00
Timothy Teakettle
8287005dd5 does what it says on the title (#13563) 2020-10-15 11:49:05 +02:00
CitadelStationBot
bcfc011a12 Automatic changelog generation for PR #13566 [ci skip] 2020-10-15 04:48:16 -05:00
zeroisthebiggay
ea80867cda Update legion.dm (#13566) 2020-10-15 11:48:12 +02:00
Changelogs
5ef71fc15d Automatic changelog compile [ci skip] 2020-10-15 01:00:48 +00:00
Changelogs
f5d310e924 Automatic changelog compile [ci skip] 2020-10-14 00:59:40 +00:00
CitadelStationBot
a7b0d253ff Automatic changelog generation for PR #13529 [ci skip] 2020-10-13 13:53:15 -05:00
silicons
d148ac2aab Merge pull request #13529 from Putnam3145/superconductivity-planets
Makes planetary atmos no longer superconduct
2020-10-13 11:53:11 -07:00
Changelogs
1e2a1dc252 Automatic changelog compile [ci skip] 2020-10-13 01:00:24 +00:00
CitadelStationBot
997fc1f455 Automatic changelog generation for PR #13346 [ci skip] 2020-10-12 06:26:21 -05:00
Putnam3145
78a9c61952 Makes dwarf text not check every replacement every time. (#13346)
* Makes dwarf text not check every replacement every time.

* Apply suggestions from code review

Co-authored-by: Ghom <42542238+Ghommie@users.noreply.github.com>
2020-10-12 13:26:18 +02:00
Changelogs
792328fd0e Automatic changelog compile [ci skip] 2020-10-12 00:59:56 +00:00
CitadelStationBot
9553620da5 Automatic changelog generation for PR #13547 [ci skip] 2020-10-11 19:33:32 -05:00
silicons
ff46bfda10 Merge pull request #13547 from zeroisthebiggay/crepe
security fashion power crêpe but it's a sheath for your anime sword
2020-10-11 17:33:29 -07:00
CitadelStationBot
1c840f4f54 Automatic changelog generation for PR #13543 [ci skip] 2020-10-11 19:33:19 -05:00
silicons
a5ace5ed3a Merge pull request #13543 from zeroisthebiggay/tyrna
ports tg legion reworks, colossus now enrages against sand golems, and some minor sprite stuff with him too
2020-10-11 17:33:16 -07:00
CitadelStationBot
ab5f0e8ece Automatic changelog generation for PR #13528 [ci skip] 2020-10-11 19:33:04 -05:00