Commit Graph

3582 Commits

Author SHA1 Message Date
silicons
c66874f732 Merge pull request #14032 from kappa-sama/kaiowhat
two toggled self-buffing spells that have no relation to any anime or video game in particular
2021-01-13 16:50:50 -07:00
silicons
ea07ad6e48 Merge remote-tracking branch 'citadel/master' into tgsync 2021-01-13 15:41:28 -07:00
silicons
343ef7db2c fixes 2021-01-13 14:23:35 -07:00
silicons
3fe2776a6a fix 2021-01-13 13:44:46 -07:00
Lin
04c5d34cb6 Merge pull request #14015 from DeltaFire15/synth-stuffs
Tweaks some Synth damage stuff
2021-01-13 18:40:03 +00:00
Hatterhat
cb40ad4764 atomization is cowardice actually 2021-01-12 16:08:17 -06:00
kappa-sama
c751f114aa finally 2021-01-12 01:42:55 -05:00
silicons
72bc00bc22 Merge pull request #13993 from Arturlang/cursed_heart_tweaks
Makes cursed heart more tolerable
2021-01-10 01:36:43 -07:00
DeltaFire
3f6939c1cb fix 2021-01-10 06:20:27 +01:00
silicons
121104ca6c Merge pull request #14014 from necromanceranne/bokken_fixes_2
Bokken Fixes 2: Missing sprites and stuff
2021-01-09 19:49:10 -07:00
silicons
9733305997 Merge remote-tracking branch 'citadel/master' into tgsync 2021-01-09 14:56:32 -08:00
silicons
e680d58a03 fixes 2021-01-09 14:56:29 -08:00
silicons
656691912e Merge pull request #13965 from Xantholne/GoodNightDisky
Good Night Disky
2021-01-09 15:39:06 -07:00
DeltaFire
05f7991981 snap 2021-01-09 20:37:24 +01:00
necromanceranne
6d10ca9efa Fixes missing sprites on the steelwood bokkens, fixes further problems with crafting bokken parts 2021-01-10 05:43:33 +11:00
silicons
bffc43e95e fixes 2021-01-08 18:59:26 -08:00
silicons
bd9c979b07 riding datums 2021-01-08 18:48:59 -08:00
silicons
bd3761d39e proper smooth movement 2021-01-08 10:51:48 -08:00
silicons
ddad368d6a Merge remote-tracking branch 'citadel/master' into tgsync 2021-01-08 00:33:57 -08:00
Artur
f5dc7d5c01 Makes cursed heart more tolerable 2021-01-07 22:27:13 +02:00
timothyteakettle
a375448a54 fixes 2021-01-05 23:18:52 +00:00
Xantholne
18a336cec5 Adds bed tucking element 2021-01-05 02:47:21 -07:00
necromanceranne
0fda694a52 A bunch of fixes for bokkens, renamed all references to 'ironwood' to 'steelwood', since I got confused. 2021-01-04 15:30:28 +11:00
Letter N
cd5d558fad safety? what's that?
* maybe table-breaking change
2021-01-04 11:57:12 +08:00
silicons
4c6cc24343 Merge pull request #13948 from necromanceranne/sheath_stuff
Bokken and Bokken Accessories: Bonkvengeance
2021-01-03 18:18:29 -07:00
silicons
b164d6e75b Merge pull request #13936 from BlueWildrose/hoodyhoodu
Fixes loadout specific polychromic hoodies not having their hoods polychromable
2021-01-03 18:10:44 -07:00
necromanceranne
6a247e2a68 Adds a new version of bokken, cleans up some unnecessary code, completely redoes several bokken related sprites 2021-01-02 04:26:39 +11:00
DeltaFire
38565e0027 Merge pull request #13909 from silicons/twitch_plays
Twitch Plays: Clown Car
2021-01-01 04:14:26 +01:00
necromanceranne
0aa5338f9b Adds wakibokken, puts bokken crafting into the craft menu, makes proper bokken a little harder to make but obviously an upgrade, makes crafted katanas and bokken have actual belt overlays 2021-01-01 05:42:28 +11:00
Blue Wildrose
0e5b2c60ee Fixes loadout specific polychromic hoodies 2020-12-31 03:42:29 -07:00
Letter N
57f7b3948b BSQL is fucking dead 2020-12-31 15:52:48 +08:00
DeltaFire
1e3c2f802f Merge pull request #13913 from keronshb/scarpparrytweak
Local Martial Artist forgets one line of code (fixes Scarp Parrying)
2020-12-30 17:53:41 +01:00
silicons
97deaf3482 Update twitch_plays.dm 2020-12-29 15:56:10 -07:00
silicons
95c420ccba Update twitch_plays.dm 2020-12-29 15:55:14 -07:00
keronshb
99a890b355 Adds block_parry_data
Ooops forgot one line of code
2020-12-29 09:30:29 -05:00
silicons
042c7d9b8b wew 2020-12-28 21:07:55 -08:00
silicons
d338d7a14b auto 2020-12-28 21:03:50 -08:00
Letter N
51143f89e5 Merge remote-tracking branch 'origin/master' into semi-sync 2020-12-29 10:37:06 +08:00
silicons
964b60c9ca ok 2020-12-28 17:50:16 -08:00
silicons
ee9cc135f1 fix 2020-12-28 17:43:50 -08:00
silicons
a8bc98aa40 ok 2020-12-28 17:29:55 -08:00
silicons
6e86cc7758 wew 2020-12-28 17:27:16 -08:00
silicons
1af00db4c1 Merge pull request #13869 from timothyteakettle/powergame-puddle
removes slime layering and stops puddle tackling
2020-12-28 13:15:30 -07:00
Timothy Teakettle
b1e5888ce0 Update tackle.dm 2020-12-28 17:40:04 +00:00
DeltaFire
999b4c403b Merge pull request #13883 from silicons/temporary_flavortext
Set Pose from RP server is now a thing (in reality this just modifies existing temporary flavor text to be better but no one here understands enough code so I'll spare the explanation)
2020-12-28 17:53:32 +01:00
DeltaFire
312f3410a1 Merge pull request #13887 from HeroWithYay/Fix_Necrotizing_Fasciitis_description
Fix for Necrotizing Fasciitis
2020-12-28 17:43:39 +01:00
Letter N
7e2da69d23 explotioin audio is proper now 2020-12-28 10:24:37 +08:00
Putnam
fd8f5c4afd Makes coma more precedent. 2020-12-27 17:54:53 -08:00
Putnam
33358776ec Makes regen coma properly work at 25% when sleeping 2020-12-27 17:49:15 -08:00
Letter N
ce5ab2f3a4 Merge remote-tracking branch 'origin/master' into semi-sync 2020-12-28 09:35:58 +08:00