Commit Graph

17639 Commits

Author SHA1 Message Date
SiliconMain 4e5296438c Update tool_designs.dm 2020-09-25 09:46:11 -05:00
silicons 57c4a3416a Merge remote-tracking branch 'citadel/master' into combat_rework_experimental 2020-09-25 01:03:15 -07:00
Putnam3145 f6d9d4b535 Merge pull request #13426 from CoreFlare/master
Gives IPCs hair.
2020-09-24 21:40:41 -07:00
EmeraldSundisk 079d4eeb58 Merge pull request #63 from EmeraldSundisk/Citadel-Station-13-master
ffs
2020-09-24 19:18:50 -07:00
Timothy Teakettle 106b8ccead Merge branch 'master' into heterochromia 2020-09-24 22:09:03 +01:00
EmeraldSundisk 186f13f56c Revert "icon should work now I hope"
This reverts commit 179b9ba05d.
2020-09-24 09:38:26 -07:00
Putnam 6f6e330984 Removes removeNullsFromList, cause it doesn't work. 2020-09-24 01:15:22 -07:00
EmeraldSundisk 179b9ba05d icon should work now I hope 2020-09-23 21:49:26 -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
Putnam3145 c41add450a Merge pull request #13425 from Arturlang/TGUI_Updoot
Fixes some statpanel Issues
2020-09-23 14:19:22 -07:00
CoreFlare 1901677fdb finally. species_traits=list(HAIR) 2020-09-23 19:11:34 +01:00
Artur e483cf06b3 fIXD 2020-09-23 19:54:30 +03:00
Putnam e3e2cc7682 Actually properly unkludged it. 2020-09-23 06:41:03 -07:00
silicons ee44cfc565 Update angel.dm 2020-09-22 22:06:11 -07:00
MrJWhit 028b91e77d Update robot.dm 2020-09-22 21:15:50 -04:00
silicons 731bab4bc9 Update angel.dm 2020-09-22 16:20:47 -07:00
silicons b3f145de10 Update species.dm 2020-09-22 16:20:13 -07:00
raspy-on-osu 87d65d5c58 init 2020-09-22 15:11:46 -04:00
Neko Boi Nick 6c8988c89c Light replacer can print at Engineering 2020-09-22 10:42:56 -07:00
Blue Wildrose 006a625504 Slimeperson screams and laughter! 2020-09-22 02:41:11 -07:00
Putnam 2e877b8c50 Hardcoded fusion scan results as "fusion" to fix a runtime.
It didn't need to be id anyway??
2020-09-22 00:23:13 -07:00
silicons 4ab064a50d fix 2020-09-21 20:58:33 -07:00
silicons 31791df2bd fixes 2020-09-21 20:38:43 -07:00
silicons 2c4dc4d1a9 ok 2020-09-21 19:08:21 -07:00
silicons ddc7f10de7 fixes 2020-09-21 18:35:42 -07:00
silicons 7249fe058f config based 2020-09-21 17:36:30 -07: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
silicons 9fef16964c Merge remote-tracking branch 'citadel/master' into combat_rework_experimental 2020-09-21 03:13:51 -07:00
silicons 90aa47f339 Merge pull request #13329 from Arturlang/TGUI_Updoot
TGUI updates + statpanel
2020-09-21 03:11:06 -07:00
Artur 410550220b Fixed admin hide most verbs 2020-09-21 10:39:09 +03:00
silicons 0745f4ccd3 done 2020-09-20 23:12:19 -07:00
silicons 527458c901 amends 2020-09-20 21:48:18 -07:00
silicons 8de3bcb08f Merge pull request #13402 from timothyteakettle/limbs
copying prefs always regenerates icons now (attempt to stop preview icons being outright wrong)
2020-09-20 21:30:08 -07:00
silicons 26eebf3b32 Merge pull request #13408 from YakumoChen/dont-be-a-dick-shinji
Get in the damn robot, Skylar
2020-09-20 21:24:08 -07:00
Artur 435565f1d8 Merge remote-tracking branch 'origin/master' into TGUI_Updoot 2020-09-21 00:16:12 +03:00
silicons d77fb0e17b amends 2020-09-20 13:53:43 -07:00
silicons 86ca2cb905 amends 2020-09-20 13:38:36 -07:00
silicons fad91b1f79 fixes 2020-09-20 04:48:15 -07:00
silicons 8a54395f1a fixes 2020-09-20 04:33:49 -07:00
silicons 18f6bee9ab fixes 2020-09-20 02:50:37 -07:00
silicons c5403b5ef4 fixes 2020-09-20 02:49:42 -07:00
silicons f4acef3cf8 fixes 2020-09-20 02:17:14 -07:00
silicons 102a452067 fixes 2020-09-20 02:14:41 -07:00
silicons 8ebe765d70 fixes 2020-09-20 02:03:18 -07:00
Putnam 39ac36c073 Changed an inaccurate comment. 2020-09-20 00:09:45 -07:00
Putnam 63b0d61c5b Reworked the selection to scale automatically with objective counts. 2020-09-19 23:35:04 -07:00
Putnam 556a69ac78 Removed the supermatter objective; made sabotage objectives less common. 2020-09-19 22:45:32 -07:00
Putnam 666965c7b7 Made fuid generate 1/10 as fast. 2020-09-19 22:40:44 -07:00
silicons 97f373a199 whew 2020-09-19 16:17:26 -07:00
silicons 1ea0dd9f76 Merge remote-tracking branch 'citadel/master' into combat_rework_experimental 2020-09-19 15:56:13 -07:00