Commit Graph

16648 Commits

Author SHA1 Message Date
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
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
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
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 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
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
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 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
silicons 49333833a4 debugging done 2020-09-16 00:44:57 -07: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 17b21d29f3 helpers 2020-09-16 00:07:33 -07:00
silicons 39d3a4f596 Merge pull request #13362 from Putnam3145/fix-fuid-production
Fixes organ fluid production.
2020-09-15 17:30:46 -07:00
silicons 97c27b30f5 Merge pull request #13365 from DeltaFire15/tendril-stuff-fixes
Hey wait isn't there numbers between 11 and 15
2020-09-15 17:30:06 -07:00
silicons cffc321050 more 2020-09-15 17:27:50 -07:00
silicons 95ebeac5b6 fix 2020-09-15 17:27:11 -07:00
silicons e7220e842e things 2020-09-15 15:29:34 -07:00
Artur 1c831692a7 Properly fixed altclick 2020-09-16 00:41:47 +03:00
Timothy Teakettle e67fbed1ba always regenerate icons 2020-09-15 18:37:14 +01:00
DeltaFire f892309903 fixes 2020-09-15 17:35:58 +02:00
Timothy Teakettle 744792742b please fix it 2020-09-12 22:32:06 +01:00
DeltaFire 9e3710bb51 kev request
malf disk gone from the /misc chest type
2020-09-11 23:19:55 +02:00
silicons ad128c292e Merge pull request #13351 from Trilbyspaceclone/patch-402
Correrts open loop on race drinks
2020-09-11 14:16:33 -07:00
silicons 5f2f524065 Merge pull request #13355 from lolman360/AnPrimAssistants
fixes glaives
2020-09-11 14:16:22 -07:00
silicons 18d949e674 Merge pull request #13357 from TheObserver-sys/BrassDatumDirectToYou
Brass Material Datum: "Sbetr Jryy!"
2020-09-11 14:15:54 -07:00
silicons 563b21d8fa Merge pull request #13363 from Putnam3145/bloodsucker-ling-life-code
Signalizes ling/bloodsucker life code.
2020-09-11 14:15:37 -07:00
silicons 30358d9619 Merge pull request #13369 from zeroisthebiggay/godthisisawful
the PR I really didn't want to make - poplocks revolvers to 15 people
2020-09-11 14:14:43 -07:00