cyberpresidentvanellope/S.P.L.U.R.T-Station-13
1
0
Fork 0
mirror of https://github.com/SPLURT-Station/S.P.L.U.R.T-Station-13.git synced 2025-12-10 09:54:52 +00:00
Code Issues Packages Projects Releases Wiki Activity
39,058 Commits 55 Branches 0 Tags
07a02617c20b34dc9a88c8c3750069d714751fbe
Commit Graph

39058 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Putnam
07a02617c2 Fixed compiler errors, runtimes 2020-10-18 12:51:00 -07:00
Putnam
00b4d207c5 Added ranked choice ballots to stat voting. 2020-10-18 12:32:45 -07:00
CitadelStationBot
393ab62c6b Automatic changelog generation for PR #13577 [ci skip] 2020-10-16 15:27:40 -05:00
Putnam3145
099a82b936 Made fermichem displays work correctly. (#13577) 2020-10-16 22:27:37 +02:00
CitadelStationBot
4534dec889 Automatic changelog generation for PR #13575 [ci skip] 2020-10-16 10:22:38 -05:00
BlueWildrose
a134bedd4c Fixes subtle hotkey, adds subtler hotkey (#13575) 2020-10-16 17:22:35 +02:00
CitadelStationBot
fbc1c4d4fc Automatic changelog generation for PR #13573 [ci skip] 2020-10-15 14:22:47 -05:00
Putnam3145
a9c365895e Merge pull request #13573 from Putnam3145/remove-surgery-test 
Removes the surgery unit test so travis stops randomly failing.
 2020-10-15 12:22:44 -07:00
Putnam
f0d5c65ef1 Removes the surgery unit test so travis stops randomly failing. 2020-10-15 11:54:03 -07: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
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
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
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
silicons
29b7b49fe9 Merge pull request #13528 from DeltaFire15/robotic-limbs-PT2 
Robotic limbs 2 : Threshhold Boogaloo
 2020-10-11 17:33:00 -07:00
CitadelStationBot
9e536c26ca Automatic changelog generation for PR #13473 [ci skip] 2020-10-11 15:41:39 -05:00
silicons
b4857fb685 Merge pull request #13473 from Tupinambis/spooder 
Ports Arachnids (Spider People) from WaspStation
 2020-10-11 13:41:36 -07:00
zerothebigboy
dd75b0e5c0 final sprite touch ups 2020-10-11 16:26:40 -04: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
CitadelStationBot
eb09502cd4 Automatic changelog generation for PR #13553 [ci skip] 2020-10-11 13:56:11 -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