Fermi
|
be36a8bb33
|
Cleanup
|
2019-06-15 18:04:06 +01:00 |
|
Fermi
|
79d176336c
|
A few minor fixes.
|
2019-06-15 11:36:38 +01:00 |
|
deathride58
|
fdc0e4f957
|
Merge pull request #8611 from Poojawa/digitigrade-socks
Digitigrade socks
|
2019-06-14 20:50:05 -04:00 |
|
deathride58
|
b1f1b2a57d
|
Merge pull request #8609 from Poojawa/simple_mob_nomming-I-guess
Client check to possibly fix #8542
|
2019-06-14 20:49:28 -04:00 |
|
deathride58
|
d79a58b3f4
|
Merge pull request #8634 from Ghommie/Ghommie-cit46
fixes low-charge stunbatons & co.
|
2019-06-14 20:44:19 -04:00 |
|
Ghommie
|
a3c2ed0b52
|
fixes.
|
2019-06-15 02:19:57 +02:00 |
|
deathride58
|
2f47fbdd8b
|
Merge pull request #8628 from BlackMajor/Pie
Cream Pies now transfer a portion of their reagents on hitting someone
|
2019-06-14 19:18:12 -04:00 |
|
Fermi
|
7a66039f0c
|
Fixing merge errors.
Testmerge ready.
|
2019-06-14 21:55:17 +01:00 |
|
Fermi
|
6b9becce71
|
Merge branch 'pr/14'
|
2019-06-14 21:29:04 +01:00 |
|
Trilbyspaceclone
|
f32291146b
|
Update all_nodes.dm
|
2019-06-14 12:02:55 -04:00 |
|
Trilbyspaceclone
|
c5e3010cfa
|
Update misc_designs.dm
|
2019-06-14 12:01:52 -04:00 |
|
Fermi
|
aa1cb22edc
|
Eigenstate fixes.
|
2019-06-14 16:26:08 +01:00 |
|
Fermi
|
b4beb006f9
|
More fixes.
|
2019-06-14 15:43:48 +01:00 |
|
Fermi
|
d7cffadc13
|
Fixes
|
2019-06-14 13:43:57 +01:00 |
|
Fermi
|
2365f7337c
|
Adventures in bitflags!
|
2019-06-14 12:47:22 +01:00 |
|
Useroth
|
ec1ff9ada3
|
The joy of making an error in a webedit.
|
2019-06-14 13:05:36 +02:00 |
|
Fermi
|
e95b371ea5
|
Changed to weakness
|
2019-06-14 11:56:28 +01:00 |
|
Useroth
|
bd35b8696c
|
Another commit to get fucking Travis going.
|
2019-06-14 12:52:03 +02:00 |
|
Fermi
|
d6edc8db1f
|
Preweakeness
|
2019-06-14 11:43:01 +01:00 |
|
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 |
|