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
kevinz000
f85527ab4b
Merge remote-tracking branch 'citadel/master' into mobility_flags
2020-01-19 16:18:12 -07: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
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
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
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
Putnam3145
c39a5d0462
Merge pull request #10011 from Arturlang/Bloodsuckers
...
Bloodsuckers, or, yknow, vampires.
2019-12-15 14:41:36 -08:00
