Commit Graph

17044 Commits

Author SHA1 Message Date
Timothy Teakettle
f17bf787e7 render antennas 2020-10-23 20:19:25 +01:00
Timothy Teakettle
f778ec0199 yeah lets maybe render stuff 2020-10-22 01:33:53 +01:00
timothyteakettle
a9a4d00171 second qol 2020-10-22 00:08:33 +01:00
timothyteakettle
20854dd639 extra qol 2020-10-22 00:01:41 +01:00
timothyteakettle
4a3afae9d1 WHAT IF WE FIXED EVERYTHING IN ONE COMMIT 2020-10-21 23:59:15 +01:00
Timothy Teakettle
06bbddd248 Update preferences_savefile.dm 2020-10-21 18:20:14 +01:00
Timothy Teakettle
ab35f8cf66 include literally everything 2020-10-21 15:47:42 +01:00
Timothy Teakettle
f5cc216a4c travis segfaulted 2020-10-18 21:51:58 +01:00
Timothy Teakettle
c53eeff33f travis segfaulted 2020-10-18 21:51:36 +01:00
Timothy Teakettle
f965b78960 remove debug messages 2020-10-18 21:36:51 +01:00
Timothy Teakettle
8e2345d2f7 FUCK 2020-10-18 21:36:17 +01:00
Timothy Teakettle
2ac3bbbaf3 fix 2020-10-18 21:09:20 +01:00
Timothy Teakettle
bb46fa319c fix 2020-10-18 18:34:07 +01:00
Timothy Teakettle
bfb3546ccc save/load 2020-10-18 18:16:29 +01:00
Timothy Teakettle
40efc4b8c8 cleanup and migration fix 2020-10-18 18:05:59 +01:00
Timothy Teakettle
87387f45d1 fixes 2020-10-17 23:32:08 +01:00
Timothy Teakettle
5e780064c1 fixes and a toggle 2020-10-17 19:47:46 +01:00
timothyteakettle
04e1d9fc39 more fixes 2020-10-17 03:42:14 +01:00
timothyteakettle
d5a1834788 more fixes 2020-10-17 01:40:02 +01:00
timothyteakettle
4f5465c39e fixes 2020-10-17 01:00:04 +01:00
Timothy Teakettle
2c6e8fd87d what if color was cool 2020-10-16 22:28:00 +01:00
BlueWildrose
a134bedd4c Fixes subtle hotkey, adds subtler hotkey (#13575) 2020-10-16 17:22:35 +02:00
Putnam
f0d5c65ef1 Removes the surgery unit test so travis stops randomly failing. 2020-10-15 11:54:03 -07: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
Vynzill
cbe9f6c12a makes eyes glow once again with high luminosity (#13554) 2020-10-15 13:37:09 +02:00
zeroisthebiggay
ea80867cda Update legion.dm (#13566) 2020-10-15 11:48:12 +02: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
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
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
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
silicons
29b7b49fe9 Merge pull request #13528 from DeltaFire15/robotic-limbs-PT2
Robotic limbs 2 : Threshhold Boogaloo
2020-10-11 17:33:00 -07:00
Tupinambis
8c22580c08 Update species.dm
consistent commenting even though it's not consistent anyway.
2020-10-11 14:35:59 -05:00
Tupinambis
3224533a7c Merge branch 'master' into spooder 2020-10-11 14:31:23 -05:00
Putnam3145
cbb6020d49 Merge pull request #13553 from timothyteakettle/eye-sprites
fixes eye sprites up
2020-10-11 11:56:08 -07:00
Timothy Teakettle
89f2c53d88 ignore those reverts 2020-10-11 18:23:56 +01:00
Timothy Teakettle
86deb56d8d Revert "Revert "cleanup""
This reverts commit c770a90ccb.
2020-10-11 17:11:34 +01:00
Timothy Teakettle
5e616f6297 Revert "Revert "finishing touches""
This reverts commit b650fa1761.
2020-10-11 17:11:27 +01:00
Timothy Teakettle
5aff38597f Revert "Revert "Revert "Revert "customizable eyes""""
This reverts commit d852aacb78.
2020-10-11 17:11:01 +01:00
Timothy Teakettle
d852aacb78 Revert "Revert "Revert "customizable eyes"""
This reverts commit dedfdf224d.
2020-10-11 16:55:07 +01:00
Timothy Teakettle
1f800064de Revert "Revert "Merge branch 'master' into eye-sprites""
This reverts commit d3a042deaa.
2020-10-11 16:55:00 +01:00
Timothy Teakettle
dedfdf224d Revert "Revert "customizable eyes""
This reverts commit 9f3d745d80.
2020-10-11 16:54:53 +01:00
Timothy Teakettle
b76b97fbe9 Revert "Revert "eyes""
This reverts commit 4526fef297.
2020-10-11 16:54:50 +01:00
Timothy Teakettle
4526fef297 Revert "eyes"
This reverts commit 0c99b53c05.
2020-10-11 16:54:12 +01:00
Timothy Teakettle
9f3d745d80 Revert "customizable eyes"
This reverts commit dc70d17a1e.
2020-10-11 16:54:09 +01:00
Timothy Teakettle
d3a042deaa Revert "Merge branch 'master' into eye-sprites"
This reverts commit b48f4b91e6, reversing
changes made to dc70d17a1e.
2020-10-11 16:54:05 +01:00
Timothy Teakettle
b650fa1761 Revert "finishing touches"
This reverts commit 05aef528d7.
2020-10-11 16:54:01 +01:00
Timothy Teakettle
c770a90ccb Revert "cleanup"
This reverts commit 1fc7d9a21e.
2020-10-11 16:53:57 +01:00
DeltaFire
8895560c4b tweaks threshholds a bit
modifies the advanced prosthetics threshhold a bit:
25 > 20, still 5 mindamage.
2020-10-11 16:57:15 +02:00
DeltaFire
0f7868546b h m m 2020-10-11 16:28:40 +02:00
DeltaFire
4f734f68a9 moves damage checks
title. Makes it harder to circumvent them.
2020-10-11 16:18:25 +02:00