shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
43,913 Commits 5 Branches 0 Tags
ba51785fac13c8ce325b160db6984b57bf714dce
Commit Graph

1650 Commits

Author SHA1 Message Date
BlackMajor 313970000b Merge pull request #13522 from silicons/async 
Fixes the intermittent master controller lockups
 2020-10-11 18:48:37 +13:00
BlackMajor bf7d68884b Merge pull request #13510 from silicons/google 
a more sane json-based map override system for jobs (todo port to rp so rp can have map rotation)
 2020-10-11 18:39:10 +13:00
silicons 2919dfee2e Merge pull request #13014 from Hatterhat/tendril-minimum 
[REVIEW PLEASE] Minimum Megas/Tendrils For Lavaland But Cleaner I Swear
 2020-10-10 21:58:15 -07:00
silicons 19f1e99a8c mass ports like 15 tg prs + counting (#13386) 
* changes

* ok

* changes

* sigh

* fixes

* changes

* fix

* fix

* alright

* fixes
git pus

* fix

* fix

* fix

* test

* ok

* Update code/modules/paperwork/ticketmachine.dm

Co-authored-by: Letter N <24603524+LetterN@users.noreply.github.com>

* ok

* compile and other stuff

* ok

* fix

* fix

* Fix

* Update menu.dm

* Update view.dm

* Update preferences.dm

Co-authored-by: Letter N <24603524+LetterN@users.noreply.github.com>
Co-authored-by: Putnam3145 <putnam3145@gmail.com>
 2020-10-10 12:20:33 +02:00
silicons 03a47bda6d Merge pull request #13252 from timothyteakettle/loadout-loading 
qol: looking at loadout equips your loadout items on you instead of job items
 2020-10-06 16:50:08 -07:00
silicons 7c07863179 fix 2020-10-05 13:29:53 -07:00
Letter N 1b30fbf703 Update statpanel.dm 2020-10-05 20:07:04 +08:00
Letter N ea48dd1e2e part 2 2020-10-05 20:02:12 +08:00
Timothy Teakettle 46ebb72905 Merge branch 'master' into loadout-loading 2020-10-04 01:43:17 +01:00
silicons 21d3d8fcd9 sigh 2020-10-03 14:17:13 -07:00
Letter N d6beeffad5 reverts this regression 2020-10-03 20:26:32 +08:00
Letter N 47845f2c30 suposed to be SSupdates but noo 2020-10-03 19:54:23 +08:00
Hatterhat 0310e3ebd5 please travis stop crashing on me 2020-10-01 19:10:13 -05:00
Tupinambis d2860b38c7 normalization 2020-10-01 18:46:31 -05:00
Tupinambis f1bc1ccafb Merge branch 'master' into spooder 
# Conflicts:
#	code/modules/surgery/organs/eyes.dm

I have no idea if this will work
 2020-10-01 17:10:42 -05:00
Tupinambis a3a5fe4c2d Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into spooder 2020-09-30 16:07:21 -05:00
Tupinambis 113b84ab50 Ports arachnids from WaspStation 2020-09-30 15:10:17 -05:00
Zandario 9104e2c041 Revert "C++ innovations: adds an "unstuck" step to SSair, AKA brute forcing LINDA" 2020-09-29 15:40:12 -05:00
Putnam 24c48c2bec Adds an "unstuck" step to LINDA 2020-09-25 09:40:32 -07:00
Putnam 650d76ba69 Fixed a dumb typo. 2020-09-23 22:36:12 -07:00
silicons 7ca1b1dc79 Merge pull request #13380 from Putnam3145/cache-locality-experiments 
(TESTMERGE THIS FIRST WOW) Made monstermos faster and more convenient
 2020-09-23 14:39:56 -07:00
Artur d493886875 Speedmerge fix 2020-09-23 19:14:50 +03:00
Putnam e89e7adda4 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into cache-locality-experiments 2020-09-21 03:31:35 -07:00
Artur 435565f1d8 Merge remote-tracking branch 'origin/master' into TGUI_Updoot 2020-09-21 00:16:12 +03:00
Ghom 868e464b40 fixes linter issues, removes acid degrading armor (#13399) 
* fix

* more

* Update brawn.dm

* Update ticketmachine.dm
 2020-09-19 15:04:48 +02:00
Artur 74533d3f9d fiiix shit 2020-09-16 11:16:39 +03:00
silicons ca8b13b86a Merge pull request #13255 from timothyteakettle/limbs 
you can choose limbs to be prosthetic/amputated
 2020-09-16 00:31:18 -07:00
silicons 95ebeac5b6 fix 2020-09-15 17:27:11 -07:00
Putnam b06f19cf5c Brought reactions to extools again; now including debug symbols. 
This time they work!
 2020-09-14 19:32:31 -07:00
Putnam 372be3bf5c Fixed all the problems. 2020-09-14 02:37:07 -07:00
Putnam 3ea7f0defa Added a gas mixture counter and fixed a segfault on exit. 2020-09-10 17:42:49 -07:00
Putnam 373f6a1068 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into cache-locality-experiments 2020-09-10 04:57:43 -07:00
Putnam fb17f0cc75 Somehow made monstermos over 100x as fast 2020-09-10 04:48:55 -07:00
Artur 12fbd67b6d Stupid shit 2020-09-09 21:27:32 +03:00
Artur ff4c94c2d5 Fixes some verbs and gateway 2020-09-09 21:08:16 +03:00
silicons 07b28f40de Merge pull request #13359 from Ghommie/Ghommie-cit838 
Turf visuals fix plus corrected names of a couple things.
 2020-09-07 13:42:05 -07:00
Hatterhat e157125033 hrhnghnghn dreamcheckerrrrr 2020-09-07 03:55:37 -05:00
Hatterhat 52678a7e28 doktor...turn off my cringe inhibitors........ 2020-09-06 18:51:13 -05:00
Hatterhat 76df5b0efe travis rerun and test messages gone 2020-09-06 18:00:19 -05:00
Ghommie 4a04b22b72 Turf visuals fix plus corrected names of a couple things. 2020-09-06 18:53:01 +02:00
BlackMajor 1943a2fdd7 Merge pull request #13246 from silicons/anomaly_manufacturing 
anomaly manufacturing port from tg. supermatter anomaly generation nerfed to 20% rather than removed
 2020-09-06 17:53:35 +12:00
Timothy Teakettle 8f6c353ad0 memory leak bad 2020-09-05 21:35:02 +01:00
timothyteakettle cdaef63fa1 sorry travis 2020-09-03 23:07:19 +01:00
timothyteakettle 90eef6efc9 Merge remote-tracking branch 'upstream/master' into limbs 2020-09-03 22:46:32 +01:00
timothyteakettle 9e2ee588c9 rp prosthetics 2020-09-03 22:05:21 +01:00
Artur c79e9fbc0b https://github.com/tgstation/tgstation/pull/53263 2020-09-02 18:48:09 +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
Hatterhat 00bc4202f7 what the fuck was i thinking coding this 2020-08-29 23:08:51 -05:00
Hatterhat 34861d55a8 fuck it two megas standard 2020-08-29 21:38:31 -05:00