Commit Graph

26370 Commits

Author SHA1 Message Date
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 3505a5bc18 fixes 2020-09-20 02:10:54 -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
EmeraldSundisk 7c5de6996b cargotech wardrobe 2020-09-19 15:41:59 -07:00
EmeraldSundisk 8ced447303 cargo tech code 2020-09-19 15:29:27 -07:00
Dip a3bf4ac580 Fixes requested 2020-09-19 13:02:08 -03:00
Ghom b29143ea03 Merge pull request #13364 from Citadel-Station-13/silicons-patch-34
projectile process invoke async because people keep breaking shit and trying to enforce do not sleep on it is a moot point because people keep breaking shit
2020-09-19 16:53:55 +02:00
Putnam3145 62228905da Merge pull request #13382 from Citadel-Station-13/silicons-patch-36
hulks no longer break their hand from punching a wall
2020-09-19 06:07:04 -07:00
Putnam3145 9c305d1db6 Merge pull request #13400 from silicons/shields
adds two procs to find exterior tiles for projecting hull shields around for later pr
2020-09-19 06:06:46 -07:00
Putnam3145 ccbacfb0bf Merge pull request #13403 from Citadel-Station-13/silicons-patch-38
fixes joystick users getting kicked for hacking. again.
2020-09-19 06:05:25 -07: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
Putnam3145 e52ba8d883 Merge pull request #13406 from Citadel-Station-13/silicons-patch-39
fixes airlock wire runtimes from non-user wire damage
2020-09-19 06:04:31 -07:00
silicons 54f48c3754 Merge pull request #13394 from DeltaFire15/attack-runtime-fixes
Some bodypart-related fixes
2020-09-19 06:02:32 -07:00
YakumoChen 85f8c22da9 adds mech suits to robodrobe 2020-09-18 21:16:25 +00:00
YakumoChen 9c7b43a83b mech suits 2020-09-18 21:13:08 +00:00
silicons b9315c5080 Update airlock.dm 2020-09-18 04:26:22 -07:00
silicons 139c99d82a fix 2020-09-18 00:49:17 -07:00
silicons 4338c0207e fix 2020-09-18 00:37:36 -07:00
silicons b1738c7230 fix 2020-09-18 00:30:02 -07:00
silicons d619823b9b ok 2020-09-18 00:27:04 -07:00
silicons a477b1d5a9 easy?? 2020-09-18 00:24:31 -07:00
silicons 59372710bb Update keybindings.dm 2020-09-17 21:41:05 -07:00
silicons 3629addf0f Update ticketmachine.dm 2020-09-17 04:37:10 -07:00
silicons 872ef07b43 Update brawn.dm 2020-09-17 04:36:39 -07:00
Dip fa516fc517 Set atmos pass to yes on assembly 2020-09-16 20:51:40 -03:00