Commit Graph

134 Commits

Author SHA1 Message Date
Timothy Teakettle 58737e42b9 empulse using range 2020-09-10 19:52:34 +01:00
timothyteakettle e0f44ef717 new emps 2020-09-10 03:49:47 +01:00
silicons 5414a8949c Update text.dm 2020-08-19 08:50:26 -07:00
silicons ce80f64d27 Update suppression.dm 2020-08-18 18:52:06 -07:00
Lin b8ba29e6f8 Merge pull request #13117 from Citadel-Station-13/silicons-patch-3
fixes nanite hubs
2020-08-14 13:01:15 -05:00
Lin ba9a808aaa Merge pull request #13118 from Citadel-Station-13/silicons-patch-4
fixes nanite programmers not ejecting disks
2020-08-14 13:01:08 -05:00
silicons b931b450ac Update nanite_cloud_controller.dm 2020-08-12 17:18:56 -07:00
silicons bb29d85983 Update nanite_programmer.dm 2020-08-12 17:18:40 -07:00
silicons cd95685eaa Update nanite_program_hub.dm 2020-08-12 17:18:06 -07:00
silicons 7bcbcda37b Update nanite_cloud_controller.dm 2020-08-11 00:37:44 -07:00
silicons 471d036881 Update nanite_programmer.dm 2020-08-11 00:35:53 -07:00
silicons e99414c3d4 Update nanite_program_hub.dm 2020-08-11 00:34:17 -07:00
Letter N e964b3aabf skillpannel fix, and nyanite fixes. Minified js does not include pai spoilers 2020-08-08 20:04:16 +08:00
Letter N 83207baaee reverts nanite thing 2020-08-08 16:30:07 +08:00
Letter N b376a6b6c4 Merge remote-tracking branch 'origin/master' into TGUI-4 2020-07-30 14:43:52 +08:00
Letter N 10fefca674 another batch. MAJOR: chem_master, pandemic 2020-07-30 14:06:20 +08:00
silicons ffd44b78ba Merge remote-tracking branch 'citadel/master' into clickcd_experimental 2020-07-23 10:26:03 -07:00
silicons 58e26c540c merge from master 2020-07-20 10:18:44 -07:00
silicons 1a040dd2a6 changes 2020-07-18 18:44:17 -07:00
silicons 7c5d4f863d click cd breakout 2020-07-18 18:10:21 -07:00
Timothy Teakettle 974b80a2fd Merge branch 'master' into wound-port 2020-07-18 21:45:24 +01:00
Timothy Teakettle 93b4570f8d more changes 2020-07-17 23:23:47 +01:00
Artur dabdf16eac Coonflict fiiixeeess 2020-05-13 12:56:17 +03:00
Artur 5b7d9a9008 Merge conflict fix 2020-05-13 12:37:18 +03:00
kevinz000 395d434e6e Merge pull request #12200 from Ghommie/Ghommie-cit738
nutrition adjustment wrapper procs from tg.
2020-05-12 12:28:02 -07:00
Ghommie 667c12d413 nutrition adjustment wrapper procs. 2020-05-10 21:41:50 +02:00
Putnam3145 3531459d8b Some trauma rebalancing (#12144)
* Some trauma rebalancing.

* Wow I didn't actually commit the 50% change

* when did i stop compiling before pushing
2020-05-09 01:42:39 +02:00
DeltaFire15 21c9c98412 > & < agony (#12082)
hm yes today a check being the wrong way will break exo nanites.
2020-05-02 00:36:03 +02:00
DeltaFire 1a6f5eb131 If it compiles it works
Kidding, tested on local and it runs fine.
Adds nanite protocols to the techweb, without BEPIS, aswell as adding one more protocol onto the ones ported from /tg
2020-04-23 15:15:26 +02:00
Artur 80b47ec1c0 Ports https://github.com/tgstation/tgstation/pull/50497 2020-04-23 09:55:28 +03:00
Ghommie 42201343a9 Backward 512 compatibility removal. 2020-04-23 00:59:23 +02:00
Ghommie 0876a1eef6 Porting datum components system updates. 2020-03-12 18:22:26 +01:00
kevinz000 b8642c5622 Merge pull request #11424 from necromanceranne/death_coma_stuff
Some fakedeath fixes requested by kev also ports a fix from tg to regen coma
2020-03-11 17:24:03 -07:00
necromanceranne c37d30a617 Some fixes requested by kev also ports a fix from tg 2020-03-11 15:43:47 +11:00
Ghommie ee1eea8874 Ports "Switches out the three billion args of electrocute act for flags" 2020-03-09 04:01:23 +01:00
kevinz000 0ace3f2310 Update buffing.dm 2020-03-06 05:42:28 -07:00
kevinz000 5a580dda20 Update suppression.dm 2020-02-21 18:18:37 -07:00
kevinz000 a784a74ccb Merge remote-tracking branch 'citadel/master' into mobility_flags 2020-02-21 13:35:26 -07:00
keronshb 7a1bc9d22b Fixes the travis issues
Fixes the travis issues, Exo still remains a mystery
2020-02-20 19:11:04 -05:00
keronshb 4ca9eb4171 Fixes healing nanites
Fixes Accelerated Regeneration, Bio Regen, and Mechanical.

Also changed one line on Exo nanites but it doesn't fix those.  Dunno what to do.
2020-02-20 18:11:54 -05:00
Arturlang 901b54b7e8 Webedit man to the doom and rescue 2020-02-20 01:38:28 +02:00
Arturlang 796f51b557 Merge branch 'master' into TGUI_Next_Nanites 2020-02-20 00:52:55 +02:00
kevinz000 0e4692c63d Merge remote-tracking branch 'citadel/master' into mobility_flags 2020-02-18 18:16:34 -07:00
Artur 7964d768fa Initial Commit 2020-02-13 20:51:52 +02:00
Artur 5c102d4da0 Ghommies suggestions 2020-02-12 11:30:55 +02:00
Artur a9a167b9d3 Suffering and co 2020-02-11 20:18:32 +02:00
kevinz000 6a8a606f97 Merge remote-tracking branch 'citadel/master' into mobility_flags 2020-02-04 16:01:25 -07:00
Ghommie 7f14fa3c71 not-so-wip now. 2020-01-31 19:20:59 +01:00
kevinz000 611fd7ea89 Merge remote-tracking branch 'citadel/master' into mobility_flags 2020-01-27 23:35:35 -07:00
Ghom 21867f60dd Merge pull request #10598 from Putnam3145/metabolic-synth-tweak
Made metabolic synthesis nanites stop if not fed
2020-01-23 16:38:39 +01:00