0876a1eef6
Porting datum components system updates.
2020-03-12 18:22:26 +01:00
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
c37d30a617
Some fixes requested by kev also ports a fix from tg
2020-03-11 15:43:47 +11:00
ee1eea8874
Ports "Switches out the three billion args of electrocute act for flags"
2020-03-09 04:01:23 +01:00
0ace3f2310
Update buffing.dm
2020-03-06 05:42:28 -07:00
5a580dda20
Update suppression.dm
2020-02-21 18:18:37 -07:00
a784a74ccb
Merge remote-tracking branch 'citadel/master' into mobility_flags
2020-02-21 13:35:26 -07:00
7a1bc9d22b
Fixes the travis issues
...
Fixes the travis issues, Exo still remains a mystery
2020-02-20 19:11:04 -05:00
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
901b54b7e8
Webedit man to the doom and rescue
2020-02-20 01:38:28 +02:00
796f51b557
Merge branch 'master' into TGUI_Next_Nanites
2020-02-20 00:52:55 +02:00
0e4692c63d
Merge remote-tracking branch 'citadel/master' into mobility_flags
2020-02-18 18:16:34 -07:00
7964d768fa
Initial Commit
2020-02-13 20:51:52 +02:00
5c102d4da0
Ghommies suggestions
2020-02-12 11:30:55 +02:00
a9a167b9d3
Suffering and co
2020-02-11 20:18:32 +02:00
6a8a606f97
Merge remote-tracking branch 'citadel/master' into mobility_flags
2020-02-04 16:01:25 -07:00
7f14fa3c71
not-so-wip now.
2020-01-31 19:20:59 +01:00
611fd7ea89
Merge remote-tracking branch 'citadel/master' into mobility_flags
2020-01-27 23:35:35 -07:00
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
f85527ab4b
Merge remote-tracking branch 'citadel/master' into mobility_flags
2020-01-19 16:18:12 -07:00
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
590d71ddc1
hey ghom i fixed it i think
2020-01-18 23:35:52 -06:00
81cd277db2
Made metabolic synthesis stop if not fed
2020-01-18 03:47:40 -08:00
7bcb37c5d1
Merge remote-tracking branch 'citadel/master' into mobility_flags
2020-01-16 21:12:56 -07:00
69b5164103
Merge branch 'master' into RemoteMoodResearch
2020-01-16 15:50:11 -05:00
02841f8e92
compile
2020-01-15 18:49:37 -07:00
080cb74893
tgstation 40920 tweaked and tested for cit
2020-01-10 22:56:11 -06:00
a7af5203e7
This is a test to see if they all work together
...
Title
2020-01-06 20:29:44 -05:00
35cd77d433
Adds the nanite remote for some programs
...
Adds a new remote function from tg
2020-01-06 20:28:33 -05:00
7378d91684
([\W\.])Knockdown\(
2020-01-06 03:39:20 -08:00
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
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
37441437d1
a
2019-12-28 23:02:28 +01:00
390cfd8b64
Nanite ports from /tg/
...
Ports a couple of the newer nanite features from /tg/
2019-12-28 16:56:17 -05:00
e74339ce8b
Jfc that's a lot of work!
2019-12-23 04:24:13 +01:00
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
5c3d3f4cc5
Is merging someone else's PR you personally fixed considerable as self-merging?
2019-12-21 16:40:32 +01:00
4624a1739a
typo
2019-12-21 16:30:02 +01:00
c39a5d0462
Merge pull request #10011 from Arturlang/Bloodsuckers
...
Bloodsuckers, or, yknow, vampires.
2019-12-15 14:41:36 -08:00
41a61cffa7
Update utility.dm
2019-12-11 14:46:05 -07:00
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
2e0b019bd7
Update utility.dm
2019-12-07 03:11:54 -07:00
af4eaf7f0f
Fixeesss
2019-12-03 23:09:11 +02:00
2c19c55fc3
Update nanite_programs.dm
2019-11-28 23:00:09 -07:00
3b8aebbbc2
refactoring altclick interaction to allow parent calls without forcing the turf contents stat menu open.
2019-11-29 00:40:16 +01:00
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
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
ba4fa1ef67
Revert "PLASE"
...
This reverts commit 8af225e6e3
2019-11-24 03:06:08 +00:00
aeb8606ce0
Revert "Revert "PLASE""
...
This reverts commit 00601a0c87
2019-11-24 03:04:52 +00:00
2501b5c88c
Revert "Revert "Okay""
...
This reverts commit fb2c29caff
2019-11-24 03:04:27 +00:00
Ghommie