Commit Graph

14638 Commits

Author SHA1 Message Date
Fermi
ab35b018db Indents and eigenstate var reduction. 2019-06-14 11:24:21 +01:00
Fermi
ee458b102f bitflags 2019-06-14 10:45:36 +01:00
Arturlang
4e886c5b48 Merge pull request #2 from Arturlang/master
travis fix
2019-06-14 11:53:00 +03:00
Arturlang
fb150c355e Merge pull request #1 from Arturlang/master
hopefully this works to fix travis
2019-06-14 11:47:14 +03:00
Ghommie
cf56870b57 Fixes the sacrificial target icon not displaying on the cult objective alert. 2019-06-13 23:48:15 +02:00
TrilbySpaseClone
1c45e2c615 Suggested 2019-06-13 16:02:48 -04:00
Useroth
3f4d9319e9 Update energy_net_nets.dm 2019-06-13 20:38:22 +02:00
Useroth
e3acef755a Fuck you again, Travis. Do it right this time. 2019-06-13 20:33:45 +02:00
Useroth
bab2ec4789 Travis, I fucking mean it. Compile it. 2019-06-13 15:46:12 +02:00
Useroth
5e90c530e0 Travis, you whore, compile it properly. 2019-06-13 15:37:18 +02:00
Useroth
2d977becb5 Finally fixed the net breaking mechanics. 2019-06-13 15:27:57 +02:00
Useroth
39bedb8341 Update ninjaDrainAct.dm 2019-06-13 15:27:56 +02:00
Useroth
ee661d1eb8 An afterthought regarding healing/reviving the capturees. 2019-06-13 15:27:56 +02:00
Useroth
35fe334fe8 Small tweak. 2019-06-13 15:27:56 +02:00
Useroth
231da023ec Makes the gloves actually stun people. 2019-06-13 15:27:55 +02:00
Useroth
df15e53cd3 Another attempt at the nets not being breakable with bare hands. Now with more consideration. 2019-06-13 15:27:55 +02:00
Useroth
2e5ad2f4d8 Might as well crank it up a little more. 2019-06-13 15:27:55 +02:00
Useroth
7fd2c60992 Makes energy nets a bit sturdier and unbreakable with bare hands. 2019-06-13 15:27:54 +02:00
Useroth
04a1c7ada4 Energy net and capture objective tweak. 2019-06-13 15:27:54 +02:00
Useroth
f9c249b644 Energy net tweak to make it less clunky to use. 2019-06-13 15:27:54 +02:00
Fermi
2a76cfa285 Logging 2019-06-13 07:51:46 +01:00
Fermi
54985c05d9 Confused about bitgates. 2019-06-13 07:11:29 +01:00
Fermi
9fb7c9866d Splitting larger fermi_reagents. 2019-06-13 06:59:46 +01:00
Fermi
0f5d47c03f Velvet speech reconfig. 2019-06-13 06:51:11 +01:00
Fermi
c9a66544bc pH and temp immune bitflagging. 2019-06-13 06:45:29 +01:00
Fermi
aa7805eaa4 Fixes. 2019-06-13 06:35:12 +01:00
Fermi
378af882d3 Ramping up to logging and a few more fixes. 2019-06-13 05:51:28 +01:00
Fermi
14aa7084a8 Breast rename. 2019-06-13 04:37:03 +01:00
Fermi
026f29ba46 Comments and logs. 2019-06-13 04:31:15 +01:00
Fermi
a3aa0408a3 Tongue 2019-06-13 03:37:15 +01:00
Fermi
c3892db433 Liver and lungs. 2019-06-13 03:34:33 +01:00
Fermi
a6b211a4a3 Fixes for beakers. 2019-06-13 03:25:16 +01:00
Fermi
91e58d896e Spelling is hard. 2019-06-13 03:24:02 +01:00
Fermi
93973b630c Moonsugar edit. 2019-06-13 03:08:01 +01:00
Fermi
b07f3b37ff Saline edit 2019-06-13 03:07:25 +01:00
Fermi
eab52a51e6 Fixed compile errors. 2019-06-13 03:05:34 +01:00
Fermi
981c1644c9 Holder changes; removed ferminew. 2019-06-13 02:47:05 +01:00
Fermi
3368d3d98b Fixed taste.dm 2019-06-13 02:32:42 +01:00
Fermi
5e4ced1a60 Sorta changes to say.dm 2019-06-13 02:26:04 +01:00
Fermi
099afc3c8e Removed hypnoflash TC 2019-06-13 02:21:37 +01:00
Fermi
70734b705a Forgot to commit to blood. 2019-06-13 02:01:42 +01:00
Fermi
7c73203fc2 Merge branch 'master' of https://github.com/Thalpy/Citadel-Station-13 2019-06-13 01:58:28 +01:00
Fermi
9effbb1e33 Removed increase/decrease blood var. 2019-06-13 01:58:26 +01:00
Thalpy
ad8c1593f6 Reduced medical jargon on scanners. 2019-06-13 01:47:29 +01:00
Fermi
18292d4fc6 Merge branch 'master' of https://github.com/Thalpy/Citadel-Station-13 2019-06-13 01:46:10 +01:00
Fermi
c8bcca5964 Staged hypnoflash removal. 2019-06-13 01:45:48 +01:00
Fermi
fab603fabe Removed hypnotherapy quirk 2019-06-13 01:44:48 +01:00
Thalpy
f3a3e4c47a Removed hypnotherapy quirk 2019-06-13 01:31:28 +01:00
Thalpy
a9aa913860 Added remove() for bloodpressure 2019-06-13 01:24:50 +01:00
Fermi
7b764c9fa9 Merge branch 'master' of https://github.com/Thalpy/Citadel-Station-13 2019-06-13 01:18:16 +01:00