Commit Graph

87 Commits

Author SHA1 Message Date
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
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
Ghommie 7f14fa3c71 not-so-wip now. 2020-01-31 19:20:59 +01: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
Ghom 536900a7ac Merge pull request #10520 from Hatterhat/tg-40920
you like examining things? - port of tgstation 40920
2020-01-19 16:37:40 +01:00
Hatterhat 590d71ddc1 hey ghom i fixed it i think 2020-01-18 23:35:52 -06:00
Putnam 81cd277db2 Made metabolic synthesis stop if not fed 2020-01-18 03:47:40 -08:00
keronshb 69b5164103 Merge branch 'master' into RemoteMoodResearch 2020-01-16 15:50:11 -05:00
Hatterhat 080cb74893 tgstation 40920 tweaked and tested for cit 2020-01-10 22:56:11 -06: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
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
Putnam3145 c39a5d0462 Merge pull request #10011 from Arturlang/Bloodsuckers
Bloodsuckers, or, yknow, vampires.
2019-12-15 14:41:36 -08:00
kevinz000 41a61cffa7 Update utility.dm 2019-12-11 14:46:05 -07:00
Ghommie 414d4b7a90 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit408 2019-12-09 00:04:22 +01: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 2c19c55fc3 Update nanite_programs.dm 2019-11-28 23:00:09 -07:00
Ghommie 3b8aebbbc2 refactoring altclick interaction to allow parent calls without forcing the turf contents stat menu open. 2019-11-29 00:40:16 +01: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
BlackMajor 786d40032d Merge pull request #9922 from GrayRachnid/braintraumasport
Ports new Brain Traumas from /tg/. Does not include the shitty creeper antag or Wizard Traumas, i'm porting wizard traumas later. Also adds the Desynchronizer and changes the way some heaRing args are handled.
2019-11-25 12:31:15 +13: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 c8b206a4cf Revert "pls"
This reverts commit 8c97511871.
2019-11-24 03:04:04 +00:00
Fermi 4c1c257035 Revert "Revert "pls""
This reverts commit b23f2a4460.
2019-11-24 03:02:21 +00:00
Fermi b23f2a4460 Revert "pls"
This reverts commit 8c97511871.
2019-11-24 02:49:20 +00:00
Fermi 8c97511871 pls
ugh
2019-11-24 02:47:52 +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
Fermi 37ac0ccb66 Okay 2019-11-23 00:23:43 +00:00
GrayRachnid a7918717ff fixes compile errors. 2019-11-22 18:22:53 -05:00
GrayRachnid c8e52fb8e1 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into disablesnolegs 2019-11-22 15:24:15 -05:00
Ghommie dd101ef221 Part 2 2019-11-19 18:00:56 +01:00
Ghommie b2b1390bd3 Ports techweb backend refactor & co. 2019-11-07 05:07:38 +01:00
Putnam 7003080440 Merge branch 'master' into fix-nanites 2019-10-12 02:36:51 -07:00
Putnam c389099a47 Makes brain-healing nanites not work uselessly 2019-10-11 23:58:34 -07:00
GrayRachnid 9f8ad74bf9 New traumas and some other things. 2019-10-08 03:53:01 -04:00
Fermi 107dd67cbe Well it compiles; just synthtissue and TongueLoss now. 2019-09-19 01:14:12 +01:00