shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
39,085 Commits 5 Branches 0 Tags
5566c00a697b9254d5bbe7285eb6cf5739b0213d
Commit Graph

17034 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
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
c649dbe6c6 better taurs 2020-10-15 23:04:55 +01: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
DeltaFire
36ac341e81 e 
empty lastline moment
 2020-10-11 15:45:07 +02:00
DeltaFire
a5fce4b6ed Merge remote-tracking branch 'upstream/master' into robotic-limbs-PT2 2020-10-11 15:39:41 +02:00
silicons
0c3020d4b8 Merge pull request #13349 from LetterN/git-updates 
Updates git, travis, and build tests
 2020-10-11 01:24:09 -07:00
Letter N
70a18ac0e3 shh - this makes travis work ^w^ 2020-10-11 15:58:54 +08:00
silicons
face07f532 Update supermatter.dm 2020-10-11 00:45:01 -07:00
zerothebigboy
ff937e249f Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into crepe 2020-10-11 03:14:02 -04:00
BlackMajor
3e61ccb31a Merge pull request #13545 from Citadel-Station-13/silicons-patch-10 
It's time for HALLOWEEN!
 2020-10-11 19:45:23 +13:00
BlackMajor
313970000b Merge pull request #13522 from silicons/async 
Fixes the intermittent master controller lockups
 2020-10-11 18:48:37 +13:00
BlackMajor
8be9e0aaad Merge pull request #13530 from Citadel-Station-13/silicons-patch-12 
THROWING A CLOWN INTO THE SUPERMATTER ENGINE NOW RANDOMLY ADJUSTS ENERGY AND DAMAGE
 2020-10-11 18:43:49 +13:00
BlackMajor
d69e081b23 Merge pull request #13193 from Citadel-Station-13/silicons-patch-17 
buffsi ntegrated circuit medium screens
 2020-10-11 18:42:49 +13:00