e07875b356
reduces all cuts bleed rate by 25%
2020-08-05 19:11:09 +01:00
2a197af1c0
Merge remote-tracking branch 'upstream/master' into newnew-clock-misc-stuff
2020-08-04 17:30:38 +02:00
454baea55f
Merge remote-tracking branch 'origin/master' into TGUI-4
2020-08-04 09:31:34 +08:00
a4132c04ea
Merge pull request #12894 from timothyteakettle/wounds-part-2
...
port of wounds part 2
2020-08-03 14:43:07 -07:00
42db990836
why am i doing this
2020-08-03 13:37:37 -07:00
75641d922e
this'll probably be better
2020-08-03 13:02:25 -07:00
d1622053d2
kindle tweaks
...
Time to cast back up to 1.5 seconds because yeah no you can't just stand still for a moment and kindle the guy chasing you.
But also: Kindle now mutes for five seconds (instead of 2) after it ends, and causes stuttering for five seconds after it ends (instead of 3)
2020-08-03 18:08:47 +02:00
a19e306137
less redtext - updates anomalies
2020-08-03 20:53:36 +08:00
2885b861f2
Merge pull request #12954 from silicons/killer_queen
...
bomb stands now use components
2020-08-02 12:52:07 -05:00
289c186f32
Merge remote-tracking branch 'upstream/master' into wounds-part-2
2020-08-02 18:11:07 +01:00
06f5ce6401
buffs shoving ( #12925 )
...
* ^w^
* ok
* ok
2020-08-02 18:30:09 +02:00
591f824bde
Update explosion.dm
2020-08-02 00:32:58 -07:00
fdbf488d69
Update explosion.dm
2020-08-02 00:29:47 -07:00
97c8b756ad
Update explosion.dm
2020-08-01 21:04:16 -07:00
a59eaff87e
fix
2020-08-01 21:01:48 -07:00
25d1fb761a
Merge remote-tracking branch 'citadel/master' into killer_queen
2020-08-01 20:51:38 -07:00
e8ec73ba7d
Merge pull request #12976 from Hatterhat/durathread-kits
...
Durathread Reinforcement Kits
2020-08-01 03:35:45 -07:00
2230a3665a
Merge pull request #12965 from timothyteakettle/end-our-suffering
...
drastically lowers the damage-related benefits of combat mode
2020-08-01 03:33:43 -07:00
30d82d66d1
Merge pull request #12939 from Sishen1542/iaa-iaa
...
Reflavors IAA, removes certain items from IAA uplinks, adds TC stealing functionality to uplinks
2020-08-01 02:24:01 -07:00
e17e1c3a11
conforms to same as everything else
2020-07-31 22:45:03 +01:00
6dfdff34ef
durathread armor kits
2020-07-30 13:38:04 -05:00
e40470f553
h. Updates NTOS, and axes p2p filetransfer!
2020-07-30 20:54:13 +08:00
b376a6b6c4
Merge remote-tracking branch 'origin/master' into TGUI-4
2020-07-30 14:43:52 +08:00
16722c47c3
CentCom Galactic Ban DB
2020-07-29 21:39:58 -05:00
caaedce6e2
end our suffering
2020-07-30 02:33:39 +01:00
7fa5ccbd0e
fixes slapping uplinks with non uplink items giving runtimes
2020-07-29 16:14:01 -06:00
9721025582
Merge branch 'master' into wounds-part-2
2020-07-29 15:47:44 +01:00
a5dd08a054
Merge pull request #12734 from silicons/shoelaces
...
shoelaces. untying people's shoelaces. admin smite to untie someone's shoelaces. credit to shaps/tg.
2020-07-28 21:51:43 -05:00
81a7542aa6
Merge pull request #12834 from silicons/clickcd_experimental
...
Experimental hybrid clickdelay system (No seriously I'm trying my best to not call it Minecraft attack delays)
2020-07-28 21:51:10 -05:00
93da2515b6
Merge pull request #12948 from Hatterhat/windows
...
[speedmerge? it's not that bad i swear] directional window rotation fix
2020-07-28 13:27:12 -07:00
c87c2bd850
smh
2020-07-28 12:31:35 -07:00
78b6a60e80
oh
2020-07-28 12:25:27 -07:00
fd738fd16a
spelling
2020-07-28 12:12:30 -07:00
c720e800df
whew!
2020-07-28 12:08:02 -07:00
6c83beea02
Merge pull request #12937 from Ghommie/Ghommie-cit834
...
Fixing new bugs and stuff.
2020-07-28 10:46:17 -07:00
8a32cac8db
window rotation fix
2020-07-28 10:47:07 -05:00
27aba092e0
aaaaaaaaaa
2020-07-27 08:20:03 -06:00
f1c242aadc
Fixing new bugs and stuff.
2020-07-27 14:16:01 +02:00
36d6246bc1
it is now harder to deal wounds
2020-07-26 18:54:57 +01:00
8f1a8adcfd
Update negative.dm
2020-07-26 04:15:39 -05:00
1990f75957
Merge remote-tracking branch 'citadel/master' into clickcd_experimental
2020-07-25 23:46:27 -07:00
3467bf3515
Merge remote-tracking branch 'upstream/master' into wounds-part-2
2020-07-26 00:25:26 +01:00
91081ef24c
Merge pull request #12872 from Iatots/hairball
...
Adds depth to the lick wounds mechanic.
2020-07-25 15:40:15 -07:00
8b2a92994f
less rng reliance
2020-07-25 20:14:41 +01:00
0e1574bf77
sigh
2020-07-24 23:34:47 -07:00
b708be60e9
hey look ma i removed a space
2020-07-25 02:12:21 +01:00
2a3f45f7af
fixes
2020-07-25 01:10:12 +01:00
3ca098fe98
bugfixes
2020-07-25 00:22:24 +01:00
315e7e1f99
bugfixes
2020-07-24 23:49:15 +01:00
7fb55a02a5
section one
2020-07-24 22:34:22 +01:00
Timothy Teakettle