Commit Graph

87 Commits

Author SHA1 Message Date
silicons
ce80f64d27 Update suppression.dm 2020-08-18 18:52:06 -07:00
Timothy Teakettle
93b4570f8d more changes 2020-07-17 23:23:47 +01: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
Ghommie
42201343a9 Backward 512 compatibility removal. 2020-04-23 00:59:23 +02: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
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
kevinz000
f85527ab4b Merge remote-tracking branch 'citadel/master' into mobility_flags 2020-01-19 16:18:12 -07:00
Putnam
81cd277db2 Made metabolic synthesis stop if not fed 2020-01-18 03:47:40 -08:00
kevinz000
7bcb37c5d1 Merge remote-tracking branch 'citadel/master' into mobility_flags 2020-01-16 21:12:56 -07:00
keronshb
69b5164103 Merge branch 'master' into RemoteMoodResearch 2020-01-16 15:50:11 -05:00
kevinz000
02841f8e92 compile 2020-01-15 18:49:37 -07:00
keronshb
a7af5203e7 This is a test to see if they all work together
Title
2020-01-06 20:29:44 -05:00
keronshb
35cd77d433 Adds the nanite remote for some programs
Adds a new remote function from tg
2020-01-06 20:28:33 -05:00
kevinz000
7378d91684 ([\W\.])Knockdown\( 2020-01-06 03:39:20 -08:00
Ghommie
4d06d231f8 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit490 2020-01-02 17:49:01 +01:00
keronshb
baf8b28f3a Fixes Reduced Diagnostics and adds disks
Fixes reduced diagnostics not working properly and adds program disks for each of the new nanites.
2019-12-29 16:03:38 -05:00
Ghommie
37441437d1 a 2019-12-28 23:02:28 +01:00
keronshb
390cfd8b64 Nanite ports from /tg/
Ports a couple of the newer nanite features from /tg/
2019-12-28 16:56:17 -05:00
Ghommie
e74339ce8b Jfc that's a lot of work! 2019-12-23 04:24:13 +01:00
Ghom
2bc401e2d2 Merge pull request #10096 from Citadel-Station-13/kevinz000-patch-123
nanites can no longer spread through atmospherics-blocking objects
2019-12-21 16:48:56 +01:00
Ghom
5c3d3f4cc5 Is merging someone else's PR you personally fixed considerable as self-merging? 2019-12-21 16:40:32 +01:00
Ghom
4624a1739a typo 2019-12-21 16:30:02 +01:00
kevinz000
41a61cffa7 Update utility.dm 2019-12-11 14:46:05 -07:00
kevinz000
2e0b019bd7 Update utility.dm 2019-12-07 03:11:54 -07:00
Artur
af4eaf7f0f Fixeesss 2019-12-03 23:09:11 +02:00
kevinz000
6b53845f06 Merge pull request #9268 from Thalpy/FERMICHEMCurTweaks
[READY] [Please merge me] Fermichem tweaks: Purity, Astral, RNG, MK, SMilk, SDGF, furranium, hatmium, eigen, nanite.
2019-11-26 16:01:48 -07:00
Fermi
ba4fa1ef67 Revert "PLASE"
This reverts commit 8af225e6e3.
2019-11-24 03:06:08 +00:00
Fermi
aeb8606ce0 Revert "Revert "PLASE""
This reverts commit 00601a0c87.
2019-11-24 03:04:52 +00:00
Fermi
2501b5c88c Revert "Revert "Okay""
This reverts commit fb2c29caff.
2019-11-24 03:04:27 +00:00
Fermi
fb2c29caff Revert "Okay"
This reverts commit 37ac0ccb66.
2019-11-24 02:44:32 +00:00
Fermi
00601a0c87 Revert "PLASE"
This reverts commit 8af225e6e3.
2019-11-24 02:44:00 +00:00
Fermi
8af225e6e3 PLASE 2019-11-24 02:41:21 +00:00